Fix token types (#187)

* fix token types * fix * ♻️ ($PALLET) Finish salp * remove assets from Cargo.toml Co-authored-by: Allen Pocket <AllenPocketGamer@Gmail.com>
bifrost-io · Jul 19, 2021 · 09a4fba · 09a4fba
1 parent 46d3234
commit 09a4fba
Show file tree

Hide file tree

Showing 14 changed files with 128 additions and 129 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -5,7 +5,6 @@ members = [
 	"node/primitives",
 	"node/rpc",
 	"node/service",
-	"pallets/assets",
 	"pallets/bancor",
 	"pallets/bid",
 	"pallets/flexible-fee",
@@ -182,6 +181,7 @@ sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-
 sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8" }
 substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8" }
 substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8" }
+substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8" }
 substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8" }
 
 zenlink-protocol = { git = "ssh://git@github.com/bifrost-finance/Zenlink-DEX-Module", branch = "polkadot-v0.9.8" }

diff --git a/pallets/bancor/src/lib.rs b/pallets/bancor/src/lib.rs
@@ -37,8 +37,7 @@ pub mod weights;
 pub use pallet::*;
 
 type AccountIdOf<T> = <T as frame_system::Config>::AccountId;
-type BalanceOf<T> =
-	<<T as Config>::MultiCurrenciesHandler as MultiCurrency<AccountIdOf<T>>>::Balance;
+type BalanceOf<T> = <<T as Config>::MultiCurrency as MultiCurrency<AccountIdOf<T>>>::Balance;
 
 const BILLION: u128 = 1_000_000_000;
 
@@ -59,7 +58,7 @@ pub mod pallet {
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
 		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
-		type MultiCurrenciesHandler: MultiCurrency<AccountIdOf<Self>, CurrencyId = CurrencyId>;
+		type MultiCurrency: MultiCurrency<AccountIdOf<Self>, CurrencyId = CurrencyId>;
 
 		#[pallet::constant]
 		type InterventionPercentage: Get<Percent>;
@@ -164,7 +163,7 @@ pub mod pallet {
 			let vstoken_id = currency_id.to_vstoken().map_err(|_| Error::<T>::ConversionError)?;
 
 			// Get exchanger's vstoken balance
-			let vstoken_balance = T::MultiCurrenciesHandler::free_balance(vstoken_id, &exchanger);
+			let vstoken_balance = T::MultiCurrency::free_balance(vstoken_id, &exchanger);
 			ensure!(vstoken_balance >= vstoken_amount, Error::<T>::NotEnoughBalance);
 
 			// make changes in the bancor pool
@@ -175,8 +174,8 @@ pub mod pallet {
 			Self::revise_bancor_pool_vstoken_buy_token(currency_id, token_amount, vstoken_amount)?;
 
 			// make changes in account balance
-			T::MultiCurrenciesHandler::withdraw(vstoken_id, &exchanger, vstoken_amount)?;
-			T::MultiCurrenciesHandler::deposit(currency_id, &exchanger, token_amount)?;
+			T::MultiCurrency::withdraw(vstoken_id, &exchanger, vstoken_amount)?;
+			T::MultiCurrency::deposit(currency_id, &exchanger, token_amount)?;
 
 			Self::deposit_event(Event::TokenSold(
 				exchanger,
@@ -202,7 +201,7 @@ pub mod pallet {
 			let vstoken_id = currency_id.to_vstoken().map_err(|_| Error::<T>::ConversionError)?;
 
 			// Get exchanger's token balance
-			let token_balance = T::MultiCurrenciesHandler::free_balance(currency_id, &exchanger);
+			let token_balance = T::MultiCurrency::free_balance(currency_id, &exchanger);
 			ensure!(token_balance >= token_amount, Error::<T>::NotEnoughBalance);
 
 			// make changes in the bancor pool
@@ -213,8 +212,8 @@ pub mod pallet {
 			Self::revise_bancor_pool_token_buy_vstoken(currency_id, token_amount, vstoken_amount)?;
 
 			// make changes in account balance
-			T::MultiCurrenciesHandler::withdraw(currency_id, &exchanger, token_amount)?;
-			T::MultiCurrenciesHandler::deposit(vstoken_id, &exchanger, vstoken_amount)?;
+			T::MultiCurrency::withdraw(currency_id, &exchanger, token_amount)?;
+			T::MultiCurrency::deposit(vstoken_id, &exchanger, vstoken_amount)?;
 
 			Self::deposit_event(Event::VSTokenSold(
 				exchanger,

diff --git a/pallets/bancor/src/mock.rs b/pallets/bancor/src/mock.rs
@@ -49,7 +49,7 @@ construct_runtime!(
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
-		Assets: orml_tokens::{Pallet, Call, Config<T>, Storage, Event<T>},
+		Tokens: orml_tokens::{Pallet, Call, Config<T>, Storage, Event<T>},
 		Bancor: bancor::{Pallet, Call, Config<T>, Storage, Event<T>},
 	}
 );
@@ -114,7 +114,7 @@ parameter_types! {
 impl bancor::Config for Test {
 	type Event = Event;
 	type InterventionPercentage = InterventionPercentage;
-	type MultiCurrenciesHandler = Assets;
+	type MultiCurrency = Tokens;
 	type WeightInfo = ();
 }
 

diff --git a/pallets/bancor/src/tests.rs b/pallets/bancor/src/tests.rs
@@ -93,8 +93,8 @@ fn exchange_for_token_should_work() {
 		);
 
 		// check ALICE's account balances. ALICE should have 1000-50 VSDOT, and 1000+49 DOT.
-		assert_eq!(Assets::free_balance(DOT, &ALICE), 1049);
-		assert_eq!(Assets::free_balance(VSDOT, &ALICE), 950);
+		assert_eq!(Tokens::free_balance(DOT, &ALICE), 1049);
+		assert_eq!(Tokens::free_balance(VSDOT, &ALICE), 950);
 	});
 }
 
@@ -181,8 +181,8 @@ fn exchange_for_vstoken_should_work() {
 		);
 
 		// check ALICE's account balances. ALICE should have 1000-49 DOT, and 1000+49 VSDOT.
-		assert_eq!(Assets::free_balance(DOT, &ALICE), 951);
-		assert_eq!(Assets::free_balance(VSDOT, &ALICE), 1049);
+		assert_eq!(Tokens::free_balance(DOT, &ALICE), 951);
+		assert_eq!(Tokens::free_balance(VSDOT, &ALICE), 1049);
 	});
 }
 

diff --git a/pallets/flexible-fee/src/mock.rs b/pallets/flexible-fee/src/mock.rs
@@ -58,7 +58,7 @@ frame_support::construct_runtime!(
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
 		System: system::{Pallet, Call, Storage, Event<T>},
-		Assets: orml_tokens::{Pallet, Storage, Event<T>},
+		Tokens: orml_tokens::{Pallet, Storage, Event<T>},
 		Balances: balances::{Pallet, Call, Storage, Event<T>},
 		// TransactionPayment: pallet_transaction_payment::{Module, Storage},
 		FlexibleFee: flexible_fee::{Pallet, Call, Storage,Event<T>},
@@ -189,7 +189,7 @@ pub type AdaptedBasicCurrency =
 impl orml_currencies::Config for Test {
 	type Event = Event;
 	type GetNativeCurrencyId = GetNativeCurrencyId;
-	type MultiCurrency = Assets;
+	type MultiCurrency = Tokens;
 	type NativeCurrency = AdaptedBasicCurrency;
 	type WeightInfo = ();
 }