diff --git a/pallets/dapps-staking/src/pallet/mod.rs b/pallets/dapps-staking/src/pallet/mod.rs index cdf791f39a..55b4d09bea 100644 --- a/pallets/dapps-staking/src/pallet/mod.rs +++ b/pallets/dapps-staking/src/pallet/mod.rs @@ -569,7 +569,6 @@ pub mod pallet { #[pallet::compact] value: Balance, ) -> DispatchResultWithPostInfo { Self::ensure_pallet_enabled()?; - Self::ensure_not_in_decommission()?; let staker = ensure_signed(origin)?; ensure!(value > Zero::zero(), Error::::UnstakingWithNoValue); @@ -630,7 +629,6 @@ pub mod pallet { #[pallet::weight(T::WeightInfo::withdraw_unbonded())] pub fn withdraw_unbonded(origin: OriginFor) -> DispatchResultWithPostInfo { Self::ensure_pallet_enabled()?; - Self::ensure_not_in_decommission()?; let staker = ensure_signed(origin)?; let mut ledger = Self::ledger(&staker); diff --git a/pallets/dapps-staking/src/tests.rs b/pallets/dapps-staking/src/tests.rs index 86a13ce315..5b53ea6ec3 100644 --- a/pallets/dapps-staking/src/tests.rs +++ b/pallets/dapps-staking/src/tests.rs @@ -2146,10 +2146,6 @@ fn decommision_is_ok() { DappsStaking::bond_and_stake(RuntimeOrigin::signed(account), contract_id, 100), Error::::DecommissionInProgress ); - assert_noop!( - DappsStaking::unbond_and_unstake(RuntimeOrigin::signed(account), contract_id, 100), - Error::::DecommissionInProgress - ); assert_noop!( DappsStaking::nomination_transfer( RuntimeOrigin::signed(account), @@ -2159,10 +2155,6 @@ fn decommision_is_ok() { ), Error::::DecommissionInProgress ); - assert_noop!( - DappsStaking::withdraw_unbonded(RuntimeOrigin::signed(account)), - Error::::DecommissionInProgress - ); // Ensure that expected calls still work (or at least don't fail with `DecommissionInProgress` error) assert_noop!( @@ -2173,11 +2165,26 @@ fn decommision_is_ok() { DappsStaking::claim_dapp(RuntimeOrigin::signed(account), contract_id, 1,), Error::::NotOperatedContract ); + assert_noop!( + DappsStaking::unbond_and_unstake(RuntimeOrigin::signed(account), contract_id, 100), + Error::::NotOperatedContract + ); + assert_noop!( + DappsStaking::withdraw_unbonded(RuntimeOrigin::signed(account)), + Error::::NothingToWithdraw + ); + assert_noop!( + DappsStaking::set_reward_destination( + RuntimeOrigin::signed(account), + RewardDestination::StakeBalance + ), + Error::::NotActiveStaker + ); }) } #[test] -fn no_era_change_during_decommision() { +fn no_era_change_during_decommission() { ExternalityBuilder::build().execute_with(|| { initialize_first_block();