update criterion to v0.4.0 (paritytech#13142)

ltfschoen · Feb 22, 2023 · c94c89c · c94c89c
1 parent 3e8676a
commit c94c89c
Show file tree

Hide file tree

Showing 13 changed files with 78 additions and 82 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
@@ -122,7 +122,7 @@ serde_json = "1.0"
 regex = "1.6.0"
 platforms = "2.0"
 soketto = "0.7.1"
-criterion = { version = "0.3.5", features = ["async_tokio"] }
+criterion = { version = "0.4.0", 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
@@ -26,7 +26,7 @@ sp-tracing = { version = "6.0.0", path = "../../../primitives/tracing" }
 sp-trie = { version = "7.0.0", path = "../../../primitives/trie" }
 
 [dev-dependencies]
-criterion = "0.3.0"
+criterion = "0.4.0"
 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
@@ -36,7 +36,7 @@ sp-state-machine = { version = "0.13.0", path = "../../primitives/state-machine"
 sp-trie = { version = "7.0.0", path = "../../primitives/trie" }
 
 [dev-dependencies]
-criterion = "0.3.3"
+criterion = "0.4.0"
 kvdb-rocksdb = "0.17.0"
 rand = "0.8.5"
 tempfile = "3.1.0"

diff --git a/client/executor/Cargo.toml b/client/executor/Cargo.toml
@@ -46,7 +46,7 @@ sc-tracing = { version = "4.0.0-dev", path = "../tracing" }
 tracing-subscriber = "0.2.19"
 paste = "1.0"
 regex = "1.6.0"
-criterion = "0.3"
+criterion = "0.4.0"
 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
@@ -39,7 +39,7 @@ sp-runtime = { version = "7.0.0", path = "../../primitives/runtime" }
 sp-tracing = { version = "6.0.0", path = "../../primitives/tracing" }
 
 [dev-dependencies]
-criterion = "0.3"
+criterion = "0.4.0"
 
 [[bench]]
 name = "bench"

diff --git a/client/transaction-pool/Cargo.toml b/client/transaction-pool/Cargo.toml
@@ -37,7 +37,7 @@ sp-transaction-pool = { version = "4.0.0-dev", path = "../../primitives/transact
 [dev-dependencies]
 array-bytes = "4.1"
 assert_matches = "1.3.0"
-criterion = "0.3"
+criterion = "0.4.0"
 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
@@ -26,7 +26,7 @@ sp-version = { version = "5.0.0", default-features = false, path = "../../primit
 sp-weights = { version = "4.0.0", default-features = false, path = "../../primitives/weights" }
 
 [dev-dependencies]
-criterion = "0.3.3"
+criterion = "0.4.0"
 sp-externalities = { version = "0.13.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
@@ -25,7 +25,7 @@ trybuild = "1.0.74"
 rustversion = "1.0.6"
 
 [dev-dependencies]
-criterion = "0.3.0"
+criterion = "0.4.0"
 futures = "0.3.21"
 log = "0.4.17"
 sp-core = { version = "7.0.0", path = "../../core" }

diff --git a/primitives/arithmetic/Cargo.toml b/primitives/arithmetic/Cargo.toml
@@ -26,7 +26,7 @@ static_assertions = "1.1.0"
 sp-std = { version = "5.0.0", default-features = false, path = "../std" }
 
 [dev-dependencies]
-criterion = "0.3"
+criterion = "0.4.0"
 primitive-types = "0.12.0"
 sp-core = { version = "7.0.0", features = ["full_crypto"], path = "../core" }
 rand = "0.8.5"

diff --git a/primitives/core/Cargo.toml b/primitives/core/Cargo.toml
@@ -25,7 +25,7 @@ impl-serde = { version = "0.4.0", optional = true }
 hash-db = { version = "0.15.2", default-features = false }
 hash256-std-hasher = { version = "0.15.2", default-features = false }
 base58 = { version = "0.2.0", optional = true }
-rand = { version = "0.8.5", optional = true, features = ["small_rng"] }
+rand = { version = "0.8.5", features = ["small_rng"],  optional = true }
 substrate-bip39 = { version = "0.4.4", optional = true }
 tiny-bip39 = { version = "1.0.0", optional = true }
 regex = { version = "1.6.0", optional = true }
@@ -60,7 +60,7 @@ sp-runtime-interface = { version = "7.0.0", default-features = false, path = "..
 [dev-dependencies]
 sp-serializer = { version = "4.0.0-dev", path = "../serializer" }
 rand = "0.8.5"
-criterion = "0.3.3"
+criterion = "0.4.0"
 serde_json = "1.0"
 sp-core-hashing-proc-macro = { version = "5.0.0", path = "./hashing/proc-macro" }
 

diff --git a/primitives/core/benches/bench.rs b/primitives/core/benches/bench.rs
@@ -12,10 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#[macro_use]
-extern crate criterion;
-
-use criterion::{black_box, Bencher, BenchmarkId, Criterion};
+use criterion::{black_box, criterion_group, criterion_main, Bencher, BenchmarkId, Criterion};
 use sp_core::{
 	crypto::Pair as _,
 	hashing::{blake2_128, twox_128},