fix tests

galacticcouncil · Jul 21, 2023 · 88291ab · 88291ab
1 parent 1ae60c4
commit 88291ab
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 17 deletions.
diff --git a/pallets/bonds/src/tests/issue.rs b/pallets/bonds/src/tests/issue.rs
@@ -74,7 +74,7 @@ fn issue_bonds_should_work_when_fee_is_zero() {
 
 		assert_eq!(Tokens::free_balance(HDX, &<Test as Config>::FeeReceiver::get()), 0);
 
-		assert_eq!(Tokens::free_balance(HDX, &Bonds::account_id()), amount);
+		assert_eq!(Tokens::free_balance(HDX, &Bonds::pallet_account_id()), amount);
 	});
 }
 
@@ -137,7 +137,10 @@ fn issue_bonds_should_work_when_fee_is_non_zero() {
 
 			assert_eq!(Tokens::free_balance(HDX, &<Test as Config>::FeeReceiver::get()), fee);
 
-			assert_eq!(Tokens::free_balance(HDX, &Bonds::account_id()), amount_without_fee);
+			assert_eq!(
+				Tokens::free_balance(HDX, &Bonds::pallet_account_id()),
+				amount_without_fee
+			);
 		});
 }
 
@@ -290,10 +293,13 @@ fn issue_bonds_should_work_when_issuing_multiple_bonds() {
 			assert_eq!(Tokens::free_balance(DAI, &<Test as Config>::FeeReceiver::get()), fee);
 
 			assert_eq!(
-				Tokens::free_balance(HDX, &Bonds::account_id()),
+				Tokens::free_balance(HDX, &Bonds::pallet_account_id()),
 				amount_without_fee.checked_mul(2).unwrap()
 			);
-			assert_eq!(Tokens::free_balance(DAI, &Bonds::account_id()), amount_without_fee);
+			assert_eq!(
+				Tokens::free_balance(DAI, &Bonds::pallet_account_id()),
+				amount_without_fee
+			);
 		});
 }
 

diff --git a/pallets/bonds/src/tests/mock.rs b/pallets/bonds/src/tests/mock.rs
@@ -18,18 +18,21 @@
 use crate as pallet_bonds;
 use crate::*;
 
-use frame_support::traits::{ConstU128, Everything, GenesisBuild};
-use frame_support::{construct_runtime, parameter_types, traits::ConstU32};
+use frame_support::{
+	construct_runtime, parameter_types,
+	sp_runtime::{
+		testing::Header,
+		traits::{BlakeTwo256, IdentityLookup},
+	},
+	traits::{ConstU128, ConstU32, Everything, GenesisBuild},
+};
 use frame_system::{EnsureRoot, EnsureSigned};
-use hydradx_traits::{BondRegistry, Registry};
-use orml_traits::parameter_type_with_key;
 use sp_core::H256;
-use sp_runtime::{
-	testing::Header,
-	traits::{BlakeTwo256, IdentityLookup},
-};
 use std::{cell::RefCell, collections::HashMap};
 
+use hydradx_traits::{BondRegistry, Registry};
+use orml_traits::parameter_type_with_key;
+
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 pub type AssetDetailsT = AssetDetails<AssetId, Balance, BoundedVec<u8, ConstU32<32>>>;

diff --git a/pallets/bonds/src/tests/redeem.rs b/pallets/bonds/src/tests/redeem.rs
@@ -62,7 +62,10 @@ fn partially_redeem_bonds_should_work_when_with_zero_fee() {
 
 		assert_eq!(Tokens::free_balance(HDX, &<Test as Config>::FeeReceiver::get()), 0);
 
-		assert_eq!(Tokens::free_balance(HDX, &Bonds::account_id()), amount - redeem_amount);
+		assert_eq!(
+			Tokens::free_balance(HDX, &Bonds::pallet_account_id()),
+			amount - redeem_amount
+		);
 	});
 }
 
@@ -117,7 +120,7 @@ fn partially_redeem_bonds_should_work_when_with_non_zero_fee() {
 			assert_eq!(Tokens::free_balance(HDX, &<Test as Config>::FeeReceiver::get()), fee);
 
 			assert_eq!(
-				Tokens::free_balance(HDX, &Bonds::account_id()),
+				Tokens::free_balance(HDX, &Bonds::pallet_account_id()),
 				amount_without_fee - redeem_amount
 			);
 		});
@@ -154,7 +157,7 @@ fn fully_redeem_bonds_should_work_when_with_zero_fee() {
 
 		assert_eq!(Tokens::free_balance(HDX, &<Test as Config>::FeeReceiver::get()), 0);
 
-		assert_eq!(Tokens::free_balance(HDX, &Bonds::account_id()), 0);
+		assert_eq!(Tokens::free_balance(HDX, &Bonds::pallet_account_id()), 0);
 	});
 }
 
@@ -194,7 +197,7 @@ fn fully_redeem_bonds_should_work_when_with_non_zero_fee() {
 
 			assert_eq!(Tokens::free_balance(HDX, &<Test as Config>::FeeReceiver::get()), fee);
 
-			assert_eq!(Tokens::free_balance(HDX, &Bonds::account_id()), 0);
+			assert_eq!(Tokens::free_balance(HDX, &Bonds::pallet_account_id()), 0);
 		});
 }
 
@@ -235,7 +238,7 @@ fn redeem_bonds_should_work_when_redeemed_from_non_issuer_account() {
 		assert_eq!(Tokens::free_balance(HDX, &<Test as Config>::FeeReceiver::get()), 0);
 
 		assert_eq!(
-			Tokens::free_balance(HDX, &Bonds::account_id()),
+			Tokens::free_balance(HDX, &Bonds::pallet_account_id()),
 			amount.checked_sub(redeem_amount).unwrap()
 		);
 	});