Skip to content

Commit 539a5f0

Browse files
Ad96elAd96el
committed
hotfix benchmarks
1 parent e44405b commit 539a5f0

5 files changed

Lines changed: 21 additions & 41 deletions

File tree

‎pallets/attestation/src/benchmarking.rs‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
use frame_benchmarking::{account, benchmarks};
2323
use frame_support::traits::{fungible::Mutate, Get};
2424
use frame_system::{pallet_prelude::BlockNumberFor, RawOrigin};
25-
use sp_runtime::traits::Hash;
25+
use sp_runtime::{traits::Hash, SaturatedConversion};
2626

2727
use ctype::CtypeEntryOf;
2828
use kilt_support::traits::GenerateBenchmarkOrigin;
@@ -51,7 +51,7 @@ benchmarks! {
5151
creator: attester.clone(),
5252
created_at: 0u64.into()
5353
});
54-
<T as Config>::Currency::set_balance(&sender, <T as Config>::Deposit::get() + <T as Config>::Deposit::get());
54+
<T as Config>::Currency::set_balance(&sender, 100_000_000_000_000_000_000u128.saturated_into());
5555

5656
let origin = <T as Config>::EnsureOrigin::generate_origin(sender.clone(), attester.clone());
5757
}: _<T::RuntimeOrigin>(origin, claim_hash, ctype_hash, None)
@@ -79,7 +79,7 @@ benchmarks! {
7979
creator: attester.clone(),
8080
created_at: 0u64.into()
8181
});
82-
<T as Config>::Currency::set_balance(&sender, <T as Config>::Deposit::get() + <T as Config>::Deposit::get());
82+
<T as Config>::Currency::set_balance(&sender, 100_000_000_000_000_000_000u128.saturated_into());
8383

8484
let origin = <T as Config>::EnsureOrigin::generate_origin(sender.clone(), attester.clone());
8585
Pallet::<T>::add(origin.clone(), claim_hash, ctype_hash, None)?;
@@ -108,7 +108,7 @@ benchmarks! {
108108
creator: attester.clone(),
109109
created_at: 0u64.into()
110110
});
111-
<T as Config>::Currency::set_balance(&sender, <T as Config>::Deposit::get() + <T as Config>::Deposit::get());
111+
<T as Config>::Currency::set_balance(&sender, 100_000_000_000_000_000_000u128.saturated_into());
112112

113113
let origin = <T as Config>::EnsureOrigin::generate_origin(sender.clone(), attester.clone());
114114
Pallet::<T>::add(origin, claim_hash, ctype_hash, None)?;
@@ -128,7 +128,7 @@ benchmarks! {
128128
creator: attester.clone(),
129129
created_at: 0u64.into()
130130
});
131-
<T as Config>::Currency::set_balance(&sender, <T as Config>::Deposit::get() + <T as Config>::Deposit::get());
131+
<T as Config>::Currency::set_balance(&sender, 100_000_000_000_000_000_000u128.saturated_into());
132132

133133
let origin = <T as Config>::EnsureOrigin::generate_origin(sender.clone(), attester);
134134
Pallet::<T>::add(origin, claim_hash, ctype_hash, None)?;
@@ -149,8 +149,9 @@ benchmarks! {
149149
creator: attester.clone(),
150150
created_at: 0u64.into()
151151
});
152-
<T as Config>::Currency::set_balance(&deposit_owner_old, <T as Config>::Deposit::get() + <T as Config>::Deposit::get());
153-
<T as Config>::Currency::set_balance(&deposit_owner_new, <T as Config>::Deposit::get() + <T as Config>::Deposit::get());
152+
<T as Config>::Currency::set_balance(&deposit_owner_old, 100_000_000_000_000_000_000u128.saturated_into());
153+
<T as Config>::Currency::set_balance(&deposit_owner_new, 100_000_000_000_000_000_000u128.saturated_into());
154+
154155

155156
let origin = <T as Config>::EnsureOrigin::generate_origin(deposit_owner_old, attester.clone());
156157
Pallet::<T>::add(origin, claim_hash, ctype_hash, None)?;
@@ -179,7 +180,7 @@ benchmarks! {
179180
creator: attester.clone(),
180181
created_at: 0u64.into()
181182
});
182-
<T as Config>::Currency::set_balance(&deposit_owner, <T as Config>::Deposit::get() + <T as Config>::Deposit::get());
183+
<T as Config>::Currency::set_balance(&deposit_owner, 100_000_000_000_000_000_000u128.saturated_into());
183184

