diff --git a/Cargo.lock b/Cargo.lock index 3d51a0fb1ffa4..fa78ff353b3c7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1708,7 +1708,6 @@ dependencies = [ "ciborium", "clap 3.2.25", "criterion-plot", - "futures", "itertools", "lazy_static", "num-traits", @@ -1720,6 +1719,33 @@ dependencies = [ "serde_derive", "serde_json", "tinytemplate", + "walkdir", +] + +[[package]] +name = "criterion" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" +dependencies = [ + "anes", + "cast", + "ciborium", + "clap 4.3.2", + "criterion-plot", + "futures", + "is-terminal", + "itertools", + "num-traits", + "once_cell", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", "tokio", "walkdir", ] @@ -3101,7 +3127,7 @@ name = "frame-system" version = "4.0.0-dev" dependencies = [ "cfg-if", - "criterion", + "criterion 0.5.1", "frame-support", "log", "parity-scale-codec", @@ -5559,7 +5585,7 @@ dependencies = [ "assert_cmd", "clap 4.3.2", "clap_complete", - "criterion", + "criterion 0.5.1", "frame-benchmarking-cli", "frame-system", "frame-system-rpc-runtime-api", @@ -5645,7 +5671,7 @@ dependencies = [ name = "node-executor" version = "3.0.0-dev" dependencies = [ - "criterion", + "criterion 0.5.1", "frame-benchmarking", "frame-support", "frame-system", @@ -9389,7 +9415,7 @@ name = "sc-client-db" version = "0.10.0-dev" dependencies = [ "array-bytes", - "criterion", + "criterion 0.5.1", "hash-db", "kitchensink-runtime", "kvdb", @@ -9789,7 +9815,7 @@ version = "0.10.0-dev" dependencies = [ "array-bytes", "assert_matches", - "criterion", + "criterion 0.5.1", "env_logger 0.9.3", "num_cpus", "parity-scale-codec", @@ -10496,7 +10522,7 @@ dependencies = [ "ansi_term", "atty", "chrono", - "criterion", + "criterion 0.5.1", "lazy_static", "libc", "log", @@ -10535,7 +10561,7 @@ dependencies = [ "array-bytes", "assert_matches", "async-trait", - "criterion", + "criterion 0.5.1", "futures", "futures-timer", "linked-hash-map", @@ -11094,7 +11120,7 @@ dependencies = [ name = "sp-api-test" version = "2.0.1" dependencies = [ - "criterion", + "criterion 0.5.1", "futures", "log", "parity-scale-codec", @@ -11140,7 +11166,7 @@ dependencies = [ name = "sp-arithmetic" version = "16.0.0" dependencies = [ - "criterion", + "criterion 0.5.1", "integer-sqrt", "num-traits", "parity-scale-codec", @@ -11416,7 +11442,7 @@ dependencies = [ "blake2", "bounded-collections", "bs58", - "criterion", + "criterion 0.5.1", "dyn-clonable", "ed25519-zebra", "futures", @@ -11943,7 +11969,7 @@ version = "22.0.0" dependencies = [ "ahash 0.8.3", "array-bytes", - "criterion", + "criterion 0.5.1", "hash-db", "hashbrown 0.13.2", "lazy_static", @@ -13015,7 +13041,7 @@ version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4f54b4f9d51d368e62cf7e0730c7c1e18fc658cc84333656bab5b328f44aa964" dependencies = [ - "criterion", + "criterion 0.4.0", "hash-db", "keccak-hasher", "memory-db", diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml index fcab4cc6517a9..330527c5313db 100644 --- a/bin/node/cli/Cargo.toml +++ b/bin/node/cli/Cargo.toml @@ -126,7 +126,7 @@ serde_json = "1.0" regex = "1.6.0" platforms = "3.0" soketto = "0.7.1" -criterion = { version = "0.4.0", features = ["async_tokio"] } +criterion = { version = "0.5.1", features = ["async_tokio"] } tokio = { version = "1.22.0", features = ["macros", "time", "parking_lot"] } tokio-util = { version = "0.7.4", features = ["compat"] } wait-timeout = "0.2" diff --git a/bin/node/executor/Cargo.toml b/bin/node/executor/Cargo.toml index b24414482952c..fd87d37ff72cb 100644 --- a/bin/node/executor/Cargo.toml +++ b/bin/node/executor/Cargo.toml @@ -27,7 +27,7 @@ sp-trie = { version = "22.0.0", path = "../../../primitives/trie" } sp-statement-store = { version = "4.0.0-dev", path = "../../../primitives/statement-store" } [dev-dependencies] -criterion = "0.4.0" +criterion = "0.5.1" futures = "0.3.21" wat = "1.0" frame-support = { version = "4.0.0-dev", path = "../../../frame/support" } diff --git a/client/db/Cargo.toml b/client/db/Cargo.toml index e351798a026f7..441180e082bce 100644 --- a/client/db/Cargo.toml +++ b/client/db/Cargo.toml @@ -36,7 +36,7 @@ sp-state-machine = { version = "0.28.0", path = "../../primitives/state-machine" sp-trie = { version = "22.0.0", path = "../../primitives/trie" } [dev-dependencies] -criterion = "0.4.0" +criterion = "0.5.1" kvdb-rocksdb = "0.19.0" rand = "0.8.5" tempfile = "3.1.0" diff --git a/client/executor/Cargo.toml b/client/executor/Cargo.toml index e7252ef3f19cb..4ad032e1b71c5 100644 --- a/client/executor/Cargo.toml +++ b/client/executor/Cargo.toml @@ -45,7 +45,7 @@ sp-tracing = { version = "10.0.0", path = "../../primitives/tracing" } tracing-subscriber = "0.2.19" paste = "1.0" regex = "1.6.0" -criterion = "0.4.0" +criterion = "0.5.1" env_logger = "0.9" num_cpus = "1.13.1" tempfile = "3.3.0" diff --git a/client/tracing/Cargo.toml b/client/tracing/Cargo.toml index fa229782a781e..9e11018634baf 100644 --- a/client/tracing/Cargo.toml +++ b/client/tracing/Cargo.toml @@ -37,7 +37,7 @@ sp-runtime = { version = "24.0.0", path = "../../primitives/runtime" } sp-tracing = { version = "10.0.0", path = "../../primitives/tracing" } [dev-dependencies] -criterion = "0.4.0" +criterion = "0.5.1" [[bench]] name = "bench" diff --git a/client/transaction-pool/Cargo.toml b/client/transaction-pool/Cargo.toml index 1718751e6d83c..880ba55087cd9 100644 --- a/client/transaction-pool/Cargo.toml +++ b/client/transaction-pool/Cargo.toml @@ -36,7 +36,7 @@ sp-transaction-pool = { version = "4.0.0-dev", path = "../../primitives/transact [dev-dependencies] array-bytes = "6.1" assert_matches = "1.3.0" -criterion = "0.4.0" +criterion = "0.5.1" sc-block-builder = { version = "0.10.0-dev", path = "../block-builder" } sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/common" } substrate-test-runtime = { version = "2.0.0", path = "../../test-utils/runtime" } diff --git a/frame/system/Cargo.toml b/frame/system/Cargo.toml index 6530862832c3f..b6f09ebecb4cb 100644 --- a/frame/system/Cargo.toml +++ b/frame/system/Cargo.toml @@ -27,7 +27,7 @@ sp-version = { version = "22.0.0", default-features = false, path = "../../primi sp-weights = { version = "20.0.0", default-features = false, path = "../../primitives/weights", features = ["serde"] } [dev-dependencies] -criterion = "0.4.0" +criterion = "0.5.1" sp-externalities = { version = "0.19.0", path = "../../primitives/externalities" } substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" } diff --git a/primitives/api/test/Cargo.toml b/primitives/api/test/Cargo.toml index 48eb067e4e474..55e14f6e3acf7 100644 --- a/primitives/api/test/Cargo.toml +++ b/primitives/api/test/Cargo.toml @@ -26,7 +26,7 @@ rustversion = "1.0.6" scale-info = { version = "2.5.0", default-features = false, features = ["derive"] } [dev-dependencies] -criterion = "0.4.0" +criterion = "0.5.1" futures = "0.3.21" log = "0.4.17" sp-core = { version = "21.0.0", path = "../../core" } diff --git a/primitives/arithmetic/Cargo.toml b/primitives/arithmetic/Cargo.toml index d7b9b2bf74791..211df93c9cd9e 100644 --- a/primitives/arithmetic/Cargo.toml +++ b/primitives/arithmetic/Cargo.toml @@ -26,7 +26,7 @@ static_assertions = "1.1.0" sp-std = { version = "8.0.0", default-features = false, path = "../std" } [dev-dependencies] -criterion = "0.4.0" +criterion = "0.5.1" primitive-types = "0.12.0" sp-core = { version = "21.0.0", features = ["full_crypto"], path = "../core" } rand = "0.8.5" diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml index 85952b355464d..a0f1d45a28034 100644 --- a/primitives/core/Cargo.toml +++ b/primitives/core/Cargo.toml @@ -61,7 +61,7 @@ w3f-bls = { version = "0.1.3", default-features = false, optional = true} bandersnatch_vrfs = { git = "https://github.com/w3f/ring-vrf", rev = "c86ebd4", default-features = false, optional = true } [dev-dependencies] -criterion = "0.4.0" +criterion = "0.5.1" serde_json = "1.0" sp-core-hashing-proc-macro = { version = "9.0.0", path = "./hashing/proc-macro" } diff --git a/primitives/trie/Cargo.toml b/primitives/trie/Cargo.toml index 5b6877592c315..42b5dbf842b17 100644 --- a/primitives/trie/Cargo.toml +++ b/primitives/trie/Cargo.toml @@ -37,7 +37,7 @@ schnellru = { version = "0.2.1", optional = true } [dev-dependencies] array-bytes = "6.1" -criterion = "0.4.0" +criterion = "0.5.1" trie-bench = "0.37.0" trie-standardmap = "0.16.0" sp-runtime = { version = "24.0.0", path = "../runtime" }