fix shared/sdk build without rand

anoma · Jan 8, 2024 · 9c68c1c · 9c68c1c
1 parent 15ccaa3
commit 9c68c1c
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/apps/Cargo.toml b/apps/Cargo.toml
@@ -62,7 +62,7 @@ integration = []
 
 [dependencies]
 namada = {path = "../shared", features = ["multicore", "http-client", "tendermint-rpc", "std"]}
-namada_sdk = {path = "../sdk", default-features = false, features = ["wasm-runtime", "download-params", "std"]}
+namada_sdk = {path = "../sdk", default-features = false, features = ["wasm-runtime", "download-params", "std", "rand"]}
 namada_test_utils = {path = "../test_utils", optional = true}
 
 ark-serialize.workspace = true

diff --git a/benches/Cargo.toml b/benches/Cargo.toml
@@ -40,7 +40,7 @@ path = "host_env.rs"
 [dependencies]
 
 [dev-dependencies]
-namada = { path = "../shared", features = ["std", "testing"] }
+namada = { path = "../shared", features = ["rand", "testing"] }
 namada_apps = { path = "../apps", features = ["benches"] }
 masp_primitives.workspace = true
 borsh.workspace = true

diff --git a/encoding_spec/Cargo.toml b/encoding_spec/Cargo.toml
@@ -16,7 +16,7 @@ version.workspace = true
 default = []
 
 [dependencies]
-namada = { path = "../shared", features = ["std", "tendermint-rpc", "download-params"] }
+namada = { path = "../shared", features = ["rand", "tendermint-rpc", "download-params"] }
 borsh.workspace = true
 itertools.workspace = true
 lazy_static.workspace = true

diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml
@@ -15,13 +15,14 @@ version.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [features]
-default = ["tendermint-rpc", "download-params", "std"]
+default = ["tendermint-rpc", "download-params", "std", "rand"]
 
 multicore = ["masp_proofs/multicore"]
 
 namada-sdk = ["tendermint-rpc", "masp_primitives/transparent-inputs"]
 
-std = ["fd-lock", "dep:rand", "rand_core", "namada_core/rand"]
+std = ["fd-lock"]
+rand = ["dep:rand", "rand_core", "namada_core/rand"]
 
 # tendermint-rpc support
 tendermint-rpc = ["async-client", "dep:tendermint-rpc"]

diff --git a/shared/Cargo.toml b/shared/Cargo.toml
@@ -17,7 +17,7 @@ version.workspace = true
 [features]
 default = ["wasm-runtime"]
 mainnet = ["namada_core/mainnet"]
-std = ["fd-lock", "namada_sdk/std"]
+std = ["namada_sdk/std"]
 wasm-runtime = [
   "namada_core/wasm-runtime",
   "loupe",
@@ -62,6 +62,7 @@ namada-sdk = [
   "tendermint-rpc",
   "masp_primitives/transparent-inputs",
   "namada_sdk/namada-sdk",
+  "namada_sdk/rand",
 ]
 
 multicore = [
@@ -71,6 +72,7 @@ multicore = [
 ]
 # Download MASP params if they're not present
 download-params = ["namada_sdk/download-params"]
+rand = ["namada_sdk/rand"]
 
 [dependencies]
 namada_account = { path = "../account" }
@@ -101,7 +103,6 @@ derivative.workspace = true
 ethbridge-bridge-contract.workspace = true
 ethers.workspace = true
 eyre.workspace = true
-fd-lock = { workspace = true, optional = true }
 futures.workspace = true
 itertools.workspace = true
 loupe = { version = "0.1.3", optional = true }