asset-registry: removed NativeAssetId from config + make clippy happy

galacticcouncil · Oct 23, 2023 · 776f9cd · 776f9cd
1 parent def81db
commit 776f9cd
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 20 deletions.
diff --git a/pallets/asset-registry/src/benchmarking.rs b/pallets/asset-registry/src/benchmarking.rs
@@ -92,7 +92,7 @@ benchmarks! {
 
 	register_external {
 		let caller: T::AccountId = account("caller", 0, 1);
-		T::Currency::update_balance(T::NativeAssetId::get(), &caller, (100_000 * UNIT) as i128)?;
+		T::Currency::update_balance(T::StorageFeesAssetId::get(), &caller, (100_000 * UNIT) as i128)?;
 
 		let expected_asset_id = Pallet::<T>::next_asset_id().unwrap();
 		let location: T::AssetNativeLocation = Default::default();

diff --git a/pallets/asset-registry/src/lib.rs b/pallets/asset-registry/src/lib.rs
@@ -93,9 +93,9 @@ pub mod pallet {
 		#[pallet::constant]
 		type SequentialIdStartAt: Get<Self::AssetId>;
 
-		/// Native Asset Id
+		/// Id of the asset that is used to pay storage fees.
 		#[pallet::constant]
-		type NativeAssetId: Get<Self::AssetId>;
+		type StorageFeesAssetId: Get<Self::AssetId>;
 
 		/// Storage fees for external asset creation.
 		#[pallet::constant]
@@ -237,9 +237,10 @@ pub mod pallet {
 				let native_symbol = Pallet::<T>::try_into_bounded(Some(self.native_symbol.to_vec()))
 					.expect("Invalid native asset symbol!");
 
+				let native_asset_id = T::AssetId::from(0);
 				AssetIds::<T>::insert(
 					native_asset_name.as_ref().expect("Invalid native asset name!"),
-					T::NativeAssetId::get(),
+					native_asset_id,
 				);
 				let details = AssetDetails {
 					name: native_asset_name,
@@ -251,7 +252,7 @@ pub mod pallet {
 					is_sufficient: true,
 				};
 
-				Assets::<T>::insert(T::NativeAssetId::get(), details);
+				Assets::<T>::insert(native_asset_id, details);
 
 				self.registered_assets.iter().for_each(
 					|(id, name, ed, symbol, decimals, xcm_rate_limit, is_sufficient)| {
@@ -470,12 +471,12 @@ pub mod pallet {
 
 			if !T::StorageFees::get().is_zero() {
 				ensure!(
-					T::Currency::ensure_can_withdraw(T::NativeAssetId::get(), &who, T::StorageFees::get()).is_ok(),
+					T::Currency::ensure_can_withdraw(T::StorageFeesAssetId::get(), &who, T::StorageFees::get()).is_ok(),
 					Error::<T>::InsufficientBalance
 				);
 
 				T::Currency::transfer(
-					T::NativeAssetId::get(),
+					T::StorageFeesAssetId::get(),
 					&who,
 					&T::StorageFeesBeneficiary::get(),
 					T::StorageFees::get(),

diff --git a/pallets/asset-registry/src/tests/mock.rs b/pallets/asset-registry/src/tests/mock.rs
@@ -111,7 +111,7 @@ impl pallet_asset_registry::Config for Test {
 	type AssetNativeLocation = AssetLocation;
 	type StringLimit = RegistryStringLimit;
 	type SequentialIdStartAt = SequentialIdStart;
-	type NativeAssetId = NativeAssetId;
+	type StorageFeesAssetId = NativeAssetId;
 	type StorageFees = StoreFees;
 	type StorageFeesBeneficiary = FeesBeneficiarry;
 	type WeightInfo = ();

diff --git a/pallets/asset-registry/src/tests/register.rs b/pallets/asset-registry/src/tests/register.rs
@@ -521,12 +521,12 @@ fn register_should_fail_when_name_is_too_long() {
 			Registry::register(
 				RuntimeOrigin::root(),
 				Some(asset_id),
-				Some(name.clone()),
+				Some(name),
 				AssetType::Token,
 				Some(ed),
-				Some(symbol.clone()),
+				Some(symbol),
 				Some(decimals),
-				Some(asset_location.clone()),
+				Some(asset_location),
 				Some(xcm_rate_limit),
 				is_sufficient
 			),
@@ -554,12 +554,12 @@ fn register_should_fail_when_symbol_is_too_long() {
 			Registry::register(
 				RuntimeOrigin::root(),
 				Some(asset_id),
-				Some(name.clone()),
+				Some(name),
 				AssetType::Token,
 				Some(ed),
-				Some(symbol.clone()),
+				Some(symbol),
 				Some(decimals),
-				Some(asset_location.clone()),
+				Some(asset_location),
 				Some(xcm_rate_limit),
 				is_sufficient
 			),

diff --git a/pallets/asset-registry/src/tests/update.rs b/pallets/asset-registry/src/tests/update.rs
@@ -642,12 +642,12 @@ fn update_should_fail_when_name_is_too_long() {
 				Registry::update(
 					RuntimeOrigin::root(),
 					asset_id,
-					Some(name.clone()),
+					Some(name),
 					Some(AssetType::External),
 					Some(ed),
 					Some(xcm_rate_limit),
 					Some(is_sufficient),
-					Some(symbol.clone()),
+					Some(symbol),
 					Some(decimals),
 					None
 				),
@@ -679,12 +679,12 @@ fn update_should_fail_when_symbolis_too_long() {
 				Registry::update(
 					RuntimeOrigin::root(),
 					asset_id,
-					Some(name.clone()),
+					Some(name),
 					Some(AssetType::External),
 					Some(ed),
 					Some(xcm_rate_limit),
 					Some(is_sufficient),
-					Some(symbol.clone()),
+					Some(symbol),
 					Some(decimals),
 					None
 				),

diff --git a/pallets/xyk/src/tests/mock.rs b/pallets/xyk/src/tests/mock.rs
@@ -115,7 +115,7 @@ impl pallet_asset_registry::Config for Test {
 	type AssetNativeLocation = u8;
 	type StringLimit = RegistryStringLimit;
 	type SequentialIdStartAt = SequentialIdOffset;
-	type NativeAssetId = NativeAssetId;
+	type StorageFeesAssetId = NativeAssetId;
 	type StorageFees = StoreFees;
 	type StorageFeesBeneficiary = FeesBeneficiarry;
 	type WeightInfo = ();

diff --git a/runtime/hydradx/src/assets.rs b/runtime/hydradx/src/assets.rs
@@ -349,7 +349,7 @@ impl pallet_asset_registry::Config for Runtime {
 	type AssetNativeLocation = AssetLocation;
 	type StringLimit = RegistryStrLimit;
 	type SequentialIdStartAt = SequentialIdOffset;
-	type NativeAssetId = NativeAssetId;
+	type StorageFeesAssetId = NativeAssetId;
 	type StorageFees = StoreFees;
 	type StorageFeesBeneficiary = TreasuryAccount;
 	type WeightInfo = weights::registry::HydraWeight<Runtime>;