Unbond & Rebond: do_rebag

emostov · emostov · commit 887035169fab · 2021-07-27T11:34:30.000-07:00
diff --git a/frame/staking/src/lib.rs b/frame/staking/src/lib.rs
@@ -1781,6 +1781,7 @@ pub mod pallet {
 				let era = Self::current_era().unwrap_or(0) + T::BondingDuration::get();
 				ledger.unlocking.push(UnlockChunk { value, era });
 				Self::update_ledger(&controller, &ledger);
+				Self::do_rebag(&ledger.stash);
 				Self::deposit_event(Event::<T>::Unbonded(ledger.stash, value));
 			}
 			Ok(())
@@ -2273,6 +2274,7 @@ pub mod pallet {
 
 			Self::deposit_event(Event::<T>::Bonded(ledger.stash.clone(), value));
 			Self::update_ledger(&controller, &ledger);
+			Self::do_rebag(&ledger.stash);
 			Ok(Some(
 				35 * WEIGHT_PER_MICROS +
 					50 * WEIGHT_PER_NANOS * (ledger.unlocking.len() as Weight) +
diff --git a/frame/staking/src/tests.rs b/frame/staking/src/tests.rs
@@ -3885,7 +3885,6 @@ mod voter_bags {
 
 			// decrease stake within the range of the current bag
 			assert_ok!(Staking::unbond(Origin::signed(43), 999)); // 2000 - 999 = 1001
-			assert_ok!(Staking::rebag(Origin::signed(43), 42));
 			// does not change bags
 			assert_eq!(
 				get_bags(),
@@ -3894,7 +3893,6 @@ mod voter_bags {
 
 			// reduce stake to the level of a non-existent bag
 			assert_ok!(Staking::unbond(Origin::signed(43), 971)); // 1001 - 971 = 30
-			assert_ok!(Staking::rebag(Origin::signed(43), 42));
 			// creates the bag and moves the voter into it
 			assert_eq!(
 				get_bags(),
@@ -3903,7 +3901,6 @@ mod voter_bags {
 
 			// increase stake by `rebond`-ing to the level of a pre-existing bag
 			assert_ok!(Staking::rebond(Origin::signed(43), 31)); // 30 + 41 = 61
-			assert_ok!(Staking::rebag(Origin::signed(43), 42));
 			// moves the voter to that bag
 			assert_eq!(get_bags(), vec![(10, vec![31]), (1000, vec![11, 21, 101, 42]),]);
 		});
