chore: workspace dependencies (#47)

* chore: workspace dependencies * Update Cargo.toml * Extend workspace dependencies --------- Co-authored-by: Evgeny Ukhanov <[email protected]>
aurora-is-near · Jun 21, 2024 · 000196f · 000196f
1 parent 91ea85d
commit 000196f
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 18 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,23 +8,32 @@ repository.workspace = true
 keywords.workspace = true
 edition.workspace = true
 
-[dependencies]
+[workspace.dependencies]
+evm = { version = "0.43", path = "." }
+evm-core = { version = "0.43", path = "core", default-features = false }
+evm-gasometer = { version = "0.43", path = "gasometer", default-features = false }
+evm-runtime = { version = "0.43", path = "runtime", default-features = false }
+primitive-types = { version = "0.12", default-features = false }
 auto_impl = "1.0"
+sha3 = { version = "0.10", default-features = false }
+
+[dependencies]
 ethereum = { version = "0.15", default-features = false }
 log = { version = "0.4", default-features = false }
-primitive-types = { version = "0.12", default-features = false, features = ["rlp"] }
+primitive-types = { workspace = true, features = ["rlp"] }
 rlp = { version = "0.5", default-features = false }
-sha3 = { version = "0.10", default-features = false }
 
 # Optional dependencies
 environmental = { version = "1.1.2", default-features = false, optional = true }
 scale-codec = { package = "parity-scale-codec", version = "3.2", default-features = false, features = ["derive"], optional = true }
 scale-info = { version = "2.11", default-features = false, features = ["derive"], optional = true }
 serde = { version = "1.0", default-features = false, features = ["derive"], optional = true }
 
-evm-core = { version = "0.43", path = "core", default-features = false }
-evm-runtime = { version = "0.43", path = "runtime", default-features = false }
-evm-gasometer = { version = "0.43", path = "gasometer", default-features = false }
+auto_impl.workspace = true
+sha3.workspace = true
+evm-core.workspace = true
+evm-gasometer.workspace = true
+evm-runtime.workspace = true
 
 [dev-dependencies]
 criterion = "0.5"

diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -9,8 +9,10 @@ description.workspace = true
 repository.workspace = true
 
 [dependencies]
+primitive-types.workspace = true
+
+# Optional
 log = { version = "0.4", optional = true }
-primitive-types = { version = "0.12", default-features = false }
 scale-codec = { package = "parity-scale-codec", version = "3.2", default-features = false, features = ["derive", "full"], optional = true }
 scale-info = { version = "2.3", default-features = false, features = ["derive"], optional = true }
 serde = { version = "1.0", default-features = false, features = ["derive"], optional = true }

diff --git a/evm-tests/jsontests/Cargo.toml b/evm-tests/jsontests/Cargo.toml
@@ -9,7 +9,7 @@ keywords.workspace = true
 edition.workspace = true
 
 [dependencies]
-evm = { path = "../..", version = "0.43" }
+evm.workspace = true
 ethereum = "0.15.0"
 primitive-types = "0.12"
 serde = { version = "1.0", features = ["derive"] }

diff --git a/fuzzer/Cargo.toml b/fuzzer/Cargo.toml
@@ -9,7 +9,7 @@ license = "Apache-2.0"
 [dependencies]
 honggfuzz = "0.5"
 
-evm-core = { version = "0.43", path = "../core" }
+evm-core.workspace = true
 
 [[bin]]
 name = "evm_fuzz"

diff --git a/gasometer/Cargo.toml b/gasometer/Cargo.toml
@@ -9,12 +9,13 @@ description.workspace = true
 repository.workspace = true
 
 [dependencies]
+primitive-types.workspace = true
+evm-core.workspace = true
+evm-runtime.workspace = true
+
+# Optional
 environmental = { version = "1.1.2", default-features = false, optional = true }
 log = { version = "0.4", optional = true }
-primitive-types = { version = "0.12", default-features = false }
-
-evm-core = { version = "0.43", path = "../core", default-features = false }
-evm-runtime = { version = "0.43", path = "../runtime", default-features = false }
 
 [features]
 default = ["std"]

diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
@@ -9,12 +9,13 @@ description.workspace = true
 repository.workspace = true
 
 [dependencies]
-auto_impl = "1.0"
-environmental = { version = "1.1", default-features = false, optional = true }
-primitive-types = { version = "0.12", default-features = false }
-sha3 = { version = "0.10", default-features = false }
+auto_impl.workspace = true
+primitive-types.workspace = true
+sha3.workspace = true
+evm-core.workspace = true
 
-evm-core = { version = "0.43", path = "../core", default-features = false }
+# Optional
+environmental = { version = "1.1", default-features = false, optional = true }
 
 [features]
 default = ["std"]