2020
2121use crate :: * ;
2222
23- use bp_relayers:: RewardsAccountOwner ;
24- use frame_benchmarking:: { benchmarks_instance_pallet, whitelisted_caller} ;
23+ use frame_benchmarking:: {
24+ benchmarks_instance_pallet, whitelisted_caller, BenchmarkError , BenchmarkResult ,
25+ } ;
26+ use frame_support:: { assert_ok, weights:: Weight } ;
2527use frame_system:: RawOrigin ;
2628use sp_runtime:: traits:: One ;
2729
@@ -33,35 +35,70 @@ pub struct Pallet<T: Config<I>, I: 'static = ()>(crate::Pallet<T, I>);
3335
3436/// Trait that must be implemented by runtime.
3537pub trait Config < I : ' static = ( ) > : crate :: Config < I > {
36- /// Lane id to use in benchmarks.
37- fn bench_lane_id ( ) -> Self :: LaneId {
38- Self :: LaneId :: default ( )
39- }
38+ /// `T::Reward` to use in benchmarks.
39+ fn bench_reward ( ) -> Self :: Reward ;
4040 /// Prepare environment for paying given reward for serving given lane.
4141fn prepare_rewards_account (
42- account_params : RewardsAccountParams < Self :: LaneId > ,
43- reward : Self :: Reward ,
44- ) ;
42+ reward_kind : Self :: Reward ,
43+ reward : Self :: RewardBalance ,
44+ ) -> Option < BeneficiaryOf < Self , I > > ;
4545 /// Give enough balance to given account.
46- fn deposit_account ( account : Self :: AccountId , balance : Self :: Reward ) ;
46+ fn deposit_account ( account : Self :: AccountId , balance : Self :: Balance ) ;
47+ }
48+
49+ fn assert_last_event < T : Config < I > , I : ' static > (
50+ generic_event : <T as pallet:: Config < I > >:: RuntimeEvent ,
51+ ) {
52+ frame_system:: Pallet :: < T > :: assert_last_event ( generic_event. into ( ) ) ;
4753}
4854
4955benchmarks_instance_pallet ! {
56+ where_clause { where
57+ BeneficiaryOf <T , I >: From <<T as frame_system:: Config >:: AccountId >,
58+ }
59+
5060 // Benchmark `claim_rewards` call.
5161 claim_rewards {
52- let lane = T :: bench_lane_id( ) ;
53- let account_params =
54- RewardsAccountParams :: new( lane, * b"test" , RewardsAccountOwner :: ThisChain ) ;
62+ let reward_kind = T :: bench_reward( ) ;
5563 let relayer: T :: AccountId = whitelisted_caller( ) ;
56- let reward = T :: Reward :: from( REWARD_AMOUNT ) ;
64+ let reward_balance = T :: RewardBalance :: from( REWARD_AMOUNT ) ;
5765
58- T :: prepare_rewards_account( account_params , reward ) ;
59- RelayerRewards :: <T , I >:: insert( & relayer, account_params , reward ) ;
60- } : _( RawOrigin :: Signed ( relayer) , account_params )
66+ let _ = T :: prepare_rewards_account( reward_kind , reward_balance ) ;
67+ RelayerRewards :: <T , I >:: insert( & relayer, reward_kind , reward_balance ) ;
68+ } : _( RawOrigin :: Signed ( relayer. clone ( ) ) , reward_kind )
6169 verify {
6270 // we can't check anything here, because `PaymentProcedure` is responsible for
6371 // payment logic, so we assume that if call has succeeded, the procedure has
6472 // also completed successfully
73+ assert_last_event:: <T , I >( Event :: RewardPaid {
74+ relayer: relayer. clone( ) ,
75+ reward_kind,
76+ reward_balance,
77+ beneficiary: relayer. into( ) ,
78+ } . into( ) ) ;
79+ }
80+
81+ // Benchmark `claim_rewards_to` call.
82+ claim_rewards_to {
83+ let reward_kind = T :: bench_reward( ) ;
84+ let relayer: T :: AccountId = whitelisted_caller( ) ;
85+ let reward_balance = T :: RewardBalance :: from( REWARD_AMOUNT ) ;
86+
87+ let Some ( alternative_beneficiary) = T :: prepare_rewards_account( reward_kind, reward_balance) else {
88+ return Err ( BenchmarkError :: Override ( BenchmarkResult :: from_weight( Weight :: MAX ) ) ) ;
89+ } ;
90+ RelayerRewards :: <T , I >:: insert( & relayer, reward_kind, reward_balance) ;
91+ } : _( RawOrigin :: Signed ( relayer. clone( ) ) , reward_kind, alternative_beneficiary. clone( ) )
92+ verify {
93+ // we can't check anything here, because `PaymentProcedure` is responsible for
94+ // payment logic, so we assume that if call has succeeded, the procedure has
95+ // also completed successfully
96+ assert_last_event:: <T , I >( Event :: RewardPaid {
97+ relayer,
98+ reward_kind,
99+ reward_balance,
100+ beneficiary: alternative_beneficiary,
101+ } . into( ) ) ;
65102 }
66103
67104 // Benchmark `register` call.
@@ -95,7 +132,7 @@ benchmarks_instance_pallet! {
95132 }
96133
97134 // Benchmark `slash_and_deregister` method of the pallet. We are adding this weight to
98- // the weight of message delivery call if `RefundBridgedParachainMessages ` signed extension
135+ // the weight of message delivery call if `BridgeRelayersTransactionExtension ` signed extension
99136 // is deployed at runtime level.
100137 slash_and_deregister {
101138 // prepare and register relayer account
@@ -105,32 +142,30 @@ benchmarks_instance_pallet! {
105142 . saturating_add( One :: one( ) )
106143 . saturating_add( One :: one( ) ) ;
107144 T :: deposit_account( relayer. clone( ) , crate :: Pallet :: <T , I >:: required_stake( ) ) ;
108- crate :: Pallet :: <T , I >:: register( RawOrigin :: Signed ( relayer. clone( ) ) . into( ) , valid_till) . unwrap ( ) ;
145+ assert_ok! ( crate :: Pallet :: <T , I >:: register( RawOrigin :: Signed ( relayer. clone( ) ) . into( ) , valid_till) ) ;
109146
110147 // create slash destination account
111- let lane = T :: bench_lane_id( ) ;
112- let slash_destination = RewardsAccountParams :: new( lane, * b"test" , RewardsAccountOwner :: ThisChain ) ;
113- T :: prepare_rewards_account( slash_destination, Zero :: zero( ) ) ;
148+ let slash_destination: T :: AccountId = whitelisted_caller( ) ;
149+ T :: deposit_account( slash_destination. clone( ) , Zero :: zero( ) ) ;
114150 } : {
115- crate :: Pallet :: <T , I >:: slash_and_deregister( & relayer, slash_destination . into ( ) )
151+ crate :: Pallet :: <T , I >:: slash_and_deregister( & relayer, bp_relayers :: ExplicitOrAccountParams :: Explicit :: <_ , ( ) > ( slash_destination ) )
116152 }
117153 verify {
118154 assert!( !crate :: Pallet :: <T , I >:: is_registration_active( & relayer) ) ;
119155 }
120156
121157 // Benchmark `register_relayer_reward` method of the pallet. We are adding this weight to
122- // the weight of message delivery call if `RefundBridgedParachainMessages ` signed extension
158+ // the weight of message delivery call if `BridgeRelayersTransactionExtension ` signed extension
123159 // is deployed at runtime level.
124160 register_relayer_reward {
125- let lane = T :: bench_lane_id ( ) ;
161+ let reward_kind = T :: bench_reward ( ) ;
126162 let relayer: T :: AccountId = whitelisted_caller( ) ;
127- let account_params =
128- RewardsAccountParams :: new( lane, * b"test" , RewardsAccountOwner :: ThisChain ) ;
163+
129164 } : {
130- crate :: Pallet :: <T , I >:: register_relayer_reward( account_params , & relayer, One :: one( ) ) ;
165+ crate :: Pallet :: <T , I >:: register_relayer_reward( reward_kind , & relayer, One :: one( ) ) ;
131166 }
132167 verify {
133- assert_eq!( RelayerRewards :: <T , I >:: get( relayer, & account_params ) , Some ( One :: one( ) ) ) ;
168+ assert_eq!( RelayerRewards :: <T , I >:: get( relayer, & reward_kind ) , Some ( One :: one( ) ) ) ;
134169 }
135170
136171 impl_benchmark_test_suite!( Pallet , crate :: mock:: new_test_ext( ) , crate :: mock:: TestRuntime )
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?v=4&size=40){kind=avatar}
0 commit comments