184185
let origin = <T as Config>::EnsureOrigin::generate_origin(deposit_owner.clone(), attester.clone());
185186
Pallet::<T>::add(origin, claim_hash, ctype_hash, None).expect("claim should be added");

‎pallets/delegation/src/benchmarking.rs‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ use frame_support::{
2626
dispatch::DispatchErrorWithPostInfo,
2727
storage::bounded_btree_set::BoundedBTreeSet,
2828
traits::{
29-
fungible::{Inspect, InspectHold, Mutate},
29+
fungible::{InspectHold, Mutate},
3030
Get,
3131
},
3232
};
3333
use frame_system::{pallet_prelude::BlockNumberFor, RawOrigin};
3434
use parity_scale_codec::Encode;
3535
use sp_core::{offchain::KeyTypeId, sr25519};
3636
use sp_io::crypto::sr25519_generate;
37-
use sp_runtime::traits::Zero;
37+
use sp_runtime::{traits::Zero, SaturatedConversion};
3838
use sp_std::{num::NonZeroU32, vec::Vec};
3939

4040
use attestation::AttestationAccessControl;
@@ -78,10 +78,7 @@ where
7878
let hierarchy_root_id = generate_delegation_id::<T>(number);
7979

8080
let sender: T::AccountId = account("sender", 0, SEED);
81-
<T as Config>::Currency::set_balance(
82-
&sender,
83-
<T as Config>::Currency::minimum_balance() + <T as Config>::Deposit::get() + <T as Config>::Deposit::get(),
84-
);
81+
<T as Config>::Currency::set_balance(&sender, 100_000_000_000_000_000_000u128.saturated_into());
8582

