git.delta.rocks / unique-network / refs/commits / 9c3e59a24962

--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -2387,7 +2387,7 @@
 		amount: u128,
 		nesting_budget: &dyn Budget,
 	) -> DispatchResult {
-		if T::CrossTokenAddressMapping::is_token_address(&to) {
+		if T::CrossTokenAddressMapping::is_token_address(to) {
 			return unsupported!(T);
 		}
 

--- a/pallets/foreign-assets/src/lib.rs
+++ b/pallets/foreign-assets/src/lib.rs
@@ -240,9 +240,7 @@
 	) -> Result<Option<CollectionId>, XcmError> {
 		let self_location = T::SelfLocation::get();
 
-		if *asset_location == Here.into() {
-			Ok(Some(NATIVE_FUNGIBLE_COLLECTION_ID))
-		} else if *asset_location == self_location {
+		if *asset_location == Here.into() || *asset_location == self_location {
 			Ok(Some(NATIVE_FUNGIBLE_COLLECTION_ID))
 		} else if asset_location.parents == self_location.parents {
 			match asset_location
@@ -395,7 +393,7 @@
 		asset_instance: &AssetInstance,
 		from: T::CrossAccountId,
 	) -> XcmResult {
-		let token_id = Self::asset_instance_to_token_id(collection_id, &asset_instance)?
+		let token_id = Self::asset_instance_to_token_id(collection_id, asset_instance)?
 			.ok_or(XcmError::AssetNotFound)?;
 
 		if xcm_ext.token_has_children(token_id) {
@@ -569,11 +567,11 @@
 	Fungible(u8),
 }
 
-impl Into<CollectionMode> for ForeignCollectionMode {
-	fn into(self) -> CollectionMode {
-		match self {
-			Self::NFT => CollectionMode::NFT,
-			Self::Fungible(decimals) => CollectionMode::Fungible(decimals),
+impl From<ForeignCollectionMode> for CollectionMode {
+	fn from(value: ForeignCollectionMode) -> Self {
+		match value {
+			ForeignCollectionMode::NFT => Self::NFT,
+			ForeignCollectionMode::Fungible(decimals) => Self::Fungible(decimals),
 		}
 	}
 }

470			up_data_structs::CreateItemData::Fungible(fungible_data) => {470			up_data_structs::CreateItemData::Fungible(fungible_data) => {
471				<Pallet<T>>::create_multiple_items(471				<Pallet<T>>::create_multiple_items(
472					self,472					self,
473					&depositor,473					depositor,
474					[(to, fungible_data.value)].into_iter().collect(),474					[(to, fungible_data.value)].into_iter().collect(),
475					nesting_budget,475					nesting_budget,
476				)?476				)?
495			<CommonError<T>>::FungibleItemsHaveNoId495			<CommonError<T>>::FungibleItemsHaveNoId
496		);496		);
497497
498		<Pallet<T>>::transfer_internal(self, &depositor, &from, &to, amount, nesting_budget)498		<Pallet<T>>::transfer_internal(self, depositor, from, to, amount, nesting_budget)
499			.map(|_| ())499			.map(|_| ())
500			.map_err(|post_info| post_info.error)500			.map_err(|post_info| post_info.error)
501	}501	}
506		token: TokenId,506		token: TokenId,
507		amount: u128,507		amount: u128,
508	) -> sp_runtime::DispatchResult {508	) -> sp_runtime::DispatchResult {
509		<Self as CommonCollectionOperations<T>>::burn_item(&self, from, token, amount)509		<Self as CommonCollectionOperations<T>>::burn_item(self, from, token, amount)
510			.map(|_| ())510			.map(|_| ())
511			.map_err(|post_info| post_info.error)511			.map_err(|post_info| post_info.error)
512	}512	}

--- a/pallets/nonfungible/src/common.rs
+++ b/pallets/nonfungible/src/common.rs
@@ -585,7 +585,7 @@
 	) -> Result<TokenId, sp_runtime::DispatchError> {
 		<Pallet<T>>::create_multiple_items(
 			self,
-			&depositor,
+			depositor,
 			vec![map_create_data::<T>(data, &to)?],
 			nesting_budget,
 		)?;
@@ -604,7 +604,7 @@
 	) -> sp_runtime::DispatchResult {
 		ensure!(amount == 1, <Error<T>>::NonfungibleItemsHaveNoAmount);
 
-		<Pallet<T>>::transfer_internal(self, &depositor, &from, &to, token, nesting_budget)
+		<Pallet<T>>::transfer_internal(self, depositor, from, to, token, nesting_budget)
 			.map(|_| ())
 			.map_err(|post_info| post_info.error)
 	}

--- a/runtime/common/config/pallets/foreign_asset.rs
+++ b/runtime/common/config/pallets/foreign_asset.rs
@@ -26,7 +26,7 @@
 {
 	fn convert_location(location: &MultiLocation) -> Option<ConfigCrossAccountId> {
 		LocationToAccountId::convert_location(location)
-			.map(|sub| ConfigCrossAccountId::from_sub(sub))
+			.map(ConfigCrossAccountId::from_sub)
 			.or_else(|| {
 				let eth_address =
 					AccountKey20Aliases::<RelayNetwork, H160>::convert_location(location)?;