diff --git a/Cargo.lock b/Cargo.lock index f08559d2..10db5a1d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2680,6 +2680,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", + "libm", ] [[package]] @@ -3211,22 +3212,23 @@ dependencies = [ [[package]] name = "proptest" -version = "0.10.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12e6c80c1139113c28ee4670dc50cc42915228b51f56a9e407f0ec60f966646f" +checksum = "29f1b898011ce9595050a68e60f90bad083ff2987a695a42357134c8381fba70" dependencies = [ "bit-set", "bitflags 1.3.2", "byteorder", "lazy_static", "num-traits", - "quick-error", - "rand 0.7.3", - "rand_chacha 0.2.2", + "quick-error 2.0.1", + "rand 0.8.5", + "rand_chacha 0.3.1", "rand_xorshift", "regex-syntax", "rusty-fork", "tempfile", + "unarray", ] [[package]] @@ -3316,6 +3318,12 @@ version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" +[[package]] +name = "quick-error" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" + [[package]] name = "quick-xml" version = "0.26.0" @@ -3445,11 +3453,11 @@ dependencies = [ [[package]] name = "rand_xorshift" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77d416b86801d23dde1aa643023b775c3a462efc0ed96443add11546cdf1dca8" +checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" dependencies = [ - "rand_core 0.5.1", + "rand_core 0.6.4", ] [[package]] @@ -3771,7 +3779,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" dependencies = [ "fnv", - "quick-error", + "quick-error 1.2.3", "tempfile", "wait-timeout", ] @@ -4936,6 +4944,12 @@ dependencies = [ "libc", ] +[[package]] +name = "unarray" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" + [[package]] name = "unicase" version = "2.6.0" diff --git a/deny.toml b/deny.toml index 78c27953..2de812ac 100644 --- a/deny.toml +++ b/deny.toml @@ -87,6 +87,9 @@ skip-tree = [ # wait for console-subscriber and tower to update hdrhistogram. # also wait for ron to update insta, and wait for tonic update. { name = "base64", version = "=0.13.1" }, + + # wait for proptest's rusty-fork dependency to upgrade quick-error + { name = "quick-error", version = "=1.2.3" }, # Optional dependencies diff --git a/zebra-chain/Cargo.toml b/zebra-chain/Cargo.toml index 30b33487..ba73d7e4 100644 --- a/zebra-chain/Cargo.toml +++ b/zebra-chain/Cargo.toml @@ -92,7 +92,7 @@ reddsa = "0.5.0" zcash_address = { version = "0.2.0", optional = true } # Optional testing dependencies -proptest = { version = "0.10.1", optional = true } +proptest = { version = "1.1.0", optional = true } proptest-derive = { version = "0.3.0", optional = true } rand = { version = "0.8.5", optional = true, package = "rand" } @@ -115,7 +115,7 @@ spandoc = "0.2.2" tracing = "0.1.37" # Make the optional testing dependencies required -proptest = "0.10.1" +proptest = "1.1.0" proptest-derive = "0.3.0" rand = { version = "0.8.5", package = "rand" } diff --git a/zebra-consensus/Cargo.toml b/zebra-consensus/Cargo.toml index 017d974b..7f4993fc 100644 --- a/zebra-consensus/Cargo.toml +++ b/zebra-consensus/Cargo.toml @@ -57,7 +57,7 @@ zebra-node-services = { path = "../zebra-node-services" } zebra-chain = { path = "../zebra-chain" } # Test-only dependencies -proptest = { version = "0.10.1", optional = true } +proptest = { version = "1.1.0", optional = true } proptest-derive = { version = "0.3.0", optional = true } [dev-dependencies] @@ -67,7 +67,7 @@ color-eyre = "0.6.2" tinyvec = { version = "1.6.0", features = ["rustc_1_55"] } hex = "0.4.3" -proptest = "0.10.1" +proptest = "1.1.0" proptest-derive = "0.3.0" spandoc = "0.2.2" diff --git a/zebra-network/Cargo.toml b/zebra-network/Cargo.toml index 49bc244c..dde338f2 100644 --- a/zebra-network/Cargo.toml +++ b/zebra-network/Cargo.toml @@ -47,13 +47,13 @@ tracing = "0.1.37" # tor-rtcompat = { version = "0.0.2", optional = true } # proptest dependencies -proptest = { version = "0.10.1", optional = true } +proptest = { version = "1.1.0", optional = true } proptest-derive = { version = "0.3.0", optional = true } zebra-chain = { path = "../zebra-chain" } [dev-dependencies] -proptest = "0.10.1" +proptest = "1.1.0" proptest-derive = "0.3.0" static_assertions = "1.1.0" diff --git a/zebra-rpc/Cargo.toml b/zebra-rpc/Cargo.toml index 63fd529d..6c28cb2e 100644 --- a/zebra-rpc/Cargo.toml +++ b/zebra-rpc/Cargo.toml @@ -61,7 +61,7 @@ rand = { version = "0.8.5", package = "rand", optional = true } zcash_address = { version = "0.2.0", optional = true } # Test-only feature proptest-impl -proptest = { version = "0.10.1", optional = true } +proptest = { version = "1.1.0", optional = true } zebra-chain = { path = "../zebra-chain" } zebra-consensus = { path = "../zebra-consensus" } @@ -73,7 +73,7 @@ zebra-state = { path = "../zebra-state" } [dev-dependencies] insta = { version = "1.29.0", features = ["redactions", "json", "ron"] } -proptest = "0.10.1" +proptest = "1.1.0" thiserror = "1.0.40" tokio = { version = "1.26.0", features = ["full", "tracing", "test-util"] } diff --git a/zebra-state/Cargo.toml b/zebra-state/Cargo.toml index e81aec2a..425b3631 100644 --- a/zebra-state/Cargo.toml +++ b/zebra-state/Cargo.toml @@ -58,7 +58,7 @@ serde_json = { version = "1.0.93", package = "serde_json", optional = true } zebra-chain = { path = "../zebra-chain" } zebra-test = { path = "../zebra-test/", optional = true } -proptest = { version = "0.10.1", optional = true } +proptest = { version = "1.1.0", optional = true } proptest-derive = { version = "0.3.0", optional = true } [dev-dependencies] @@ -73,7 +73,7 @@ spandoc = "0.2.2" hex = { version = "0.4.3", features = ["serde"] } insta = { version = "1.29.0", features = ["ron"] } -proptest = "0.10.1" +proptest = "1.1.0" proptest-derive = "0.3.0" halo2 = { package = "halo2_proofs", version = "0.2.0" } diff --git a/zebra-test/Cargo.toml b/zebra-test/Cargo.toml index 64845cda..164a0681 100644 --- a/zebra-test/Cargo.toml +++ b/zebra-test/Cargo.toml @@ -12,7 +12,7 @@ hex = "0.4.3" indexmap = "1.9.3" lazy_static = "1.4.0" insta = "1.29.0" -proptest = "0.10.1" +proptest = "1.1.0" once_cell = "1.17.1" rand = { version = "0.8.5", package = "rand" } regex = "1.7.3" diff --git a/zebrad/Cargo.toml b/zebrad/Cargo.toml index 10e6b4b9..2d93b740 100644 --- a/zebrad/Cargo.toml +++ b/zebrad/Cargo.toml @@ -161,7 +161,7 @@ metrics-exporter-prometheus = { version = "0.11.0", default-features = false, fe log = "0.4.17" # test feature proptest-impl -proptest = { version = "0.10.1", optional = true } +proptest = { version = "1.1.0", optional = true } proptest-derive = { version = "0.3.0", optional = true } # test feature tokio-console @@ -195,7 +195,7 @@ tokio-stream = "0.1.12" prost = "0.11.8" tonic = "0.8.0" -proptest = "0.10.1" +proptest = "1.1.0" proptest-derive = "0.3.0" # enable span traces and track caller in tests