diff --git a/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs b/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs index fd57eba27bd..bcff038b0ec 100644 --- a/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs +++ b/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs @@ -977,8 +977,17 @@ impl_runtime_apis! { impl BridgeMessagesConfig for Runtime { fn is_relayer_rewarded(relayer: &Self::AccountId) -> bool { + use bridge_runtime_common::messages::MessageBridge; let bench_lane_id = >::bench_lane_id(); - pallet_bridge_relayers::Pallet::::relayer_reward(relayer, &bench_lane_id).is_some() + let bridged_chain_id = bridge_hub_rococo_config::WithBridgeHubWococoMessageBridge::BRIDGED_CHAIN_ID; + pallet_bridge_relayers::Pallet::::relayer_reward( + relayer, + bp_relayers::RewardsAccountParams::new( + bench_lane_id, + bridged_chain_id, + bp_relayers::RewardsAccountOwner::BridgedChain + ) + ).is_some() } fn prepare_message_proof( @@ -1004,8 +1013,17 @@ impl_runtime_apis! { impl BridgeMessagesConfig for Runtime { fn is_relayer_rewarded(relayer: &Self::AccountId) -> bool { + use bridge_runtime_common::messages::MessageBridge; let bench_lane_id = >::bench_lane_id(); - pallet_bridge_relayers::Pallet::::relayer_reward(relayer, &bench_lane_id).is_some() + let bridged_chain_id = bridge_hub_wococo_config::WithBridgeHubRococoMessageBridge::BRIDGED_CHAIN_ID; + pallet_bridge_relayers::Pallet::::relayer_reward( + relayer, + bp_relayers::RewardsAccountParams::new( + bench_lane_id, + bridged_chain_id, + bp_relayers::RewardsAccountOwner::BridgedChain + ) + ).is_some() } fn prepare_message_proof( @@ -1089,15 +1107,15 @@ impl_runtime_apis! { impl BridgeRelayersConfig for Runtime { fn prepare_environment( - lane: bp_messages::LaneId, + account_params: bp_relayers::RewardsAccountParams, reward: Balance, ) { use frame_support::traits::fungible::Mutate; - let lane_rewards_account = bp_relayers::PayLaneRewardFromAccount::< + let rewards_account = bp_relayers::PayRewardFromAccount::< Balances, AccountId - >::lane_rewards_account(lane); - Balances::mint_into(&lane_rewards_account, reward).unwrap(); + >::rewards_account(account_params); + Balances::mint_into(&rewards_account, reward).unwrap(); } } diff --git a/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_grandpa_bridge_rococo_grandpa.rs b/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_grandpa_bridge_rococo_grandpa.rs index 9dfa44f562c..88e9c24bc58 100644 --- a/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_grandpa_bridge_rococo_grandpa.rs +++ b/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_grandpa_bridge_rococo_grandpa.rs @@ -17,25 +17,26 @@ //! Autogenerated weights for `pallet_bridge_grandpa` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-01-22, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! HOSTNAME: `bm3`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` +//! DATE: 2023-03-15, STEPS: `10`, REPEAT: `1`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` +//! HOSTNAME: `bkontur-ThinkPad-P14s-Gen-2i`, CPU: `11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("bridge-hub-rococo-dev"), DB CACHE: 1024 // Executed Command: -// /home/benchbot/cargo_target_dir/production/polkadot-parachain +// ./target/production/polkadot-parachain // benchmark // pallet -// --steps=50 -// --repeat=20 +// --steps=10 +// --repeat=1 // --extrinsic=* // --execution=wasm // --wasm-execution=compiled // --heap-pages=4096 -// --json-file=/var/lib/gitlab-runner/builds/zyw4fam_/0/parity/mirrors/cumulus/.git/.artifacts/bench.json -// --pallet=pallet_bridge_grandpa -// --chain=bridge-hub-rococo-dev +// --json-file=./bench.json // --header=./file_header.txt -// --output=./parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/ +// --chain=bridge-hub-rococo-dev +// --pallet=pallet_bridge_grandpa +// --output=./parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] @@ -47,24 +48,35 @@ use sp_std::marker::PhantomData; /// Weight functions for `pallet_bridge_grandpa`. pub struct WeightInfo(PhantomData); impl pallet_bridge_grandpa::WeightInfo for WeightInfo { - // Storage: BridgeRococoGrandpa PalletOperatingMode (r:1 w:0) - // Storage: BridgeRococoGrandpa RequestCount (r:1 w:1) - // Storage: BridgeRococoGrandpa BestFinalized (r:1 w:1) - // Storage: BridgeRococoGrandpa CurrentAuthoritySet (r:1 w:0) - // Storage: BridgeRococoGrandpa ImportedHashesPointer (r:1 w:1) - // Storage: BridgeRococoGrandpa ImportedHashes (r:1 w:1) - // Storage: BridgeRococoGrandpa ImportedHeaders (r:0 w:2) - /// The range of component `p` is `[51, 102]`. + /// Storage: BridgeRococoGrandpa PalletOperatingMode (r:1 w:0) + /// Proof: BridgeRococoGrandpa PalletOperatingMode (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) + /// Storage: BridgeRococoGrandpa RequestCount (r:1 w:1) + /// Proof: BridgeRococoGrandpa RequestCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) + /// Storage: BridgeRococoGrandpa BestFinalized (r:1 w:1) + /// Proof: BridgeRococoGrandpa BestFinalized (max_values: Some(1), max_size: Some(36), added: 531, mode: MaxEncodedLen) + /// Storage: BridgeRococoGrandpa CurrentAuthoritySet (r:1 w:0) + /// Proof: BridgeRococoGrandpa CurrentAuthoritySet (max_values: Some(1), max_size: Some(50250), added: 50745, mode: MaxEncodedLen) + /// Storage: BridgeRococoGrandpa ImportedHashesPointer (r:1 w:1) + /// Proof: BridgeRococoGrandpa ImportedHashesPointer (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) + /// Storage: BridgeRococoGrandpa ImportedHashes (r:1 w:1) + /// Proof: BridgeRococoGrandpa ImportedHashes (max_values: Some(1024), max_size: Some(36), added: 1521, mode: MaxEncodedLen) + /// Storage: BridgeRococoGrandpa ImportedHeaders (r:0 w:2) + /// Proof: BridgeRococoGrandpa ImportedHeaders (max_values: Some(1024), max_size: Some(68), added: 1553, mode: MaxEncodedLen) + /// The range of component `p` is `[1, 838]`. /// The range of component `v` is `[50, 100]`. - /// The range of component `p` is `[51, 102]`. + /// The range of component `p` is `[1, 838]`. /// The range of component `v` is `[50, 100]`. fn submit_finality_proof(p: u32, v: u32, ) -> Weight { - // Minimum execution time: 2_561_902 nanoseconds. - Weight::from_ref_time(86_419_230) - // Standard Error: 32_880 - .saturating_add(Weight::from_ref_time(46_938_159).saturating_mul(p.into())) - // Standard Error: 33_661 - .saturating_add(Weight::from_ref_time(1_134_973).saturating_mul(v.into())) + // Proof Size summary in bytes: + // Measured: `295 + p * (60 ±0)` + // Estimated: `60231` + // Minimum execution time: 616_404_000 picoseconds. + Weight::from_parts(616_404_000, 0) + .saturating_add(Weight::from_parts(0, 60231)) + // Standard Error: 10_615_697 + .saturating_add(Weight::from_parts(107_372_374, 0).saturating_mul(p.into())) + // Standard Error: 81_776_733 + .saturating_add(Weight::from_parts(97_333_232, 0).saturating_mul(v.into())) .saturating_add(T::DbWeight::get().reads(6)) .saturating_add(T::DbWeight::get().writes(6)) } diff --git a/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_grandpa_bridge_wococo_grandpa.rs b/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_grandpa_bridge_wococo_grandpa.rs index a22269e2a7c..68265a8c489 100644 --- a/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_grandpa_bridge_wococo_grandpa.rs +++ b/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_grandpa_bridge_wococo_grandpa.rs @@ -17,25 +17,26 @@ //! Autogenerated weights for `pallet_bridge_grandpa` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-01-22, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! HOSTNAME: `bm3`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` +//! DATE: 2023-03-15, STEPS: `10`, REPEAT: `1`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` +//! HOSTNAME: `bkontur-ThinkPad-P14s-Gen-2i`, CPU: `11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("bridge-hub-rococo-dev"), DB CACHE: 1024 // Executed Command: -// /home/benchbot/cargo_target_dir/production/polkadot-parachain +// ./target/production/polkadot-parachain // benchmark // pallet -// --steps=50 -// --repeat=20 +// --steps=10 +// --repeat=1 // --extrinsic=* // --execution=wasm // --wasm-execution=compiled // --heap-pages=4096 -// --json-file=/var/lib/gitlab-runner/builds/zyw4fam_/0/parity/mirrors/cumulus/.git/.artifacts/bench.json -// --pallet=pallet_bridge_grandpa -// --chain=bridge-hub-rococo-dev +// --json-file=./bench.json // --header=./file_header.txt -// --output=./parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/ +// --chain=bridge-hub-rococo-dev +// --pallet=pallet_bridge_grandpa +// --output=./parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] @@ -47,24 +48,33 @@ use sp_std::marker::PhantomData; /// Weight functions for `pallet_bridge_grandpa`. pub struct WeightInfo(PhantomData); impl pallet_bridge_grandpa::WeightInfo for WeightInfo { - // Storage: BridgeWococoGrandpa PalletOperatingMode (r:1 w:0) - // Storage: BridgeWococoGrandpa RequestCount (r:1 w:1) - // Storage: BridgeWococoGrandpa BestFinalized (r:1 w:1) - // Storage: BridgeWococoGrandpa CurrentAuthoritySet (r:1 w:0) - // Storage: BridgeWococoGrandpa ImportedHashesPointer (r:1 w:1) - // Storage: BridgeWococoGrandpa ImportedHashes (r:1 w:1) - // Storage: BridgeWococoGrandpa ImportedHeaders (r:0 w:2) - /// The range of component `p` is `[51, 102]`. + /// Storage: BridgeWococoGrandpa PalletOperatingMode (r:1 w:0) + /// Proof: BridgeWococoGrandpa PalletOperatingMode (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) + /// Storage: BridgeWococoGrandpa RequestCount (r:1 w:1) + /// Proof: BridgeWococoGrandpa RequestCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) + /// Storage: BridgeWococoGrandpa BestFinalized (r:1 w:1) + /// Proof: BridgeWococoGrandpa BestFinalized (max_values: Some(1), max_size: Some(36), added: 531, mode: MaxEncodedLen) + /// Storage: BridgeWococoGrandpa CurrentAuthoritySet (r:1 w:0) + /// Proof: BridgeWococoGrandpa CurrentAuthoritySet (max_values: Some(1), max_size: Some(50250), added: 50745, mode: MaxEncodedLen) + /// Storage: BridgeWococoGrandpa ImportedHashesPointer (r:1 w:1) + /// Proof: BridgeWococoGrandpa ImportedHashesPointer (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) + /// Storage: BridgeWococoGrandpa ImportedHashes (r:1 w:1) + /// Proof: BridgeWococoGrandpa ImportedHashes (max_values: Some(1024), max_size: Some(36), added: 1521, mode: MaxEncodedLen) + /// Storage: BridgeWococoGrandpa ImportedHeaders (r:0 w:2) + /// Proof: BridgeWococoGrandpa ImportedHeaders (max_values: Some(1024), max_size: Some(68), added: 1553, mode: MaxEncodedLen) + /// The range of component `p` is `[1, 838]`. /// The range of component `v` is `[50, 100]`. - /// The range of component `p` is `[51, 102]`. + /// The range of component `p` is `[1, 838]`. /// The range of component `v` is `[50, 100]`. - fn submit_finality_proof(p: u32, v: u32, ) -> Weight { - // Minimum execution time: 2_565_169 nanoseconds. - Weight::from_ref_time(67_834_502) - // Standard Error: 35_710 - .saturating_add(Weight::from_ref_time(47_043_118).saturating_mul(p.into())) - // Standard Error: 36_557 - .saturating_add(Weight::from_ref_time(1_301_551).saturating_mul(v.into())) + fn submit_finality_proof(p: u32, _v: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `332 + p * (60 ±0)` + // Estimated: `60231` + // Minimum execution time: 672_054_000 picoseconds. + Weight::from_parts(47_309_240_121, 0) + .saturating_add(Weight::from_parts(0, 60231)) + // Standard Error: 16_649_480 + .saturating_add(Weight::from_parts(98_202_871, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(6)) .saturating_add(T::DbWeight::get().writes(6)) } diff --git a/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_messages_bridge_messages_bench_runtime_with_bridge_hub_rococo_messages_instance.rs b/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_messages_bridge_messages_bench_runtime_with_bridge_hub_rococo_messages_instance.rs index 65a1858a231..14f7e85227b 100644 --- a/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_messages_bridge_messages_bench_runtime_with_bridge_hub_rococo_messages_instance.rs +++ b/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_messages_bridge_messages_bench_runtime_with_bridge_hub_rococo_messages_instance.rs @@ -17,25 +17,26 @@ //! Autogenerated weights for `pallet_bridge_messages` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-01-25, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! HOSTNAME: `runner-b3zmxxc-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz` +//! DATE: 2023-03-15, STEPS: `50`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` +//! HOSTNAME: `bkontur-ThinkPad-P14s-Gen-2i`, CPU: `11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("bridge-hub-rococo-dev"), DB CACHE: 1024 // Executed Command: -// target/production/polkadot-parachain +// ./target/production/polkadot-parachain // benchmark // pallet // --steps=50 -// --repeat=20 +// --repeat=2 // --extrinsic=* // --execution=wasm // --wasm-execution=compiled // --heap-pages=4096 -// --json-file=/builds/parity/mirrors/cumulus/.git/.artifacts/bench.json -// --pallet=pallet_bridge_messages -// --chain=bridge-hub-rococo-dev +// --json-file=./bench.json // --header=./file_header.txt -// --output=./parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/ +// --chain=bridge-hub-rococo-dev +// --pallet=pallet_bridge_messages +// --output=./parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] @@ -47,79 +48,150 @@ use sp_std::marker::PhantomData; /// Weight functions for `pallet_bridge_messages`. pub struct WeightInfo(PhantomData); impl pallet_bridge_messages::WeightInfo for WeightInfo { - // Storage: BridgeRococoMessages PalletOperatingMode (r:1 w:0) - // Storage: BridgeRococoParachain ImportedParaHeads (r:1 w:0) - // Storage: BridgeRococoMessages InboundLanes (r:1 w:1) - // Storage: ParachainInfo ParachainId (r:1 w:0) + /// Storage: BridgeRococoMessages PalletOperatingMode (r:1 w:0) + /// Proof: BridgeRococoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2), added: 497, mode: MaxEncodedLen) + /// Storage: BridgeRococoParachain ImportedParaHeads (r:1 w:0) + /// Proof: BridgeRococoParachain ImportedParaHeads (max_values: Some(64), max_size: Some(196), added: 1186, mode: MaxEncodedLen) + /// Storage: BridgeRococoMessages InboundLanes (r:1 w:1) + /// Proof: BridgeRococoMessages InboundLanes (max_values: None, max_size: Some(49180), added: 51655, mode: MaxEncodedLen) + /// Storage: ParachainInfo ParachainId (r:1 w:0) + /// Proof: ParachainInfo ParachainId (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) fn receive_single_message_proof() -> Weight { - // Minimum execution time: 48_515 nanoseconds. - Weight::from_ref_time(50_641_000) + // Proof Size summary in bytes: + // Measured: `430` + // Estimated: `57797` + // Minimum execution time: 43_647_000 picoseconds. + Weight::from_parts(78_914_000, 0) + .saturating_add(Weight::from_parts(0, 57797)) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(1)) } - // Storage: BridgeRococoMessages PalletOperatingMode (r:1 w:0) - // Storage: BridgeRococoParachain ImportedParaHeads (r:1 w:0) - // Storage: BridgeRococoMessages InboundLanes (r:1 w:1) - // Storage: ParachainInfo ParachainId (r:1 w:0) + /// Storage: BridgeRococoMessages PalletOperatingMode (r:1 w:0) + /// Proof: BridgeRococoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2), added: 497, mode: MaxEncodedLen) + /// Storage: BridgeRococoParachain ImportedParaHeads (r:1 w:0) + /// Proof: BridgeRococoParachain ImportedParaHeads (max_values: Some(64), max_size: Some(196), added: 1186, mode: MaxEncodedLen) + /// Storage: BridgeRococoMessages InboundLanes (r:1 w:1) + /// Proof: BridgeRococoMessages InboundLanes (max_values: None, max_size: Some(49180), added: 51655, mode: MaxEncodedLen) + /// Storage: ParachainInfo ParachainId (r:1 w:0) + /// Proof: ParachainInfo ParachainId (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) fn receive_two_messages_proof() -> Weight { - // Minimum execution time: 62_891 nanoseconds. - Weight::from_ref_time(66_039_000) + // Proof Size summary in bytes: + // Measured: `430` + // Estimated: `57797` + // Minimum execution time: 62_322_000 picoseconds. + Weight::from_parts(75_283_000, 0) + .saturating_add(Weight::from_parts(0, 57797)) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(1)) } - // Storage: BridgeRococoMessages PalletOperatingMode (r:1 w:0) - // Storage: BridgeRococoParachain ImportedParaHeads (r:1 w:0) - // Storage: BridgeRococoMessages InboundLanes (r:1 w:1) - // Storage: ParachainInfo ParachainId (r:1 w:0) + /// Storage: BridgeRococoMessages PalletOperatingMode (r:1 w:0) + /// Proof: BridgeRococoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2), added: 497, mode: MaxEncodedLen) + /// Storage: BridgeRococoParachain ImportedParaHeads (r:1 w:0) + /// Proof: BridgeRococoParachain ImportedParaHeads (max_values: Some(64), max_size: Some(196), added: 1186, mode: MaxEncodedLen) + /// Storage: BridgeRococoMessages InboundLanes (r:1 w:1) + /// Proof: BridgeRococoMessages InboundLanes (max_values: None, max_size: Some(49180), added: 51655, mode: MaxEncodedLen) + /// Storage: ParachainInfo ParachainId (r:1 w:0) + /// Proof: ParachainInfo ParachainId (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) fn receive_single_message_proof_with_outbound_lane_state() -> Weight { - // Minimum execution time: 53_010 nanoseconds. - Weight::from_ref_time(53_855_000) + // Proof Size summary in bytes: + // Measured: `430` + // Estimated: `57797` + // Minimum execution time: 47_917_000 picoseconds. + Weight::from_parts(53_246_000, 0) + .saturating_add(Weight::from_parts(0, 57797)) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(1)) } - // Storage: BridgeRococoMessages PalletOperatingMode (r:1 w:0) - // Storage: BridgeRococoParachain ImportedParaHeads (r:1 w:0) - // Storage: BridgeRococoMessages InboundLanes (r:1 w:1) + /// Storage: BridgeRococoMessages PalletOperatingMode (r:1 w:0) + /// Proof: BridgeRococoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2), added: 497, mode: MaxEncodedLen) + /// Storage: BridgeRococoParachain ImportedParaHeads (r:1 w:0) + /// Proof: BridgeRococoParachain ImportedParaHeads (max_values: Some(64), max_size: Some(196), added: 1186, mode: MaxEncodedLen) + /// Storage: BridgeRococoMessages InboundLanes (r:1 w:1) + /// Proof: BridgeRococoMessages InboundLanes (max_values: None, max_size: Some(49180), added: 51655, mode: MaxEncodedLen) fn receive_single_message_proof_1_kb() -> Weight { - // Minimum execution time: 50_491 nanoseconds. - Weight::from_ref_time(52_570_000) + // Proof Size summary in bytes: + // Measured: `398` + // Estimated: `56308` + // Minimum execution time: 42_265_000 picoseconds. + Weight::from_parts(50_221_000, 0) + .saturating_add(Weight::from_parts(0, 56308)) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(1)) } - // Storage: BridgeRococoMessages PalletOperatingMode (r:1 w:0) - // Storage: BridgeRococoParachain ImportedParaHeads (r:1 w:0) - // Storage: BridgeRococoMessages InboundLanes (r:1 w:1) + /// Storage: BridgeRococoMessages PalletOperatingMode (r:1 w:0) + /// Proof: BridgeRococoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2), added: 497, mode: MaxEncodedLen) + /// Storage: BridgeRococoParachain ImportedParaHeads (r:1 w:0) + /// Proof: BridgeRococoParachain ImportedParaHeads (max_values: Some(64), max_size: Some(196), added: 1186, mode: MaxEncodedLen) + /// Storage: BridgeRococoMessages InboundLanes (r:1 w:1) + /// Proof: BridgeRococoMessages InboundLanes (max_values: None, max_size: Some(49180), added: 51655, mode: MaxEncodedLen) fn receive_single_message_proof_16_kb() -> Weight { - // Minimum execution time: 116_072 nanoseconds. - Weight::from_ref_time(119_185_000) + // Proof Size summary in bytes: + // Measured: `398` + // Estimated: `56308` + // Minimum execution time: 70_236_000 picoseconds. + Weight::from_parts(107_444_000, 0) + .saturating_add(Weight::from_parts(0, 56308)) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(1)) } - // Storage: BridgeRococoMessages PalletOperatingMode (r:1 w:0) - // Storage: BridgeRococoParachain ImportedParaHeads (r:1 w:0) - // Storage: BridgeRococoMessages OutboundLanes (r:1 w:1) + /// Storage: BridgeRococoMessages PalletOperatingMode (r:1 w:0) + /// Proof: BridgeRococoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2), added: 497, mode: MaxEncodedLen) + /// Storage: BridgeRococoParachain ImportedParaHeads (r:1 w:0) + /// Proof: BridgeRococoParachain ImportedParaHeads (max_values: Some(64), max_size: Some(196), added: 1186, mode: MaxEncodedLen) + /// Storage: BridgeRococoMessages OutboundLanes (r:1 w:1) + /// Proof: BridgeRococoMessages OutboundLanes (max_values: Some(1), max_size: Some(44), added: 539, mode: MaxEncodedLen) + /// Storage: unknown `0x6e0a18b62a1de81c5f519181cc611e18` (r:1 w:0) + /// Proof Skipped: unknown `0x6e0a18b62a1de81c5f519181cc611e18` (r:1 w:0) + /// Storage: BridgeRelayers RelayerRewards (r:1 w:1) + /// Proof: BridgeRelayers RelayerRewards (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen) fn receive_delivery_proof_for_single_message() -> Weight { - // Minimum execution time: 31_075 nanoseconds. - Weight::from_ref_time(32_055_000) - .saturating_add(T::DbWeight::get().reads(3)) - .saturating_add(T::DbWeight::get().writes(1)) + // Proof Size summary in bytes: + // Measured: `370` + // Estimated: `12565` + // Minimum execution time: 34_072_000 picoseconds. + Weight::from_parts(54_240_000, 0) + .saturating_add(Weight::from_parts(0, 12565)) + .saturating_add(T::DbWeight::get().reads(5)) + .saturating_add(T::DbWeight::get().writes(2)) } - // Storage: BridgeRococoMessages PalletOperatingMode (r:1 w:0) - // Storage: BridgeRococoParachain ImportedParaHeads (r:1 w:0) - // Storage: BridgeRococoMessages OutboundLanes (r:1 w:1) + /// Storage: BridgeRococoMessages PalletOperatingMode (r:1 w:0) + /// Proof: BridgeRococoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2), added: 497, mode: MaxEncodedLen) + /// Storage: BridgeRococoParachain ImportedParaHeads (r:1 w:0) + /// Proof: BridgeRococoParachain ImportedParaHeads (max_values: Some(64), max_size: Some(196), added: 1186, mode: MaxEncodedLen) + /// Storage: BridgeRococoMessages OutboundLanes (r:1 w:1) + /// Proof: BridgeRococoMessages OutboundLanes (max_values: Some(1), max_size: Some(44), added: 539, mode: MaxEncodedLen) + /// Storage: unknown `0x6e0a18b62a1de81c5f519181cc611e18` (r:1 w:0) + /// Proof Skipped: unknown `0x6e0a18b62a1de81c5f519181cc611e18` (r:1 w:0) + /// Storage: BridgeRelayers RelayerRewards (r:1 w:1) + /// Proof: BridgeRelayers RelayerRewards (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen) fn receive_delivery_proof_for_two_messages_by_single_relayer() -> Weight { - // Minimum execution time: 31_524 nanoseconds. - Weight::from_ref_time(32_149_000) - .saturating_add(T::DbWeight::get().reads(3)) - .saturating_add(T::DbWeight::get().writes(1)) + // Proof Size summary in bytes: + // Measured: `370` + // Estimated: `12565` + // Minimum execution time: 34_013_000 picoseconds. + Weight::from_parts(50_732_000, 0) + .saturating_add(Weight::from_parts(0, 12565)) + .saturating_add(T::DbWeight::get().reads(5)) + .saturating_add(T::DbWeight::get().writes(2)) } - // Storage: BridgeRococoMessages PalletOperatingMode (r:1 w:0) - // Storage: BridgeRococoParachain ImportedParaHeads (r:1 w:0) - // Storage: BridgeRococoMessages OutboundLanes (r:1 w:1) + /// Storage: BridgeRococoMessages PalletOperatingMode (r:1 w:0) + /// Proof: BridgeRococoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2), added: 497, mode: MaxEncodedLen) + /// Storage: BridgeRococoParachain ImportedParaHeads (r:1 w:0) + /// Proof: BridgeRococoParachain ImportedParaHeads (max_values: Some(64), max_size: Some(196), added: 1186, mode: MaxEncodedLen) + /// Storage: BridgeRococoMessages OutboundLanes (r:1 w:1) + /// Proof: BridgeRococoMessages OutboundLanes (max_values: Some(1), max_size: Some(44), added: 539, mode: MaxEncodedLen) + /// Storage: unknown `0x6e0a18b62a1de81c5f519181cc611e18` (r:1 w:0) + /// Proof Skipped: unknown `0x6e0a18b62a1de81c5f519181cc611e18` (r:1 w:0) + /// Storage: BridgeRelayers RelayerRewards (r:2 w:2) + /// Proof: BridgeRelayers RelayerRewards (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen) fn receive_delivery_proof_for_two_messages_by_two_relayers() -> Weight { - // Minimum execution time: 31_723 nanoseconds. - Weight::from_ref_time(32_355_000) - .saturating_add(T::DbWeight::get().reads(3)) - .saturating_add(T::DbWeight::get().writes(1)) + // Proof Size summary in bytes: + // Measured: `370` + // Estimated: `15113` + // Minimum execution time: 36_242_000 picoseconds. + Weight::from_parts(57_344_000, 0) + .saturating_add(Weight::from_parts(0, 15113)) + .saturating_add(T::DbWeight::get().reads(6)) + .saturating_add(T::DbWeight::get().writes(3)) } } diff --git a/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_messages_bridge_messages_bench_runtime_with_bridge_hub_wococo_messages_instance.rs b/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_messages_bridge_messages_bench_runtime_with_bridge_hub_wococo_messages_instance.rs index eaff561d629..23d74f6feb7 100644 --- a/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_messages_bridge_messages_bench_runtime_with_bridge_hub_wococo_messages_instance.rs +++ b/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_messages_bridge_messages_bench_runtime_with_bridge_hub_wococo_messages_instance.rs @@ -17,25 +17,26 @@ //! Autogenerated weights for `pallet_bridge_messages` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-01-25, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! HOSTNAME: `runner-b3zmxxc-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz` +//! DATE: 2023-03-15, STEPS: `50`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` +//! HOSTNAME: `bkontur-ThinkPad-P14s-Gen-2i`, CPU: `11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("bridge-hub-rococo-dev"), DB CACHE: 1024 // Executed Command: -// target/production/polkadot-parachain +// ./target/production/polkadot-parachain // benchmark // pallet // --steps=50 -// --repeat=20 +// --repeat=2 // --extrinsic=* // --execution=wasm // --wasm-execution=compiled // --heap-pages=4096 -// --json-file=/builds/parity/mirrors/cumulus/.git/.artifacts/bench.json -// --pallet=pallet_bridge_messages -// --chain=bridge-hub-rococo-dev +// --json-file=./bench.json // --header=./file_header.txt -// --output=./parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/ +// --chain=bridge-hub-rococo-dev +// --pallet=pallet_bridge_messages +// --output=./parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] @@ -47,79 +48,150 @@ use sp_std::marker::PhantomData; /// Weight functions for `pallet_bridge_messages`. pub struct WeightInfo(PhantomData); impl pallet_bridge_messages::WeightInfo for WeightInfo { - // Storage: BridgeWococoMessages PalletOperatingMode (r:1 w:0) - // Storage: BridgeWococoParachain ImportedParaHeads (r:1 w:0) - // Storage: BridgeWococoMessages InboundLanes (r:1 w:1) - // Storage: ParachainInfo ParachainId (r:1 w:0) + /// Storage: BridgeWococoMessages PalletOperatingMode (r:1 w:0) + /// Proof: BridgeWococoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2), added: 497, mode: MaxEncodedLen) + /// Storage: BridgeWococoParachain ImportedParaHeads (r:1 w:0) + /// Proof: BridgeWococoParachain ImportedParaHeads (max_values: Some(64), max_size: Some(196), added: 1186, mode: MaxEncodedLen) + /// Storage: BridgeWococoMessages InboundLanes (r:1 w:1) + /// Proof: BridgeWococoMessages InboundLanes (max_values: None, max_size: Some(49180), added: 51655, mode: MaxEncodedLen) + /// Storage: ParachainInfo ParachainId (r:1 w:0) + /// Proof: ParachainInfo ParachainId (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) fn receive_single_message_proof() -> Weight { - // Minimum execution time: 49_348 nanoseconds. - Weight::from_ref_time(52_687_000) + // Proof Size summary in bytes: + // Measured: `467` + // Estimated: `57797` + // Minimum execution time: 46_035_000 picoseconds. + Weight::from_parts(87_082_000, 0) + .saturating_add(Weight::from_parts(0, 57797)) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(1)) } - // Storage: BridgeWococoMessages PalletOperatingMode (r:1 w:0) - // Storage: BridgeWococoParachain ImportedParaHeads (r:1 w:0) - // Storage: BridgeWococoMessages InboundLanes (r:1 w:1) - // Storage: ParachainInfo ParachainId (r:1 w:0) + /// Storage: BridgeWococoMessages PalletOperatingMode (r:1 w:0) + /// Proof: BridgeWococoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2), added: 497, mode: MaxEncodedLen) + /// Storage: BridgeWococoParachain ImportedParaHeads (r:1 w:0) + /// Proof: BridgeWococoParachain ImportedParaHeads (max_values: Some(64), max_size: Some(196), added: 1186, mode: MaxEncodedLen) + /// Storage: BridgeWococoMessages InboundLanes (r:1 w:1) + /// Proof: BridgeWococoMessages InboundLanes (max_values: None, max_size: Some(49180), added: 51655, mode: MaxEncodedLen) + /// Storage: ParachainInfo ParachainId (r:1 w:0) + /// Proof: ParachainInfo ParachainId (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) fn receive_two_messages_proof() -> Weight { - // Minimum execution time: 63_755 nanoseconds. - Weight::from_ref_time(67_615_000) + // Proof Size summary in bytes: + // Measured: `467` + // Estimated: `57797` + // Minimum execution time: 69_379_000 picoseconds. + Weight::from_parts(80_326_000, 0) + .saturating_add(Weight::from_parts(0, 57797)) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(1)) } - // Storage: BridgeWococoMessages PalletOperatingMode (r:1 w:0) - // Storage: BridgeWococoParachain ImportedParaHeads (r:1 w:0) - // Storage: BridgeWococoMessages InboundLanes (r:1 w:1) - // Storage: ParachainInfo ParachainId (r:1 w:0) + /// Storage: BridgeWococoMessages PalletOperatingMode (r:1 w:0) + /// Proof: BridgeWococoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2), added: 497, mode: MaxEncodedLen) + /// Storage: BridgeWococoParachain ImportedParaHeads (r:1 w:0) + /// Proof: BridgeWococoParachain ImportedParaHeads (max_values: Some(64), max_size: Some(196), added: 1186, mode: MaxEncodedLen) + /// Storage: BridgeWococoMessages InboundLanes (r:1 w:1) + /// Proof: BridgeWococoMessages InboundLanes (max_values: None, max_size: Some(49180), added: 51655, mode: MaxEncodedLen) + /// Storage: ParachainInfo ParachainId (r:1 w:0) + /// Proof: ParachainInfo ParachainId (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen) fn receive_single_message_proof_with_outbound_lane_state() -> Weight { - // Minimum execution time: 54_597 nanoseconds. - Weight::from_ref_time(56_472_000) + // Proof Size summary in bytes: + // Measured: `467` + // Estimated: `57797` + // Minimum execution time: 51_877_000 picoseconds. + Weight::from_parts(61_053_000, 0) + .saturating_add(Weight::from_parts(0, 57797)) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(1)) } - // Storage: BridgeWococoMessages PalletOperatingMode (r:1 w:0) - // Storage: BridgeWococoParachain ImportedParaHeads (r:1 w:0) - // Storage: BridgeWococoMessages InboundLanes (r:1 w:1) + /// Storage: BridgeWococoMessages PalletOperatingMode (r:1 w:0) + /// Proof: BridgeWococoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2), added: 497, mode: MaxEncodedLen) + /// Storage: BridgeWococoParachain ImportedParaHeads (r:1 w:0) + /// Proof: BridgeWococoParachain ImportedParaHeads (max_values: Some(64), max_size: Some(196), added: 1186, mode: MaxEncodedLen) + /// Storage: BridgeWococoMessages InboundLanes (r:1 w:1) + /// Proof: BridgeWococoMessages InboundLanes (max_values: None, max_size: Some(49180), added: 51655, mode: MaxEncodedLen) fn receive_single_message_proof_1_kb() -> Weight { - // Minimum execution time: 51_363 nanoseconds. - Weight::from_ref_time(54_025_000) + // Proof Size summary in bytes: + // Measured: `435` + // Estimated: `56308` + // Minimum execution time: 44_882_000 picoseconds. + Weight::from_parts(53_124_000, 0) + .saturating_add(Weight::from_parts(0, 56308)) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(1)) } - // Storage: BridgeWococoMessages PalletOperatingMode (r:1 w:0) - // Storage: BridgeWococoParachain ImportedParaHeads (r:1 w:0) - // Storage: BridgeWococoMessages InboundLanes (r:1 w:1) + /// Storage: BridgeWococoMessages PalletOperatingMode (r:1 w:0) + /// Proof: BridgeWococoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2), added: 497, mode: MaxEncodedLen) + /// Storage: BridgeWococoParachain ImportedParaHeads (r:1 w:0) + /// Proof: BridgeWococoParachain ImportedParaHeads (max_values: Some(64), max_size: Some(196), added: 1186, mode: MaxEncodedLen) + /// Storage: BridgeWococoMessages InboundLanes (r:1 w:1) + /// Proof: BridgeWococoMessages InboundLanes (max_values: None, max_size: Some(49180), added: 51655, mode: MaxEncodedLen) fn receive_single_message_proof_16_kb() -> Weight { - // Minimum execution time: 119_727 nanoseconds. - Weight::from_ref_time(123_138_000) + // Proof Size summary in bytes: + // Measured: `435` + // Estimated: `56308` + // Minimum execution time: 74_426_000 picoseconds. + Weight::from_parts(111_901_000, 0) + .saturating_add(Weight::from_parts(0, 56308)) .saturating_add(T::DbWeight::get().reads(3)) .saturating_add(T::DbWeight::get().writes(1)) } - // Storage: BridgeWococoMessages PalletOperatingMode (r:1 w:0) - // Storage: BridgeWococoParachain ImportedParaHeads (r:1 w:0) - // Storage: BridgeWococoMessages OutboundLanes (r:1 w:1) + /// Storage: BridgeWococoMessages PalletOperatingMode (r:1 w:0) + /// Proof: BridgeWococoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2), added: 497, mode: MaxEncodedLen) + /// Storage: BridgeWococoParachain ImportedParaHeads (r:1 w:0) + /// Proof: BridgeWococoParachain ImportedParaHeads (max_values: Some(64), max_size: Some(196), added: 1186, mode: MaxEncodedLen) + /// Storage: BridgeWococoMessages OutboundLanes (r:1 w:1) + /// Proof: BridgeWococoMessages OutboundLanes (max_values: Some(1), max_size: Some(44), added: 539, mode: MaxEncodedLen) + /// Storage: unknown `0x6e0a18b62a1de81c5f519181cc611e18` (r:1 w:0) + /// Proof Skipped: unknown `0x6e0a18b62a1de81c5f519181cc611e18` (r:1 w:0) + /// Storage: BridgeRelayers RelayerRewards (r:1 w:1) + /// Proof: BridgeRelayers RelayerRewards (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen) fn receive_delivery_proof_for_single_message() -> Weight { - // Minimum execution time: 32_525 nanoseconds. - Weight::from_ref_time(33_410_000) - .saturating_add(T::DbWeight::get().reads(3)) - .saturating_add(T::DbWeight::get().writes(1)) + // Proof Size summary in bytes: + // Measured: `407` + // Estimated: `12602` + // Minimum execution time: 35_466_000 picoseconds. + Weight::from_parts(59_081_000, 0) + .saturating_add(Weight::from_parts(0, 12602)) + .saturating_add(T::DbWeight::get().reads(5)) + .saturating_add(T::DbWeight::get().writes(2)) } - // Storage: BridgeWococoMessages PalletOperatingMode (r:1 w:0) - // Storage: BridgeWococoParachain ImportedParaHeads (r:1 w:0) - // Storage: BridgeWococoMessages OutboundLanes (r:1 w:1) + /// Storage: BridgeWococoMessages PalletOperatingMode (r:1 w:0) + /// Proof: BridgeWococoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2), added: 497, mode: MaxEncodedLen) + /// Storage: BridgeWococoParachain ImportedParaHeads (r:1 w:0) + /// Proof: BridgeWococoParachain ImportedParaHeads (max_values: Some(64), max_size: Some(196), added: 1186, mode: MaxEncodedLen) + /// Storage: BridgeWococoMessages OutboundLanes (r:1 w:1) + /// Proof: BridgeWococoMessages OutboundLanes (max_values: Some(1), max_size: Some(44), added: 539, mode: MaxEncodedLen) + /// Storage: unknown `0x6e0a18b62a1de81c5f519181cc611e18` (r:1 w:0) + /// Proof Skipped: unknown `0x6e0a18b62a1de81c5f519181cc611e18` (r:1 w:0) + /// Storage: BridgeRelayers RelayerRewards (r:1 w:1) + /// Proof: BridgeRelayers RelayerRewards (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen) fn receive_delivery_proof_for_two_messages_by_single_relayer() -> Weight { - // Minimum execution time: 32_310 nanoseconds. - Weight::from_ref_time(33_208_000) - .saturating_add(T::DbWeight::get().reads(3)) - .saturating_add(T::DbWeight::get().writes(1)) + // Proof Size summary in bytes: + // Measured: `407` + // Estimated: `12602` + // Minimum execution time: 35_889_000 picoseconds. + Weight::from_parts(48_281_000, 0) + .saturating_add(Weight::from_parts(0, 12602)) + .saturating_add(T::DbWeight::get().reads(5)) + .saturating_add(T::DbWeight::get().writes(2)) } - // Storage: BridgeWococoMessages PalletOperatingMode (r:1 w:0) - // Storage: BridgeWococoParachain ImportedParaHeads (r:1 w:0) - // Storage: BridgeWococoMessages OutboundLanes (r:1 w:1) + /// Storage: BridgeWococoMessages PalletOperatingMode (r:1 w:0) + /// Proof: BridgeWococoMessages PalletOperatingMode (max_values: Some(1), max_size: Some(2), added: 497, mode: MaxEncodedLen) + /// Storage: BridgeWococoParachain ImportedParaHeads (r:1 w:0) + /// Proof: BridgeWococoParachain ImportedParaHeads (max_values: Some(64), max_size: Some(196), added: 1186, mode: MaxEncodedLen) + /// Storage: BridgeWococoMessages OutboundLanes (r:1 w:1) + /// Proof: BridgeWococoMessages OutboundLanes (max_values: Some(1), max_size: Some(44), added: 539, mode: MaxEncodedLen) + /// Storage: unknown `0x6e0a18b62a1de81c5f519181cc611e18` (r:1 w:0) + /// Proof Skipped: unknown `0x6e0a18b62a1de81c5f519181cc611e18` (r:1 w:0) + /// Storage: BridgeRelayers RelayerRewards (r:2 w:2) + /// Proof: BridgeRelayers RelayerRewards (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen) fn receive_delivery_proof_for_two_messages_by_two_relayers() -> Weight { - // Minimum execution time: 32_594 nanoseconds. - Weight::from_ref_time(33_449_000) - .saturating_add(T::DbWeight::get().reads(3)) - .saturating_add(T::DbWeight::get().writes(1)) + // Proof Size summary in bytes: + // Measured: `407` + // Estimated: `15150` + // Minimum execution time: 37_430_000 picoseconds. + Weight::from_parts(54_994_000, 0) + .saturating_add(Weight::from_parts(0, 15150)) + .saturating_add(T::DbWeight::get().reads(6)) + .saturating_add(T::DbWeight::get().writes(3)) } } diff --git a/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_parachains_bridge_parachains_bench_runtime_bridge_parachain_rococo_instance.rs b/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_parachains_bridge_parachains_bench_runtime_bridge_parachain_rococo_instance.rs index 056617988d5..410bd211af9 100644 --- a/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_parachains_bridge_parachains_bench_runtime_bridge_parachain_rococo_instance.rs +++ b/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_parachains_bridge_parachains_bench_runtime_bridge_parachain_rococo_instance.rs @@ -17,12 +17,13 @@ //! Autogenerated weights for `pallet_bridge_parachains` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-01-23, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! HOSTNAME: `bm3`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` +//! DATE: 2023-03-15, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` +//! HOSTNAME: `bkontur-ThinkPad-P14s-Gen-2i`, CPU: `11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("bridge-hub-rococo-dev"), DB CACHE: 1024 // Executed Command: -// /home/benchbot/cargo_target_dir/production/polkadot-parachain +// ./target/production/polkadot-parachain // benchmark // pallet // --steps=50 @@ -31,11 +32,11 @@ // --execution=wasm // --wasm-execution=compiled // --heap-pages=4096 -// --json-file=/var/lib/gitlab-runner/builds/zyw4fam_/0/parity/mirrors/cumulus/.git/.artifacts/bench.json -// --pallet=pallet_bridge_parachains -// --chain=bridge-hub-rococo-dev +// --json-file=./bench.json // --header=./file_header.txt -// --output=./parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/ +// --chain=bridge-hub-rococo-dev +// --pallet=pallet_bridge_parachains +// --output=./parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] @@ -47,38 +48,67 @@ use sp_std::marker::PhantomData; /// Weight functions for `pallet_bridge_parachains`. pub struct WeightInfo(PhantomData); impl pallet_bridge_parachains::WeightInfo for WeightInfo { - // Storage: BridgeRococoParachain PalletOperatingMode (r:1 w:0) - // Storage: BridgeRococoGrandpa ImportedHeaders (r:1 w:0) - // Storage: BridgeRococoParachain ParasInfo (r:1 w:1) - // Storage: BridgeRococoParachain ImportedParaHashes (r:1 w:1) - // Storage: BridgeRococoParachain ImportedParaHeads (r:0 w:1) + /// Storage: BridgeRococoParachain PalletOperatingMode (r:1 w:0) + /// Proof: BridgeRococoParachain PalletOperatingMode (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) + /// Storage: BridgeRococoGrandpa ImportedHeaders (r:1 w:0) + /// Proof: BridgeRococoGrandpa ImportedHeaders (max_values: Some(1024), max_size: Some(68), added: 1553, mode: MaxEncodedLen) + /// Storage: BridgeRococoParachain ParasInfo (r:1 w:1) + /// Proof: BridgeRococoParachain ParasInfo (max_values: Some(1), max_size: Some(60), added: 555, mode: MaxEncodedLen) + /// Storage: BridgeRococoParachain ImportedParaHashes (r:1 w:1) + /// Proof: BridgeRococoParachain ImportedParaHashes (max_values: Some(64), max_size: Some(64), added: 1054, mode: MaxEncodedLen) + /// Storage: BridgeRococoParachain ImportedParaHeads (r:0 w:1) + /// Proof: BridgeRococoParachain ImportedParaHeads (max_values: Some(64), max_size: Some(196), added: 1186, mode: MaxEncodedLen) /// The range of component `p` is `[1, 2]`. /// The range of component `p` is `[1, 2]`. - fn submit_parachain_heads_with_n_parachains(_p: u32, ) -> Weight { - // Minimum execution time: 34_955 nanoseconds. - Weight::from_ref_time(36_400_062) + fn submit_parachain_heads_with_n_parachains(p: u32, ) -> Weight { + // Proof Size summary in bytes: + // Measured: `326` + // Estimated: `7618` + // Minimum execution time: 43_640_000 picoseconds. + Weight::from_parts(70_049_694, 0) + .saturating_add(Weight::from_parts(0, 7618)) + // Standard Error: 651_207 + .saturating_add(Weight::from_parts(7_744_677, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(3)) } - // Storage: BridgeRococoParachain PalletOperatingMode (r:1 w:0) - // Storage: BridgeRococoGrandpa ImportedHeaders (r:1 w:0) - // Storage: BridgeRococoParachain ParasInfo (r:1 w:1) - // Storage: BridgeRococoParachain ImportedParaHashes (r:1 w:1) - // Storage: BridgeRococoParachain ImportedParaHeads (r:0 w:1) + /// Storage: BridgeRococoParachain PalletOperatingMode (r:1 w:0) + /// Proof: BridgeRococoParachain PalletOperatingMode (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) + /// Storage: BridgeRococoGrandpa ImportedHeaders (r:1 w:0) + /// Proof: BridgeRococoGrandpa ImportedHeaders (max_values: Some(1024), max_size: Some(68), added: 1553, mode: MaxEncodedLen) + /// Storage: BridgeRococoParachain ParasInfo (r:1 w:1) + /// Proof: BridgeRococoParachain ParasInfo (max_values: Some(1), max_size: Some(60), added: 555, mode: MaxEncodedLen) + /// Storage: BridgeRococoParachain ImportedParaHashes (r:1 w:1) + /// Proof: BridgeRococoParachain ImportedParaHashes (max_values: Some(64), max_size: Some(64), added: 1054, mode: MaxEncodedLen) + /// Storage: BridgeRococoParachain ImportedParaHeads (r:0 w:1) + /// Proof: BridgeRococoParachain ImportedParaHeads (max_values: Some(64), max_size: Some(196), added: 1186, mode: MaxEncodedLen) fn submit_parachain_heads_with_1kb_proof() -> Weight { - // Minimum execution time: 44_024 nanoseconds. - Weight::from_ref_time(44_604_000) + // Proof Size summary in bytes: + // Measured: `326` + // Estimated: `7618` + // Minimum execution time: 69_524_000 picoseconds. + Weight::from_parts(83_696_000, 0) + .saturating_add(Weight::from_parts(0, 7618)) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(3)) } - // Storage: BridgeRococoParachain PalletOperatingMode (r:1 w:0) - // Storage: BridgeRococoGrandpa ImportedHeaders (r:1 w:0) - // Storage: BridgeRococoParachain ParasInfo (r:1 w:1) - // Storage: BridgeRococoParachain ImportedParaHashes (r:1 w:1) - // Storage: BridgeRococoParachain ImportedParaHeads (r:0 w:1) + /// Storage: BridgeRococoParachain PalletOperatingMode (r:1 w:0) + /// Proof: BridgeRococoParachain PalletOperatingMode (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) + /// Storage: BridgeRococoGrandpa ImportedHeaders (r:1 w:0) + /// Proof: BridgeRococoGrandpa ImportedHeaders (max_values: Some(1024), max_size: Some(68), added: 1553, mode: MaxEncodedLen) + /// Storage: BridgeRococoParachain ParasInfo (r:1 w:1) + /// Proof: BridgeRococoParachain ParasInfo (max_values: Some(1), max_size: Some(60), added: 555, mode: MaxEncodedLen) + /// Storage: BridgeRococoParachain ImportedParaHashes (r:1 w:1) + /// Proof: BridgeRococoParachain ImportedParaHashes (max_values: Some(64), max_size: Some(64), added: 1054, mode: MaxEncodedLen) + /// Storage: BridgeRococoParachain ImportedParaHeads (r:0 w:1) + /// Proof: BridgeRococoParachain ImportedParaHeads (max_values: Some(64), max_size: Some(196), added: 1186, mode: MaxEncodedLen) fn submit_parachain_heads_with_16kb_proof() -> Weight { - // Minimum execution time: 96_346 nanoseconds. - Weight::from_ref_time(98_207_000) + // Proof Size summary in bytes: + // Measured: `326` + // Estimated: `7618` + // Minimum execution time: 126_315_000 picoseconds. + Weight::from_parts(147_026_000, 0) + .saturating_add(Weight::from_parts(0, 7618)) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(3)) } diff --git a/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_parachains_bridge_parachains_bench_runtime_bridge_parachain_wococo_instance.rs b/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_parachains_bridge_parachains_bench_runtime_bridge_parachain_wococo_instance.rs index 6a4b86a6def..b02641ab918 100644 --- a/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_parachains_bridge_parachains_bench_runtime_bridge_parachain_wococo_instance.rs +++ b/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_parachains_bridge_parachains_bench_runtime_bridge_parachain_wococo_instance.rs @@ -17,12 +17,13 @@ //! Autogenerated weights for `pallet_bridge_parachains` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-01-23, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! HOSTNAME: `bm3`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` +//! DATE: 2023-03-15, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! WORST CASE MAP SIZE: `1000000` +//! HOSTNAME: `bkontur-ThinkPad-P14s-Gen-2i`, CPU: `11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("bridge-hub-rococo-dev"), DB CACHE: 1024 // Executed Command: -// /home/benchbot/cargo_target_dir/production/polkadot-parachain +// ./target/production/polkadot-parachain // benchmark // pallet // --steps=50 @@ -31,11 +32,11 @@ // --execution=wasm // --wasm-execution=compiled // --heap-pages=4096 -// --json-file=/var/lib/gitlab-runner/builds/zyw4fam_/0/parity/mirrors/cumulus/.git/.artifacts/bench.json -// --pallet=pallet_bridge_parachains -// --chain=bridge-hub-rococo-dev +// --json-file=./bench.json // --header=./file_header.txt -// --output=./parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/ +// --chain=bridge-hub-rococo-dev +// --pallet=pallet_bridge_parachains +// --output=./parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] @@ -47,40 +48,67 @@ use sp_std::marker::PhantomData; /// Weight functions for `pallet_bridge_parachains`. pub struct WeightInfo(PhantomData); impl pallet_bridge_parachains::WeightInfo for WeightInfo { - // Storage: BridgeWococoParachain PalletOperatingMode (r:1 w:0) - // Storage: BridgeWococoGrandpa ImportedHeaders (r:1 w:0) - // Storage: BridgeWococoParachain ParasInfo (r:1 w:1) - // Storage: BridgeWococoParachain ImportedParaHashes (r:1 w:1) - // Storage: BridgeWococoParachain ImportedParaHeads (r:0 w:1) + /// Storage: BridgeWococoParachain PalletOperatingMode (r:1 w:0) + /// Proof: BridgeWococoParachain PalletOperatingMode (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) + /// Storage: BridgeWococoGrandpa ImportedHeaders (r:1 w:0) + /// Proof: BridgeWococoGrandpa ImportedHeaders (max_values: Some(1024), max_size: Some(68), added: 1553, mode: MaxEncodedLen) + /// Storage: BridgeWococoParachain ParasInfo (r:1 w:1) + /// Proof: BridgeWococoParachain ParasInfo (max_values: Some(1), max_size: Some(60), added: 555, mode: MaxEncodedLen) + /// Storage: BridgeWococoParachain ImportedParaHashes (r:1 w:1) + /// Proof: BridgeWococoParachain ImportedParaHashes (max_values: Some(64), max_size: Some(64), added: 1054, mode: MaxEncodedLen) + /// Storage: BridgeWococoParachain ImportedParaHeads (r:0 w:1) + /// Proof: BridgeWococoParachain ImportedParaHeads (max_values: Some(64), max_size: Some(196), added: 1186, mode: MaxEncodedLen) /// The range of component `p` is `[1, 2]`. /// The range of component `p` is `[1, 2]`. fn submit_parachain_heads_with_n_parachains(p: u32, ) -> Weight { - // Minimum execution time: 36_411 nanoseconds. - Weight::from_ref_time(37_604_452) - // Standard Error: 57_620 - .saturating_add(Weight::from_ref_time(248_648).saturating_mul(p.into())) + // Proof Size summary in bytes: + // Measured: `399` + // Estimated: `7618` + // Minimum execution time: 47_436_000 picoseconds. + Weight::from_parts(75_670_977, 0) + .saturating_add(Weight::from_parts(0, 7618)) + // Standard Error: 724_179 + .saturating_add(Weight::from_parts(5_669_961, 0).saturating_mul(p.into())) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(3)) } - // Storage: BridgeWococoParachain PalletOperatingMode (r:1 w:0) - // Storage: BridgeWococoGrandpa ImportedHeaders (r:1 w:0) - // Storage: BridgeWococoParachain ParasInfo (r:1 w:1) - // Storage: BridgeWococoParachain ImportedParaHashes (r:1 w:1) - // Storage: BridgeWococoParachain ImportedParaHeads (r:0 w:1) + /// Storage: BridgeWococoParachain PalletOperatingMode (r:1 w:0) + /// Proof: BridgeWococoParachain PalletOperatingMode (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) + /// Storage: BridgeWococoGrandpa ImportedHeaders (r:1 w:0) + /// Proof: BridgeWococoGrandpa ImportedHeaders (max_values: Some(1024), max_size: Some(68), added: 1553, mode: MaxEncodedLen) + /// Storage: BridgeWococoParachain ParasInfo (r:1 w:1) + /// Proof: BridgeWococoParachain ParasInfo (max_values: Some(1), max_size: Some(60), added: 555, mode: MaxEncodedLen) + /// Storage: BridgeWococoParachain ImportedParaHashes (r:1 w:1) + /// Proof: BridgeWococoParachain ImportedParaHashes (max_values: Some(64), max_size: Some(64), added: 1054, mode: MaxEncodedLen) + /// Storage: BridgeWococoParachain ImportedParaHeads (r:0 w:1) + /// Proof: BridgeWococoParachain ImportedParaHeads (max_values: Some(64), max_size: Some(196), added: 1186, mode: MaxEncodedLen) fn submit_parachain_heads_with_1kb_proof() -> Weight { - // Minimum execution time: 45_107 nanoseconds. - Weight::from_ref_time(45_916_000) + // Proof Size summary in bytes: + // Measured: `399` + // Estimated: `7618` + // Minimum execution time: 70_961_000 picoseconds. + Weight::from_parts(83_138_000, 0) + .saturating_add(Weight::from_parts(0, 7618)) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(3)) } - // Storage: BridgeWococoParachain PalletOperatingMode (r:1 w:0) - // Storage: BridgeWococoGrandpa ImportedHeaders (r:1 w:0) - // Storage: BridgeWococoParachain ParasInfo (r:1 w:1) - // Storage: BridgeWococoParachain ImportedParaHashes (r:1 w:1) - // Storage: BridgeWococoParachain ImportedParaHeads (r:0 w:1) + /// Storage: BridgeWococoParachain PalletOperatingMode (r:1 w:0) + /// Proof: BridgeWococoParachain PalletOperatingMode (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen) + /// Storage: BridgeWococoGrandpa ImportedHeaders (r:1 w:0) + /// Proof: BridgeWococoGrandpa ImportedHeaders (max_values: Some(1024), max_size: Some(68), added: 1553, mode: MaxEncodedLen) + /// Storage: BridgeWococoParachain ParasInfo (r:1 w:1) + /// Proof: BridgeWococoParachain ParasInfo (max_values: Some(1), max_size: Some(60), added: 555, mode: MaxEncodedLen) + /// Storage: BridgeWococoParachain ImportedParaHashes (r:1 w:1) + /// Proof: BridgeWococoParachain ImportedParaHashes (max_values: Some(64), max_size: Some(64), added: 1054, mode: MaxEncodedLen) + /// Storage: BridgeWococoParachain ImportedParaHeads (r:0 w:1) + /// Proof: BridgeWococoParachain ImportedParaHeads (max_values: Some(64), max_size: Some(196), added: 1186, mode: MaxEncodedLen) fn submit_parachain_heads_with_16kb_proof() -> Weight { - // Minimum execution time: 97_738 nanoseconds. - Weight::from_ref_time(100_381_000) + // Proof Size summary in bytes: + // Measured: `399` + // Estimated: `7618` + // Minimum execution time: 122_639_000 picoseconds. + Weight::from_parts(142_091_000, 0) + .saturating_add(Weight::from_parts(0, 7618)) .saturating_add(T::DbWeight::get().reads(4)) .saturating_add(T::DbWeight::get().writes(3)) } diff --git a/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_relayers.rs b/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_relayers.rs index c81dfbc14c8..3959e424c26 100644 --- a/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_relayers.rs +++ b/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/pallet_bridge_relayers.rs @@ -17,26 +17,26 @@ //! Autogenerated weights for `pallet_bridge_relayers` //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2023-02-16, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2023-03-15, STEPS: `50`, REPEAT: `2`, LOW RANGE: `[]`, HIGH RANGE: `[]` //! WORST CASE MAP SIZE: `1000000` -//! HOSTNAME: `runner-osnnfcqu-project-238-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz` +//! HOSTNAME: `bkontur-ThinkPad-P14s-Gen-2i`, CPU: `11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz` //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("bridge-hub-rococo-dev"), DB CACHE: 1024 // Executed Command: -// target/production/polkadot-parachain +// ./target/production/polkadot-parachain // benchmark // pallet // --steps=50 -// --repeat=20 +// --repeat=2 // --extrinsic=* // --execution=wasm // --wasm-execution=compiled // --heap-pages=4096 -// --json-file=/builds/parity/mirrors/cumulus/.git/.artifacts/bench.json -// --pallet=pallet_bridge_relayers -// --chain=bridge-hub-rococo-dev +// --json-file=./bench.json // --header=./file_header.txt -// --output=./parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights/ +// --chain=bridge-hub-rococo-dev +// --pallet=pallet_bridge_relayers +// --output=./parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/weights #![cfg_attr(rustfmt, rustfmt_skip)] #![allow(unused_parens)] @@ -49,16 +49,16 @@ use sp_std::marker::PhantomData; pub struct WeightInfo(PhantomData); impl pallet_bridge_relayers::WeightInfo for WeightInfo { /// Storage: BridgeRelayers RelayerRewards (r:1 w:1) - /// Proof: BridgeRelayers RelayerRewards (max_values: None, max_size: Some(68), added: 2543, mode: MaxEncodedLen) + /// Proof: BridgeRelayers RelayerRewards (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen) /// Storage: System Account (r:1 w:1) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) fn claim_rewards() -> Weight { // Proof Size summary in bytes: - // Measured: `271` - // Estimated: `5146` - // Minimum execution time: 37_598 nanoseconds. - Weight::from_ref_time(38_726_000) - .saturating_add(Weight::from_proof_size(5146)) + // Measured: `239` + // Estimated: `7131` + // Minimum execution time: 37_638_000 picoseconds. + Weight::from_parts(43_222_000, 0) + .saturating_add(Weight::from_parts(0, 7131)) .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().writes(2)) } diff --git a/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/xcm_config.rs b/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/xcm_config.rs index 646fcbfb3c7..571e2075cb8 100644 --- a/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/xcm_config.rs +++ b/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/xcm_config.rs @@ -176,11 +176,15 @@ impl Contains for SafeCallFilter { RuntimeCall::BridgeRococoGrandpa(pallet_bridge_grandpa::Call::< Runtime, BridgeGrandpaRococoInstance, - >::initialize { .. }) | + >::initialize { + .. + }) | RuntimeCall::BridgeWococoGrandpa(pallet_bridge_grandpa::Call::< Runtime, BridgeGrandpaWococoInstance, - >::initialize { .. }) => true, + >::initialize { + .. + }) => true, _ => false, } } diff --git a/parachains/runtimes/bridge-hubs/bridge-hub-rococo/tests/tests.rs b/parachains/runtimes/bridge-hubs/bridge-hub-rococo/tests/tests.rs index da3e6634434..a759c905df8 100644 --- a/parachains/runtimes/bridge-hubs/bridge-hub-rococo/tests/tests.rs +++ b/parachains/runtimes/bridge-hubs/bridge-hub-rococo/tests/tests.rs @@ -196,7 +196,7 @@ fn can_govornance_call_xcm_transact_with_initialize_on_bridge_hub_rococo() { UnpaidExecution { weight_limit: Unlimited, check_origin: None }, Transact { origin_kind: OriginKind::Superuser, - require_weight_at_most: Weight::from_ref_time(1000000000), + require_weight_at_most: Weight::from_parts(1000000000, 0), call: initialize_call.encode().into(), }, ]); @@ -212,7 +212,7 @@ fn can_govornance_call_xcm_transact_with_initialize_on_bridge_hub_rococo() { // initialize bridge through governance-like let hash = xcm.using_encoded(sp_io::hashing::blake2_256); - let weight_limit = Weight::from_ref_time(41666666666); + let weight_limit = Weight::from_parts(41666666666, 0); let outcome = XcmExecutor::::execute_xcm(origin, xcm, hash, weight_limit); // check mode after @@ -238,7 +238,7 @@ fn can_govornance_call_xcm_transact_with_initialize_bridge_on_bridge_hub_wococo( UnpaidExecution { weight_limit: Unlimited, check_origin: None }, Transact { origin_kind: OriginKind::Superuser, - require_weight_at_most: Weight::from_ref_time(1000000000), + require_weight_at_most: Weight::from_parts(1000000000, 0), call: initialize_call.encode().into(), }, ]); @@ -254,7 +254,7 @@ fn can_govornance_call_xcm_transact_with_initialize_bridge_on_bridge_hub_wococo( // initialize bridge through governance-like let hash = xcm.using_encoded(sp_io::hashing::blake2_256); - let weight_limit = Weight::from_ref_time(41666666666); + let weight_limit = Weight::from_parts(41666666666, 0); let outcome = XcmExecutor::::execute_xcm(origin, xcm, hash, weight_limit); // check mode after