Add more tests

srml/staking/src/lib.rs

@@ -741,8 +741,8 @@ impl<T: Trait> Module<T> {
 		let event = if new_slash_count > max_slashes {
 			// They're bailing.
 			let slash = Self::current_offline_slash()
-				// Multiply current_offline_slash by 2^unstake_threshold
-				.checked_shl(prefs.unstake_threshold)
+				// Multiply current_offline_slash by 2^(unstake_threshold with upper bound)
+				.checked_shl(unstake_threshold)
 				.unwrap_or_else(Self::slot_stake);
 			let _ = Self::slash_validator(&v, slash);
 			<Validators<T>>::remove(&v);

srml/staking/src/tests.rs

@@ -546,7 +546,7 @@ fn max_unstake_threshold_works() {
 		assert_eq!(Staking::current_offline_slash(), 20);
 		// Account 10 will have unstake_threshold 10
 		<Validators<Test>>::insert(10, ValidatorPrefs {
-			unstake_threshold: 10,
+			unstake_threshold: MAX_UNSTAKE_THRESHOLD,
 			validator_payment: 0,
 		});
 		// Account 20 will have unstake_threshold 100, which should be limited to 10
@@ -556,12 +556,12 @@ fn max_unstake_threshold_works() {
 		});
 
 		// Report each user 1 more than the max_unstake_threshold
-		Staking::on_offline_validator(10, 11);
-		Staking::on_offline_validator(20, 11);
+		Staking::on_offline_validator(10, MAX_UNSTAKE_THRESHOLD as usize + 1);
+		Staking::on_offline_validator(20, MAX_UNSTAKE_THRESHOLD as usize + 1);
 
 		// Show that each balance only gets reduced by 2^max_unstake_threshold
-		assert_eq!(Balances::free_balance(&10), u64::max_value() - 2_u64.pow(10) * 20);
-		assert_eq!(Balances::free_balance(&20), u64::max_value() - 2_u64.pow(10) * 20);
+		assert_eq!(Balances::free_balance(&10), u64::max_value() - 2_u64.pow(MAX_UNSTAKE_THRESHOLD) * 20);
+		assert_eq!(Balances::free_balance(&20), u64::max_value() - 2_u64.pow(MAX_UNSTAKE_THRESHOLD) * 20);
 	});
 }
 
