Merge remote-tracking branch 'origin/master' into fix/freeze-lock-inconsistency-fix-call

Author: Dinonard

pallets/dapp-staking-v3/src/test/testing_utils.rs

@@ -86,9 +86,9 @@ impl MemorySnapshot {
     /// Returns locked balance in dApp staking for the specified account.
     /// In case no balance is locked, returns zero.
     pub fn locked_balance(&self, account: &AccountId) -> Balance {
-        self.ledger
-            .get(&account)
-            .map_or(Balance::zero(), |ledger| ledger.active_locked_amount())
+        self.ledger.get(&account).map_or(Balance::zero(), |ledger| {
+            ledger.locked + ledger.unlocking.iter().fold(0, |acc, x| acc + x.amount)
+        })
     }
 }
 
@@ -240,10 +240,15 @@ pub(crate) fn assert_lock(account: AccountId, amount: Balance) {
         "Total locked balance should be increased by the amount locked."
     );
 
+    let post_frozen_balance = Balances::balance_frozen(&FreezeReason::DAppStaking.into(), &account);
     assert_eq!(
         init_frozen_balance + expected_lock_amount,
-        Balances::balance_frozen(&FreezeReason::DAppStaking.into(), &account)
+        post_frozen_balance
     );
+    assert!(
+        Balances::total_balance(&account) >= post_frozen_balance,
+        "Total balance should never be less than frozen balance."
+    )
 }
 
 /// Start the unlocking process for locked funds and assert success.

pallets/dapp-staking-v3/src/test/tests.rs

@@ -3358,3 +3358,18 @@ fn fix_account_scenarios_work() {
         );
     })
 }
+
+fn lock_correctly_considers_unlocking_amount() {
+    ExtBuilder::build().execute_with(|| {
+        // Lock the entire amount & immediately start the unlocking process
+        let (staker, unlock_amount) = (1, 13);
+        let total_balance = Balances::total_balance(&staker);
+        assert_lock(staker, total_balance);
+        assert_unlock(staker, unlock_amount);
+
+        assert_noop!(
+            DappStaking::lock(RuntimeOrigin::signed(staker), 1),
+            Error::<Test>::ZeroAmount
+        );
+    })
+}