add unhappy tests

teerdays/src/lib.rs

@@ -143,7 +143,7 @@ pub mod pallet {
 			Self::deposit_event(Event::<T>::Bonded { account: signer.clone(), amount: value });
 			T::Currency::set_lock(TEERDAYS_ID, &signer, value, WithdrawReasons::all());
 			let teerday_bond = TeerDayBondOf::<T> {
-				value: value,
+				value,
 				last_updated: pallet_timestamp::Pallet::<T>::get(),
 				accumulated_tokentime: BalanceOf::<T>::zero(),
 			};
@@ -160,9 +160,9 @@ pub mod pallet {
 			let signer = ensure_signed(origin)?;
 			ensure!(value >= T::Currency::minimum_balance(), Error::<T>::InsufficientBond);
 			let bond = Self::do_update_teerdays(&signer)?;
-
 			let free_balance = T::Currency::free_balance(&signer);
-			let value = value.min(free_balance);
+			// free includes the already bonded amount, so we need to subtract it
+			let value = value.min(free_balance.saturating_sub(bond.value));
 			let new_bond_value = bond.value.saturating_add(value);
 			Self::deposit_event(Event::<T>::Bonded { account: signer.clone(), amount: value });
 			T::Currency::set_lock(TEERDAYS_ID, &signer, new_bond_value, WithdrawReasons::all());

teerdays/src/tests.rs

@@ -1,7 +1,7 @@
-use crate::{mock::*, BalanceOf, Error, Event as TeerDaysEvent};
+use crate::{mock::*, pallet, BalanceOf, Error, Event as TeerDaysEvent};
 use frame_support::{
 	assert_noop, assert_ok,
-	traits::{OnFinalize, OnInitialize},
+	traits::{Currency, OnFinalize, OnInitialize},
 };
 use sp_keyring::AccountKeyring;
 
@@ -11,6 +11,7 @@ pub fn run_to_block(n: u32) {
 			System::on_finalize(System::block_number());
 		}
 		Timestamp::on_finalize(System::block_number());
+		System::reset_events();
 		System::set_block_number(System::block_number() + 1);
 		System::on_initialize(System::block_number());
 	}
@@ -45,6 +46,35 @@ fn bond_works() {
 	})
 }
 
+#[test]
+fn bond_saturates_at_free() {
+	new_test_ext().execute_with(|| {
+		let now: Moment = 42;
+		set_timestamp(now);
+		let alice = AccountKeyring::Alice.to_account_id();
+		let alice_free: BalanceOf<Test> = 5_000_000_000_000;
+		<Test as pallet::Config>::Currency::make_free_balance_be(&alice, alice_free);
+		let amount: BalanceOf<Test> = 10_000_000_000_000;
+		assert_ok!(TeerDays::bond(RuntimeOrigin::signed(alice.clone()), amount));
+
+		let expected_event = RuntimeEvent::TeerDays(TeerDaysEvent::Bonded {
+			account: alice.clone(),
+			amount: alice_free,
+		});
+		assert!(System::events().iter().any(|a| a.event == expected_event));
+
+		let teerdays = TeerDays::teerday_bonds(&alice)
+			.expect("TeerDays entry for bonded account should exist");
+		assert_eq!(teerdays.value, alice_free);
+		assert_eq!(teerdays.accumulated_tokentime, 0);
+		assert_eq!(teerdays.last_updated, now);
+
+		let account_info = System::account(&alice);
+		assert_eq!(account_info.consumers, 1);
+		assert_eq!(account_info.data.frozen, alice_free);
+	})
+}
+
 #[test]
 fn bond_extra_works() {
 	new_test_ext().execute_with(|| {
@@ -80,6 +110,53 @@ fn bond_extra_works() {
 	})
 }
 
+#[test]
+fn bond_extra_saturates_at_free_margin() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1);
+		let now: Moment = 42;
+		set_timestamp(now);
+
+		let alice = AccountKeyring::Alice.to_account_id();
+		let alice_free: BalanceOf<Test> = 11_000_000_000_000;
+		<Test as pallet::Config>::Currency::make_free_balance_be(&alice, alice_free);
+		let amount: BalanceOf<Test> = 10_000_000_000_000;
+		assert_ok!(TeerDays::bond(RuntimeOrigin::signed(alice.clone()), amount));
+
+		let teerdays = TeerDays::teerday_bonds(&alice)
+			.expect("TeerDays entry for bonded account should exist");
+		assert_eq!(teerdays.value, amount);
+		assert_eq!(teerdays.accumulated_tokentime, 0);
+		assert_eq!(teerdays.last_updated, now);
+
+		let account_info = System::account(&alice);
+		assert_eq!(account_info.consumers, 1);
+		assert_eq!(account_info.data.frozen, amount);
+
+		run_to_block(2);
+		let now = now + 10_000;
+		set_timestamp(now);
+
+		let extra_amount = amount / 2;
+		assert_ok!(TeerDays::bond_extra(RuntimeOrigin::signed(alice.clone()), extra_amount));
+
+		let expected_event = RuntimeEvent::TeerDays(TeerDaysEvent::Bonded {
+			account: alice.clone(),
+			amount: 1_000_000_000_000,
+		});
+		assert_eq!(System::events().get(1).unwrap().event, expected_event);
+
+		let teerdays = TeerDays::teerday_bonds(&alice)
+			.expect("TeerDays entry for bonded account should exist");
+		assert_eq!(teerdays.value, amount + 1_000_000_000_000);
+		assert_eq!(teerdays.accumulated_tokentime, amount * 10_000);
+		assert_eq!(teerdays.last_updated, now);
+
+		let account_info = System::account(&alice);
+		assert_eq!(account_info.data.frozen, amount + 1_000_000_000_000);
+	})
+}
+
 #[test]
 fn unbonding_and_delayed_withdraw_works() {
 	new_test_ext().execute_with(|| {
@@ -157,6 +234,32 @@ fn unbonding_and_delayed_withdraw_works() {
 	})
 }
 
+#[test]
+fn unbonding_saturates_at_bonded() {
+	new_test_ext().execute_with(|| {
+		run_to_block(1);
+		let now: Moment = 42;
+		set_timestamp(now);
+		let alice = AccountKeyring::Alice.to_account_id();
+
+		let account_info = System::account(&alice);
+		assert_eq!(account_info.consumers, 0);
+		assert_eq!(account_info.data.frozen, 0);
+
+		let amount: BalanceOf<Test> = 10_000_000_000_000;
+		assert_ok!(TeerDays::bond(RuntimeOrigin::signed(alice.clone()), amount));
+
+		let unbond_amount = amount * 2;
+		assert_ok!(TeerDays::unbond(RuntimeOrigin::signed(alice.clone()), unbond_amount));
+
+		let expected_event =
+			RuntimeEvent::TeerDays(TeerDaysEvent::Unbonded { account: alice.clone(), amount });
+		assert!(System::events().iter().any(|a| a.event == expected_event));
+		assert!(TeerDays::teerday_bonds(&alice).is_none());
+		assert_eq!(TeerDays::pending_unlock(&alice).unwrap().1, amount);
+	})
+}
+
 #[test]
 fn update_other_works() {
 	new_test_ext().execute_with(|| {