Update tower-batch tests to rand 0.8

And move the ed25519-zebra patch to the workspace Cargo.toml. This fix helps avoid Cargo.lock instability.
ZcashFoundation · Apr 7, 2021 · d128e58 · d128e58
1 parent 64662a7
commit d128e58
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 21 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -22,6 +22,8 @@ panic = "abort"
 
 [patch.crates-io]
 
+# TODO: upgrade ed25510-zebra to 3 when released: https://github.com/ZcashFoundation/ed25519-zebra/issues/45
+ed25519-zebra = {git = "https://github.com/ZcashFoundation/ed25519-zebra", rev = "539fad040c443302775b0f508e616418825e6c22"}
 
 # awaiting stable versions which all depend on tokio 1.0, see #1086 for details
 hyper = { git = "https://github.com/hyperium/hyper", rev = "ed2b22a7f66899d338691552fbcb6c0f2f4e06b9" }

diff --git a/tower-batch/Cargo.toml b/tower-batch/Cargo.toml
@@ -16,8 +16,8 @@ tracing-futures = "0.2.5"
 
 [dev-dependencies]
 color-eyre = "0.5.10"
-ed25519-zebra = "2.1.0"
-rand = "0.7"
+ed25519-zebra = "2.2.0"
+rand = "0.8"
 tokio = { version = "0.3.6", features = ["full"]}
 tokio-test = "0.4.1"
 tower-fallback = { path = "../tower-fallback/" }

diff --git a/zebra-chain/Cargo.toml b/zebra-chain/Cargo.toml
@@ -41,8 +41,7 @@ proptest = { version = "0.10", optional = true }
 proptest-derive = { version = "0.3.0", optional = true }
 
 # ZF deps
-# TODO: upgrade ed25510-zebra to 3 when released: https://github.com/ZcashFoundation/ed25519-zebra/issues/45
-ed25519-zebra = {git = "https://github.com/ZcashFoundation/ed25519-zebra", rev = "539fad040c443302775b0f508e616418825e6c22"}
+ed25519-zebra = "2.2.0"
 redjubjub = "0.4"
 
 [dev-dependencies]