@@ -677,7 +677,32 @@ fn consolidate_unlocked_works() {
 
 #[test]
 fn bond_extra_works() {
-	// TODO: Learn what it is and test it
+	// Tests that extra `free_balance` in the stash can be added to stake
+	with_externalities(&mut ExtBuilder::default().build(),
+	|| {
+		// Check that account 10 is a validator
+		assert!(<Validators<Test>>::exists(10));
+		// Check that account 10 is bonded to account 11
+		assert_eq!(Staking::bonded(&11), Some(10));
+		// Check how much is at stake
+		assert_eq!(Staking::ledger(&10), Some(StakingLedger { stash: 11, total: 1000, active: 1000, unlocking: vec![] }));
+
+		// Give account 11 some large free balance greater than total
+		Balances::set_free_balance(&11, 1000000);
+		// Check the balance of the stash account
+		assert_eq!(Balances::free_balance(&11), 1000000);
+
+		// Call the bond_extra function from controller, add only 100
+		assert_ok!(Staking::bond_extra(Origin::signed(10), 100));
+		// There should be 100 more `total` and `active` in the ledger
+		assert_eq!(Staking::ledger(&10), Some(StakingLedger { stash: 11, total: 1000 + 100, active: 1000 + 100, unlocking: vec![] }));
+
+		// Call the bond_extra function with a large number, should handle it
+		assert_ok!(Staking::bond_extra(Origin::signed(10), u64::max_value()));
+		// The full amount of the funds should now be in the total and active
+		assert_eq!(Staking::ledger(&10), Some(StakingLedger { stash: 11, total: 1000000, active: 1000000, unlocking: vec![] }));
+
+	});
 }
 
 #[test]
@@ -702,7 +727,113 @@ fn slot_stake_does_something() {
 }
 
 #[test]
-fn on_free_balance_zero_removes_user_from_storage() {
-	// TODO: When free balance < existential deposit, user is removed
-	// All storage items about that user are cleaned up
+fn on_free_balance_zero_stash_removes_validator() {
+	// Tests that validator storage items are cleaned up when stash is empty
+	// Tests that storage items are untouched when controller is empty
+	with_externalities(&mut ExtBuilder::default()
+		.existential_deposit(10)
+		.build(),
+	|| {
+		// Check that account 10 is a validator
+		assert!(<Validators<Test>>::exists(10));
+		// Check the balance of the validator account
+		assert_eq!(Balances::free_balance(&10), 256); 
+		// Check the balance of the stash account
+		assert_eq!(Balances::free_balance(&11), 2560); 
+		// Check these two accounts are bonded
+		assert_eq!(Staking::bonded(&11), Some(10));
+
+		// Set some storage items which we expect to be cleaned up
+		// Initiate slash count storage item
+		Staking::on_offline_validator(10, 1);
+		// Set payee information
+		assert_ok!(Staking::set_payee(Origin::signed(10), RewardDestination::Stash));
+
+		// Check storage items that should be cleaned up
+		assert!(<Ledger<Test>>::exists(&10));
+		assert!(<Validators<Test>>::exists(&10));
+		assert!(<SlashCount<Test>>::exists(&10));
+		assert!(<Payee<Test>>::exists(&10));
+
+		// Reduce free_balance of controller to 0
+		Balances::set_free_balance(&10, 0);
+		// Check total balance of account 10
+		assert_eq!(Balances::total_balance(&10), 0); 
+
+		// Check the balance of the stash account has not been touched
+		assert_eq!(Balances::free_balance(&11), 2560); 
+		// Check these two accounts are still bonded
+		assert_eq!(Staking::bonded(&11), Some(10));
+
+		// Check storage items have not changed
+		assert!(<Ledger<Test>>::exists(&10));
+		assert!(<Validators<Test>>::exists(&10));
+		assert!(<SlashCount<Test>>::exists(&10));
+		assert!(<Payee<Test>>::exists(&10));
+
+		// Reduce free_balance of stash to 0
+		Balances::set_free_balance(&11, 0);
+		// Check total balance of stash
+		assert_eq!(Balances::total_balance(&11), 0); 
+
+		// Check storage items do not exist
+		assert!(!<Ledger<Test>>::exists(&10));
+		assert!(!<Validators<Test>>::exists(&10));
+		assert!(!<Nominators<Test>>::exists(&10));
+		assert!(!<SlashCount<Test>>::exists(&10));
+		assert!(!<Payee<Test>>::exists(&10));
+		assert!(!<Bonded<Test>>::exists(&11));
+	});
+}
+
+#[test]
+fn on_free_balance_zero_stash_removes_nominator() {
+	// Tests that nominator storage items are cleaned up when stash is empty
+	// Tests that storage items are untouched when controller is empty
+	with_externalities(&mut ExtBuilder::default()
+		.existential_deposit(10)
+		.build(),
+	|| {
+		// Make 10 a nominator
+		assert_ok!(Staking::nominate(Origin::signed(10), vec![20]));
+		// Check that account 10 is a nominator
+		assert!(<Nominators<Test>>::exists(10));
+		// Check the balance of the nominator account
+		assert_eq!(Balances::free_balance(&10), 256); 
+		// Check the balance of the stash account
+		assert_eq!(Balances::free_balance(&11), 2560); 
+		// Check these two accounts are bonded
+		assert_eq!(Staking::bonded(&11), Some(10));
+
+		// Check storage items that should be cleaned up
+		assert!(<Ledger<Test>>::exists(&10));
+		assert!(<Nominators<Test>>::exists(&10));
+
+		// Reduce free_balance of controller to 0
+		Balances::set_free_balance(&10, 0);
+		// Check total balance of account 10
+		assert_eq!(Balances::total_balance(&10), 0); 
+
+		// Check the balance of the stash account has not been touched
+		assert_eq!(Balances::free_balance(&11), 2560); 
+		// Check these two accounts are still bonded
+		assert_eq!(Staking::bonded(&11), Some(10));
+
+		// Check storage items have not changed
+		assert!(<Ledger<Test>>::exists(&10));
+		assert!(<Nominators<Test>>::exists(&10));
+
+		// Reduce free_balance of stash to 0
+		Balances::set_free_balance(&11, 0);
+		// Check total balance of stash
+		assert_eq!(Balances::total_balance(&11), 0); 
+
+		// Check storage items do not exist
+		assert!(!<Ledger<Test>>::exists(&10));
+		assert!(!<Validators<Test>>::exists(&10));
+		assert!(!<Nominators<Test>>::exists(&10));
+		assert!(!<SlashCount<Test>>::exists(&10));
+		assert!(!<Payee<Test>>::exists(&10));
+		assert!(!<Bonded<Test>>::exists(&11));
+	});
 }