Merge pull request #701 from galacticcouncil/refactor/registry-traits

refactor: registry traits consolidation
galacticcouncil · Nov 22, 2023 · f88cc0b · f88cc0b
2 parents 5a03cf0 + bf2e99c
commit f88cc0b
Show file tree

Hide file tree

Showing 48 changed files with 1,435 additions and 403 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/integration-tests/src/bonds.rs b/integration-tests/src/bonds.rs
@@ -6,7 +6,7 @@ use crate::polkadot_test_net::*;
 use frame_support::storage::with_transaction;
 use frame_support::{assert_noop, assert_ok};
 use frame_system::RawOrigin;
-use hydradx_traits::CreateRegistry;
+use hydradx_traits::registry::{AssetKind, Create};
 use orml_traits::MultiCurrency;
 use sp_runtime::{DispatchResult, TransactionOutcome};
 use xcm_emulator::TestExt;
@@ -65,10 +65,15 @@ fn issue_bonds_should_work_when_issued_for_share_asset() {
 			let maturity = NOW + MONTH;
 
 			let name = b"SHARED".to_vec();
-			let share_asset_id = AssetRegistry::create_asset(
-				&name,
-				pallet_asset_registry::AssetType::PoolShare(HDX, DOT).into(),
-				1_000,
+			let share_asset_id = AssetRegistry::register_insufficient_asset(
+				None,
+				Some(&name),
+				AssetKind::XYK,
+				Some(1_000),
+				None,
+				None,
+				None,
+				None,
 			)
 			.unwrap();
 			assert_ok!(Currencies::deposit(share_asset_id, &ALICE.into(), amount,));
@@ -119,9 +124,18 @@ fn issue_bonds_should_not_work_when_issued_for_bond_asset() {
 			let maturity = NOW + MONTH;
 
 			let name = b"BOND".to_vec();
-			let underlying_asset_id =
-				AssetRegistry::create_asset(&name, pallet_asset_registry::AssetType::<AssetId>::Bond.into(), 1_000)
-					.unwrap();
+			let underlying_asset_id = AssetRegistry::register_insufficient_asset(
+				None,
+				Some(&name),
+				AssetKind::Bond,
+				Some(1_000),
+				None,
+				None,
+				None,
+				None,
+			)
+			.unwrap();
+
 			assert_ok!(Currencies::deposit(underlying_asset_id, &ALICE.into(), amount,));
 
 			// Act & Assert

diff --git a/integration-tests/src/dca.rs b/integration-tests/src/dca.rs
@@ -11,11 +11,8 @@ use hydradx_runtime::{
 	AssetRegistry, Balances, Currencies, Omnipool, Router, Runtime, RuntimeEvent, RuntimeOrigin, Stableswap, Tokens,
 	Treasury, DCA,
 };
+use hydradx_traits::registry::{AssetKind, Create};
 use hydradx_traits::router::{PoolType, Trade};
-use hydradx_traits::{
-	registry::{AssetKind, Create},
-	Registry,
-};
 use orml_traits::MultiCurrency;
 use orml_traits::MultiReservableCurrency;
 use pallet_dca::types::{Order, Schedule};
@@ -2314,7 +2311,7 @@ pub fn init_stableswap() -> Result<(AssetId, AssetId, AssetId), DispatchError> {
 			None,
 			Some(name.as_ref()),
 			AssetKind::Token,
-			Some(1u128),
+			1u128,
 			Some(b"xDUM".as_ref()),
 			Some(18u8),
 			None,
@@ -2335,7 +2332,7 @@ pub fn init_stableswap() -> Result<(AssetId, AssetId, AssetId), DispatchError> {
 		None,
 		Some(b"pool".as_ref()),
 		AssetKind::Token,
-		Some(1u128),
+		1u128,
 		None,
 		None,
 		None,
@@ -2372,7 +2369,7 @@ pub fn init_stableswap_with_three_assets_having_different_decimals(
 			None,
 			Some(name.as_ref()),
 			AssetKind::Token,
-			Some(1u128),
+			1u128,
 			Some(b"xDUM".as_ref()),
 			Some(decimals_for_each_asset[idx as usize]),
 			None,
@@ -2395,7 +2392,16 @@ pub fn init_stableswap_with_three_assets_having_different_decimals(
 		initial.push(AssetAmount::new(asset_id, initial_liquidity));
 		added_liquidity.push(AssetAmount::new(asset_id, liquidity_added));
 	}
-	let pool_id = AssetRegistry::create_asset(&b"pool".to_vec(), 1u128)?;
+	let pool_id = AssetRegistry::register_insufficient_asset(
+		None,
+		Some(&b"pool".to_vec()),
+		AssetKind::Token,
+		Some(1u128),
+		None,
+		None,
+		None,
+		None,
+	)?;
 
 	let amplification = 100u16;
 	let fee = Permill::from_percent(1);

diff --git a/integration-tests/src/router.rs b/integration-tests/src/router.rs
@@ -2314,7 +2314,7 @@ pub fn init_stableswap() -> Result<(AssetId, AssetId, AssetId), DispatchError> {
 			None,
 			Some(name.as_ref()),
 			AssetKind::Token,
-			Some(1u128),
+			1u128,
 			Some(b"xDUM".as_ref()),
 			Some(18u8),
 			None,
@@ -2342,7 +2342,7 @@ pub fn init_stableswap() -> Result<(AssetId, AssetId, AssetId), DispatchError> {
 		None,
 		Some(b"pool".as_ref()),
 		AssetKind::Token,
-		Some(1u128),
+		1u128,
 		None,
 		None,
 		None,

diff --git a/pallets/asset-registry/src/benchmarking.rs b/pallets/asset-registry/src/benchmarking.rs
@@ -64,7 +64,7 @@ benchmarks! {
 		let _ = Pallet::<T>::register(RawOrigin::Root.into(), Some(asset_id), Some(name), AssetType::Token, Some(ed), Some(symbol), Some(decimals), Some(location), Some(xcm_rate_limit), is_sufficient);
 
 		let new_name= vec![98u8; T::StringLimit::get() as usize];
-		let new_type = AssetType::PoolShare(T::AssetId::from(10u8),T::AssetId::from(20u8));
+		let new_type = AssetType::XYK;
 		let new_ed = 1_000_000_u128;
 		let new_xcm_rate_limit = 1_000_u128;
 		let new_is_sufficient = false;