diff --git a/pallets/parachain-staking/src/benchmarks.rs b/pallets/parachain-staking/src/benchmarks.rs index a7f15b8fb0..8de269f97d 100644 --- a/pallets/parachain-staking/src/benchmarks.rs +++ b/pallets/parachain-staking/src/benchmarks.rs @@ -20,7 +20,7 @@ use crate::{ AwardedPts, BalanceOf, BottomDelegations, Call, CandidateBondLessRequest, Config, DelegationAction, EnableMarkingOffline, Pallet, ParachainBondConfig, ParachainBondInfo, Points, - Range, RewardPayment, Round, ScheduledRequest, Staked, TopDelegations, + Range, RewardPayment, Round, ScheduledRequest, TopDelegations, }; use frame_benchmarking::{account, benchmarks, impl_benchmark_test_suite}; use frame_support::traits::{Currency, Get, OnFinalize, OnInitialize}; @@ -1552,11 +1552,9 @@ benchmarks! { let payout_round = round.current - reward_delay; // may need: // > - // > // > // ensure parachain bond account exists so that deposit_into_existing succeeds >::insert(payout_round, 100); - >::insert(payout_round, min_candidate_stk::()); // set an account in the bond config so that we will measure the payout to it let account = create_funded_user::( diff --git a/pallets/parachain-staking/src/tests.rs b/pallets/parachain-staking/src/tests.rs index 273eb16333..4df788857b 100644 --- a/pallets/parachain-staking/src/tests.rs +++ b/pallets/parachain-staking/src/tests.rs @@ -6448,19 +6448,11 @@ fn deferred_payment_storage_items_are_cleaned_up() { >::contains_key(1), "Points should be populated during current round" ); - assert!( - >::contains_key(1), - "Staked should be populated when round changes" - ); assert!( !>::contains_key(2), "Points should not be populated until author noted" ); - assert!( - >::contains_key(2), - "Staked should be populated when round changes" - ); // first payout occurs in round 3 roll_to_round_begin(3); @@ -6500,24 +6492,17 @@ fn deferred_payment_storage_items_are_cleaned_up() { "DelayedPayouts should be populated after RewardPaymentDelay" ); assert!(>::contains_key(1)); - assert!( - !>::contains_key(1), - "Staked should be cleaned up after round change" - ); - assert!(!>::contains_key(2)); assert!( !>::contains_key(2), "We never rewarded points for round 2" ); - assert!(>::contains_key(2)); assert!(!>::contains_key(3)); assert!( !>::contains_key(3), "We never awarded points for round 3" ); - assert!(>::contains_key(3)); // collator 1 has been paid in this last block and associated storage cleaned up assert!(!>::contains_key(1, 1)); @@ -6557,7 +6542,6 @@ fn deferred_payment_storage_items_are_cleaned_up() { // collators have both been paid and storage fully cleaned up for round 1 assert!(!>::contains_key(1, 2)); assert!(!>::contains_key(1, 2)); - assert!(!>::contains_key(1)); assert!(!>::contains_key(1)); // points should be cleaned up assert!(!>::contains_key(1)); @@ -6592,7 +6576,6 @@ fn deferred_payment_and_at_stake_storage_items_cleaned_up_for_candidates_not_pro assert!(>::contains_key(1, 1)); assert!(>::contains_key(1, 2)); assert!(!>::contains_key(1, 3)); - assert!(>::contains_key(1)); assert!(>::contains_key(1)); roll_to_round_begin(3); assert!(>::contains_key(1)); @@ -6605,7 +6588,6 @@ fn deferred_payment_and_at_stake_storage_items_cleaned_up_for_candidates_not_pro assert!(!>::contains_key(1, 1)); assert!(!>::contains_key(1, 2)); assert!(!>::contains_key(1, 3)); - assert!(!>::contains_key(1)); assert!(!>::contains_key(1)); assert!(!>::contains_key(1)); }); @@ -8726,8 +8708,8 @@ fn test_on_initialize_weights() { .ref_time(); // SlotProvider read expected_weight += RocksDbWeight::get().reads_writes(1, 0).ref_time(); - // Round and Staked writes, done in on-round-change code block inside on_initialize() - expected_weight += RocksDbWeight::get().reads_writes(0, 2).ref_time(); + // Round write, done in on-round-change code block inside on_initialize() + expected_weight += RocksDbWeight::get().reads_writes(0, 1).ref_time(); // more reads/writes manually accounted for for on_finalize expected_weight += RocksDbWeight::get().reads_writes(3, 2).ref_time();