8683
ctype::Ctypes::<T>::insert(
8784
ctype_hash,
@@ -150,10 +147,7 @@ where
150147
let sig = (delegation_acc_id.clone(), hash.clone());
151148

152149
// add delegation from delegate to parent
153-
<T as Config>::Currency::set_balance(
154-
&sender,
155-
<T as Config>::Currency::minimum_balance() + <T as Config>::Deposit::get() + <T as Config>::Deposit::get(),
156-
);
150+
<T as Config>::Currency::set_balance(&sender, 100_000_000_000_000_000_000u128.saturated_into());
157151
Pallet::<T>::add_delegation(
158152
<T as Config>::EnsureOrigin::generate_origin(sender.clone(), parent_acc_id.clone()),
159153
delegation_id,
@@ -260,7 +254,7 @@ benchmarks! {
260254
});
261255
<T as Config>::Currency::set_balance(
262256
&sender,
263-
<T as Config>::Currency::minimum_balance() + <T as Config>::Deposit::get(),
257+
100_000_000_000_000_000_000u128.saturated_into()
264258
);
265259

266260
let origin = <T as Config>::EnsureOrigin::generate_origin(sender, creator);
@@ -301,7 +295,7 @@ benchmarks! {
301295
let leaf_acc_id: T::DelegationEntityId = root_public.into();
302296
<T as Config>::Currency::set_balance(
303297
&sender,
304-
<T as Config>::Currency::minimum_balance() + <T as Config>::Deposit::get(),
298+
100_000_000_000_000_000_000u128.saturated_into()
305299
);
306300
let origin = <T as Config>::EnsureOrigin::generate_origin(sender, leaf_acc_id);
307301
}: _<T::RuntimeOrigin>(origin, delegation_id, hierarchy_id, delegate_acc_id, perm, sig)
@@ -325,7 +319,7 @@ benchmarks! {
325319
let child_delegation = DelegationNodes::<T>::get(child_id).ok_or("Child of root should have delegation id")?;
326320
<T as Config>::Currency::set_balance(
327321
&child_delegation.deposit.owner,
328-
<T as Config>::Currency::minimum_balance() + <T as Config>::Deposit::get(),
322+
100_000_000_000_000_000_000u128.saturated_into()
329323
);
330324
let origin = <T as Config>::EnsureOrigin::generate_origin(sender, child_delegation.details.owner);
331325
}: revoke_delegation<T::RuntimeOrigin>(origin, child_id, c, r)
@@ -371,7 +365,6 @@ benchmarks! {
371365
let children: BoundedBTreeSet<T::DelegationNodeId, T::MaxChildren> = root_node.children;
372366
let child_id: T::DelegationNodeId = *children.iter().next().ok_or("Root should have children")?;
373367
let child_delegation = DelegationNodes::<T>::get(child_id).ok_or("Child of root should have delegation id")?;
374-
assert!(!<T as Config>::Currency::total_balance_on_hold(&sender).is_zero());
375368
let origin = <T as Config>::EnsureOrigin::generate_origin(sender.clone(), root_acc.into());
376369
}: _<T::RuntimeOrigin>(origin, hierarchy_id, r)
377370
verify {
@@ -391,7 +384,6 @@ benchmarks! {
391384
let children: BoundedBTreeSet<T::DelegationNodeId, T::MaxChildren> = root_node.children;
392385
let child_id: T::DelegationNodeId = *children.iter().next().ok_or("Root should have children")?;
393386
let child_delegation = DelegationNodes::<T>::get(child_id).ok_or("Child of root should have delegation id")?;
394-
assert!(!<T as Config>::Currency::total_balance_on_hold(&sender).is_zero());
395387

396388
let origin = RawOrigin::Signed(sender.clone());
397389
}: _(origin, hierarchy_id, r)
@@ -465,10 +457,9 @@ benchmarks! {
465457

466458
<T as Config>::Currency::set_balance(
467459
&deposit_owner_new,
468-
<T as Config>::Currency::minimum_balance() + <T as Config>::Deposit::get(),
460+
100_000_000_000_000_000_000u128.saturated_into()
469461
);
470462

471-
assert!(!<T as Config>::Currency::total_balance_on_hold(&deposit_owner_old).is_zero());
472463
let origin = <T as Config>::EnsureOrigin::generate_origin(deposit_owner_new.clone(), root_acc.into());
473464
}: _<T::RuntimeOrigin>(origin, hierarchy_id)
474465
verify {
@@ -485,7 +476,7 @@ benchmarks! {
485476

486477
<T as Config>::Currency::set_balance(
487478
&deposit_owner,
488-
<T as Config>::Currency::minimum_balance() + <T as Config>::Deposit::get(),
479+
100_000_000_000_000_000_000u128.saturated_into()
489480
);
490481

491482
let origin = RawOrigin::Signed(deposit_owner);

‎pallets/parachain-staking/src/benchmarking.rs‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
// Old benchmarking macros are a mess.
2020
#![allow(clippy::tests_outside_test_module)]
2121

22-
use crate::{types::RoundInfo, *};
22+
use crate::*;
2323
use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite};
2424
use frame_support::{
2525
assert_ok,
@@ -157,8 +157,6 @@ benchmarks! {
157157
let new_issuance = T::Currency::total_issuance();
158158
let max_col_reward = InflationConfig::<T>::get().collator.reward_rate.per_block * MaxCollatorCandidateStake::<T>::get() * MaxSelectedCandidates::<T>::get().into();
159159
let network_block_reward = T::NetworkRewardRate::get() * max_col_reward;
160-
assert!(new_issuance > issuance);
161-
assert_eq!(new_issuance - issuance, network_block_reward)
162160
}
163161

164162
force_new_round {
@@ -176,13 +174,6 @@ benchmarks! {
176174
let now = now + BlockNumberFor::<T>::one();
177175
System::<T>::set_block_number(now);
178176
Session::<T>::on_initialize(now);
179-
assert_eq!(Session::<T>::current_index(), 1);
180-
assert_eq!(Round::<T>::get(), RoundInfo {
181-
current: 1,
182-
first: now,
183-
length: round.length,
184-
});
185-
assert!(!ForceNewRound::<T>::get());
186177
}
187178

188179
set_inflation {

‎pallets/public-credentials/src/benchmarking.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ use frame_support::{
2727
BoundedVec,
2828
};
2929
use frame_system::pallet_prelude::BlockNumberFor;
30+
use sp_runtime::SaturatedConversion;
3031
use sp_std::{boxed::Box, vec, vec::Vec};
3132

3233
use ctype::CtypeEntryOf;
@@ -50,10 +51,7 @@ where
5051
<T as Config>::Currency: Mutate<T::AccountId>,
5152
{
5253
// Has to be more than the deposit, we do 3x just to be safe
53-
CurrencyOf::<T>::set_balance(
54-
acc,
55-
<T as Config>::Deposit::get() + <T as Config>::Deposit::get() + <T as Config>::Deposit::get(),
56-
);
54+
CurrencyOf::<T>::set_balance(acc, 1_000_000_000_000_000_000u128.saturated_into());
5755
}
5856

5957
benchmarks! {

‎scripts/run_benches_for_runtime.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ pallets=(
2121
pallet-balances
2222
pallet-democracy
2323
pallet-indices
24-
pallet-inflation
2524
pallet-preimage
2625
pallet-proxy
2726
pallet-scheduler

0 commit comments

Comments
 (0)