Add package metadata and wasmtime to workspace

filecoin-project · Dec 18, 2023 · a00f5c5 · a00f5c5
1 parent 473d61c
commit a00f5c5
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 40 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,6 +16,13 @@ members = [
     "tools/fvm-bench",
 ]
 
+[workspace.package]
+version = "4.0.0"
+license = "MIT OR Apache-2.0"
+edition = "2021"
+repository = "https://github.com/filecoin-project/ref-fvm"
+authors = ["Protocol Labs", "Filecoin Core Devs"]
+
 [workspace.dependencies]
 # common
 serde = { version = "1.0.164", default-features = false, features = ["derive"] }
@@ -44,6 +51,11 @@ blake2b_simd = "1.0.1"
 libsecp256k1 = { version = "0.7.1" }
 bls-signatures = { version = "0.15", default-features = false }
 
+# wasmtime
+wasmtime = {version = "12.0.2", default-features = false, features = ["cranelift", "pooling-allocator", "parallel-compilation"] }
+wasmtime-environ = "12.0.2"
+wasmtime-runtime = { version = "12.0.2", default-features = false }
+
 # misc
 libfuzzer-sys = "0.4"
 arbitrary = "1.3.0"

diff --git a/fvm/Cargo.toml b/fvm/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "fvm"
 description = "Filecoin Virtual Machine reference implementation"
-version = "4.0.0"
-license = "MIT OR Apache-2.0"
+version.workspace = true
+license.workspace = true
+edition.workspace = true
+repository.workspace = true
 authors = ["Protocol Labs", "Filecoin Core Devs"]
-edition = "2021"
-repository = "https://github.com/filecoin-project/ref-fvm"
 keywords = ["filecoin", "web3", "wasm"]
 
 [lib]
@@ -22,6 +22,9 @@ fvm_ipld_hamt = { workspace = true }
 fvm_ipld_amt = { workspace = true }
 fvm_ipld_blockstore = { workspace = true }
 fvm_ipld_encoding = { workspace = true }
+wasmtime = { workspace = true }
+wasmtime-environ = { workspace = true }
+wasmtime-runtime = { workspace = true }
 serde = { workspace = true }
 serde_tuple = { workspace = true }
 lazy_static = { workspace = true }
@@ -47,18 +50,6 @@ ambassador = "0.3.5"
 pretty_assertions = "1.3.0"
 fvm = { workspace = true, features = ["testing"], default-features = false }
 
-[dependencies.wasmtime]
-version = "12.0.2"
-default-features = false
-features = ["cranelift", "pooling-allocator", "parallel-compilation"]
-
-[dependencies.wasmtime-environ]
-version = "12.0.1"
-
-[dependencies.wasmtime-runtime]
-version = "12.0.1"
-default-features = false
-
 [features]
 default = ["opencl"]
 opencl = ["filecoin-proofs-api/opencl"]

diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "fvm_sdk"
 description = "Filecoin Virtual Machine actor development SDK"
-version = "4.0.0"
-license = "MIT OR Apache-2.0"
+version.workspace = true
+license.workspace = true
+edition.workspace = true
+repository.workspace = true
 authors = ["Protocol Labs", "Filecoin Core Devs"]
-edition = "2021"
-repository = "https://github.com/filecoin-project/ref-fvm"
 
 [lib]
 crate-type = ["lib"]

diff --git a/shared/Cargo.toml b/shared/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "fvm_shared"
 description = "Filecoin Virtual Machine shared types and functions"
-version = "4.0.0"
-edition = "2021"
-license = "MIT OR Apache-2.0"
+version.workspace = true
+license.workspace = true
+edition.workspace = true
+repository.workspace = true
 authors = ["ChainSafe Systems <info@chainsafe.io>", "Protocol Labs", "Filecoin Core Devs"]
-repository = "https://github.com/filecoin-project/ref-fvm"
 
 [dependencies]
 blake2b_simd = { workspace = true }

diff --git a/testing/conformance/Cargo.toml b/testing/conformance/Cargo.toml
@@ -9,6 +9,7 @@ publish = false
 repository = "https://github.com/filecoin-project/ref-fvm"
 
 [dependencies]
+fvm = { workspace = true, default-features = false, features = ["testing"] }
 fvm_shared = { workspace = true }
 fvm_ipld_car = { workspace = true }
 fvm_ipld_blockstore = { workspace = true }
@@ -26,7 +27,7 @@ itertools = { workspace = true }
 serde_json = { workspace = true, features = ["raw_value"] }
 libipld-core = { workspace = true }
 async-std = { version = "1.12", features = ["attributes"] }
-wasmtime = { version = "12.0.2", default-features = false }
+wasmtime = { workspace = true }
 base64 = "0.21.2"
 flate2 = { version = "1.0" }
 colored = "2"
@@ -38,12 +39,6 @@ ittapi-rs = { version = "0.3.0", optional = true }
 tar = { version = "0.4.38", default-features = false }
 zstd = { version = "0.12.3", default-features = false }
 
-[dependencies.fvm]
-version = "4.0.0"
-path = "../../fvm"
-default-features = false
-features = ["testing"]
-
 [features]
 vtune = ["wasmtime/vtune", "ittapi-rs"]
 m2-native = []

diff --git a/testing/integration/Cargo.toml b/testing/integration/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "fvm_integration_tests"
 description = "Filecoin Virtual Machine integration tests framework"
-version = "4.0.0"
-edition = "2021"
-license = "MIT OR Apache-2.0"
+version.workspace = true
+license.workspace = true
+edition.workspace = true
+repository.workspace = true
 authors = ["Protocol Labs", "Filecoin Core Devs", "Polyphene"]
-repository = "https://github.com/filecoin-project/ref-fvm"
 
 [dependencies]
 fvm = { workspace = true, default-features = false, features = ["testing", "upgrade-actor"] }
@@ -26,11 +26,7 @@ rand_chacha = { workspace = true }
 serde = { workspace = true }
 serde_tuple = { workspace = true }
 thiserror = { workspace = true }
-
-[dependencies.wasmtime]
-version = "12.0.2"
-default-features = false
-features = ["cranelift", "parallel-compilation"]
+wasmtime = { workspace = true, default-features = false, features = ["cranelift", "parallel-compilation"] }
 
 [dev-dependencies]
 actors-v12 = { package = "fil_builtin_actors_bundle", git = "https://github.com/filecoin-project/builtin-actors", branch = "master" }