From 6e4066b62dd106be2de321d997a24b5b1bb688c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Tue, 23 Jul 2019 13:57:32 +0200 Subject: [PATCH] Bkchr check all benches (#3180) * Make sure CI checks all benchmarks * Fix babe --- substrate/.gitlab-ci.yml | 2 +- substrate/README.adoc | 2 +- substrate/core/consensus/babe/src/tests.rs | 2 +- substrate/srml/system/benches/bench.rs | 4 ++++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/substrate/.gitlab-ci.yml b/substrate/.gitlab-ci.yml index 916dcb7b96..832b754162 100644 --- a/substrate/.gitlab-ci.yml +++ b/substrate/.gitlab-ci.yml @@ -95,7 +95,7 @@ cargo-check-benches: stage: test <<: *docker-env script: - - BUILD_DUMMY_WASM_BINARY=1 time cargo check --benches + - BUILD_DUMMY_WASM_BINARY=1 time cargo check --benches --all - sccache -s diff --git a/substrate/README.adoc b/substrate/README.adoc index fd929e87a2..89c042bb32 100644 --- a/substrate/README.adoc +++ b/substrate/README.adoc @@ -308,7 +308,7 @@ cargo run --release \-- \ Additional Substrate CLI usage options are available and may be shown by running `cargo run \-- --help`. -== WASM binaries +=== WASM binaries The WASM binaries are built during the normal `cargo build` process. To control the WASM binary building, we support multiple environment variables: diff --git a/substrate/core/consensus/babe/src/tests.rs b/substrate/core/consensus/babe/src/tests.rs index 4054fb9306..17864142db 100644 --- a/substrate/core/consensus/babe/src/tests.rs +++ b/substrate/core/consensus/babe/src/tests.rs @@ -233,7 +233,7 @@ fn run_one_test() { let wait_for = futures::future::join_all(import_notifications); let drive_to_completion = futures::future::poll_fn(|| { net.lock().poll(); Ok(Async::NotReady) }); - runtime.block_on(wait_for.select(drive_to_completion).map_err(|_| ())).unwrap(); + let _ = runtime.block_on(wait_for.select(drive_to_completion).map_err(|_| ())).unwrap(); } #[test] diff --git a/substrate/srml/system/benches/bench.rs b/substrate/srml/system/benches/bench.rs index 0f4c453ee8..5ff63baa1c 100644 --- a/substrate/srml/system/benches/bench.rs +++ b/substrate/srml/system/benches/bench.rs @@ -56,6 +56,8 @@ impl_outer_event! { srml_support::parameter_types! { pub const BlockHashCount: u64 = 250; + pub const MaximumBlockWeight: u32 = 4 * 1024 * 1024; + pub const MaximumBlockLength: u32 = 4 * 1024 * 1024; } #[derive(Clone, Eq, PartialEq)] pub struct Runtime; @@ -71,6 +73,8 @@ impl system::Trait for Runtime { type WeightMultiplierUpdate = (); type Event = Event; type BlockHashCount = BlockHashCount; + type MaximumBlockWeight = MaximumBlockWeight; + type MaximumBlockLength = MaximumBlockLength; } impl module::Trait for Runtime {