Fix and update benchmarks (paritytech#1494)

* decrease parameters range in grandpa benchmarks

* fix messages benchmarks

* update all weights

* dealing with failed test (WiP)

* Revert "dealing with failed test (WiP)"

This reverts commit 0379d24bcf0692da5813968d83e0cbc918ac4691.

* proper tests fix

bridges/modules/grandpa/src/benchmarking.rs

@@ -63,6 +63,16 @@ const MAX_VOTE_ANCESTRIES: u32 = 1000;
 // number of validators.
 const MAX_VALIDATOR_SET_SIZE: u32 = 1024;
 
+// `1..MAX_VALIDATOR_SET_SIZE` and `1..MAX_VOTE_ANCESTRIES` are too large && benchmarks are
+// running for almost 40m (steps=50, repeat=20) on a decent laptop, which is too much. Since
+// we're building linear function here, let's just select some limited subrange for benchmarking.
+const VALIDATOR_SET_SIZE_RANGE_BEGIN: u32 = MAX_VALIDATOR_SET_SIZE / 20;
+const VALIDATOR_SET_SIZE_RANGE_END: u32 =
+ VALIDATOR_SET_SIZE_RANGE_BEGIN + VALIDATOR_SET_SIZE_RANGE_BEGIN;
+const MAX_VOTE_ANCESTRIES_RANGE_BEGIN: u32 = MAX_VOTE_ANCESTRIES / 20;
+const MAX_VOTE_ANCESTRIES_RANGE_END: u32 =
+ MAX_VOTE_ANCESTRIES_RANGE_BEGIN + MAX_VOTE_ANCESTRIES_RANGE_BEGIN;
+
 /// Returns number of first header to be imported.
 ///
 /// Since we bootstrap the pallet with `HeadersToKeep` already imported headers,
@@ -107,8 +117,8 @@ benchmarks_instance_pallet! {
  // This is the "gold standard" benchmark for this extrinsic, and it's what should be used to
  // annotate the weight in the pallet.
  submit_finality_proof {
- let p in 1..MAX_VALIDATOR_SET_SIZE;
- let v in 1..MAX_VOTE_ANCESTRIES;
+ let p in VALIDATOR_SET_SIZE_RANGE_BEGIN..VALIDATOR_SET_SIZE_RANGE_END;
+ let v in MAX_VOTE_ANCESTRIES_RANGE_BEGIN..MAX_VOTE_ANCESTRIES_RANGE_END;
  let caller: T::AccountId = whitelisted_caller();
  let (header, justification) = prepare_benchmark_data::<T, I>(p, v);
  }: submit_finality_proof(RawOrigin::Signed(caller), Box::new(header), justification)

bridges/modules/grandpa/src/weights.rs

@@ -17,14 +17,15 @@
 //! Autogenerated weights for `pallet_bridge_grandpa`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2021-12-28, STEPS: 50, REPEAT: 20
+//! DATE: 2022-07-06, STEPS: 50, REPEAT: 20
 //! LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled
-//! CHAIN: Some("dev"), DB CACHE: 128
+//! CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
 // target/release/millau-bridge-node
 // benchmark
+// pallet
 // --chain=dev
 // --steps=50
 // --repeat=20
@@ -55,9 +56,9 @@ pub trait WeightInfo {
 pub struct MillauWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for MillauWeight<T> {
  fn submit_finality_proof(p: u32, v: u32) -> Weight {
- (115_651_000 as Weight)
- .saturating_add((61_465_000 as Weight).saturating_mul(p as Weight))
- .saturating_add((3_438_000 as Weight).saturating_mul(v as Weight))
+ (55_070_000 as Weight)
+ .saturating_add((39_678_000 as Weight).saturating_mul(p as Weight))
+ .saturating_add((1_540_000 as Weight).saturating_mul(v as Weight))
  .saturating_add(T::DbWeight::get().reads(7 as Weight))
  .saturating_add(T::DbWeight::get().writes(6 as Weight))
  }
@@ -66,9 +67,9 @@ impl<T: frame_system::Config> WeightInfo for MillauWeight<T> {
 // For backwards compatibility and tests
 impl WeightInfo for () {
  fn submit_finality_proof(p: u32, v: u32) -> Weight {
- (115_651_000 as Weight)
- .saturating_add((61_465_000 as Weight).saturating_mul(p as Weight))
- .saturating_add((3_438_000 as Weight).saturating_mul(v as Weight))
+ (55_070_000 as Weight)
+ .saturating_add((39_678_000 as Weight).saturating_mul(p as Weight))
+ .saturating_add((1_540_000 as Weight).saturating_mul(v as Weight))
  .saturating_add(RocksDbWeight::get().reads(7 as Weight))
  .saturating_add(RocksDbWeight::get().writes(6 as Weight))
  }

bridges/modules/messages/src/benchmarking.rs

@@ -19,12 +19,13 @@
 use crate::{
  inbound_lane::InboundLaneStorage, inbound_lane_storage, outbound_lane,
  outbound_lane::ReceivalConfirmationResult, weights_ext::EXPECTED_DEFAULT_MESSAGE_LENGTH, Call,
+ OutboundLanes, OutboundMessages,
 };
 
 use bp_messages::{
  source_chain::TargetHeaderChain, target_chain::SourceHeaderChain, DeliveredMessages,
- InboundLaneData, LaneId, MessageData, MessageNonce, OutboundLaneData, UnrewardedRelayer,
- UnrewardedRelayersState,
+ InboundLaneData, LaneId, MessageData, MessageKey, MessageNonce, OutboundLaneData,
+ UnrewardedRelayer, UnrewardedRelayersState,
 };
 use bp_runtime::{messages::DispatchFeePayment, StorageProofSize};
 use frame_benchmarking::{account, benchmarks_instance_pallet};
@@ -244,7 +245,10 @@ benchmarks_instance_pallet! {
  send_regular_message_with_payload::<T, I>(vec![42u8; T::maximal_message_size() as _]);
  }: increase_message_fee(RawOrigin::Signed(sender.clone()), lane_id, nonce, additional_fee)
  verify {
- assert_eq!(T::account_balance(&sender), 0.into());
+ assert_eq!(
+ OutboundMessages::<T, I>::get(MessageKey { lane_id: T::bench_lane_id(), nonce }).unwrap().fee,
+ T::message_fee() + additional_fee,
+ );
  }
 
  // Benchmark `increase_message_fee` with following conditions:
@@ -265,7 +269,10 @@ benchmarks_instance_pallet! {
  send_regular_message_with_payload::<T, I>(vec![42u8; i as _]);
  }: increase_message_fee(RawOrigin::Signed(sender.clone()), lane_id, nonce, additional_fee)
  verify {
- assert_eq!(T::account_balance(&sender), 0.into());
+ assert_eq!(
+ OutboundMessages::<T, I>::get(MessageKey { lane_id: T::bench_lane_id(), nonce }).unwrap().fee,
+ T::message_fee() + additional_fee,
+ );
  }
 
  // Benchmark `receive_messages_proof` extrinsic with single minimal-weight message and following conditions:
@@ -508,10 +515,7 @@ benchmarks_instance_pallet! {
  });
  }: receive_messages_delivery_proof(RawOrigin::Signed(relayer_id.clone()), proof, relayers_state)
  verify {
- assert_eq!(
- T::account_balance(&relayer_id),
- relayer_balance + T::message_fee(),
- );
+ assert_eq!(OutboundLanes::<T, I>::get(T::bench_lane_id()).latest_received_nonce, 1);
  }
 
  // Benchmark `receive_messages_delivery_proof` extrinsic with following conditions:
@@ -552,7 +556,7 @@ benchmarks_instance_pallet! {
  });
  }: receive_messages_delivery_proof(RawOrigin::Signed(relayer_id.clone()), proof, relayers_state)
  verify {
- ensure_relayer_rewarded::<T, I>(&relayer_id, &relayer_balance);
+ assert_eq!(OutboundLanes::<T, I>::get(T::bench_lane_id()).latest_received_nonce, 2);
  }
 
  // Benchmark `receive_messages_delivery_proof` extrinsic with following conditions:
@@ -599,8 +603,7 @@ benchmarks_instance_pallet! {
  });
  }: receive_messages_delivery_proof(RawOrigin::Signed(relayer1_id.clone()), proof, relayers_state)
  verify {
- ensure_relayer_rewarded::<T, I>(&relayer1_id, &relayer1_balance);
- ensure_relayer_rewarded::<T, I>(&relayer2_id, &relayer2_balance);
+ assert_eq!(OutboundLanes::<T, I>::get(T::bench_lane_id()).latest_received_nonce, 2);
  }
 }
 
@@ -642,16 +645,3 @@ fn receive_messages<T: Config<I>, I: 'static>(nonce: MessageNonce) {
  last_confirmed_nonce: 0,
  });
 }
-
-fn ensure_relayer_rewarded<T: Config<I>, I: 'static>(
- relayer_id: &T::AccountId,
- old_balance: &T::OutboundMessageFee,
-) {
- let new_balance = T::account_balance(relayer_id);
- assert!(
- new_balance > *old_balance,
- "Relayer haven't received reward for relaying message: old balance = {:?}, new balance = {:?}",
- old_balance,
- new_balance,
- );
-}