Last fixes

KILTprotocol · Oct 8, 2024 · 282119f · 282119f
1 parent b6782c7
commit 282119f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/pallets/pallet-asset-switch/src/lib.rs b/pallets/pallet-asset-switch/src/lib.rs
@@ -54,7 +54,7 @@ use frame_support::traits::{
 };
 use parity_scale_codec::{Decode, Encode};
 use sp_runtime::traits::{TrailingZeroInput, Zero};
-use sp_std::boxed::Box;
+use sp_std::{boxed::Box, vec};
 
 pub use crate::pallet::*;
 

diff --git a/runtimes/common/src/asset_switch/runtime_api.rs b/runtimes/common/src/asset_switch/runtime_api.rs
@@ -24,6 +24,5 @@ pub enum Error {
 	InvalidInput,
 	SwitchPoolNotFound,
 	SwitchPoolNotSet,
-	Other(String),
 	Internal,
 }
diff --git a/runtimes/peregrine/src/lib.rs b/runtimes/peregrine/src/lib.rs
@@ -1628,12 +1628,12 @@ impl_runtime_apis! {
 				return Err(AssetSwitchApiError::SwitchPoolNotSet);
 			};
 
-			let from_v4 = AccountId32ToAccountId32JunctionConverter::try_convert(from).map_err(|e| AssetSwitchApiError::Other(e.to_string()))?;
-			let to_v4 = Location::try_from(to.clone()).map_err(|_| AssetSwitchApiError::Other(format!("Failed to convert provided location {:?} to a `v4` variant.", to)))?;
+			let from_v4 = AccountId32ToAccountId32JunctionConverter::try_convert(from).map_err(|_| AssetSwitchApiError::Internal)?;
+			let to_v4 = Location::try_from(to.clone()).map_err(|_| AssetSwitchApiError::Internal)?;
 			let our_location_for_destination = {
 				let universal_location = UniversalLocation::get();
 				universal_location.invert_target(&to_v4)
-			}.map_err(|_| AssetSwitchApiError::Other(format!("Failed to invert target for target destination {:?}", to)))?;
+			}.map_err(|_| AssetSwitchApiError::Internal)?;
 			let asset_id_v4 = AssetId::try_from(switch_pair.remote_asset_id).map_err(|_| AssetSwitchApiError::Internal)?;
 			let remote_asset_fee_v4 = Asset::try_from(switch_pair.remote_xcm_fee).map_err(|_| AssetSwitchApiError::Internal)?;
 

diff --git a/runtimes/spiritnet/src/lib.rs b/runtimes/spiritnet/src/lib.rs
@@ -1618,12 +1618,12 @@ impl_runtime_apis! {
 				return Err(AssetSwitchApiError::SwitchPoolNotSet);
 			};
 
-			let from_v4 = AccountId32ToAccountId32JunctionConverter::try_convert(from).map_err(|e| AssetSwitchApiError::Other(e.to_string()))?;
-			let to_v4 = Location::try_from(to.clone()).map_err(|_| AssetSwitchApiError::Other(format!("Failed to convert provided location {:?} to a `v4` variant.", to)))?;
+			let from_v4 = AccountId32ToAccountId32JunctionConverter::try_convert(from).map_err(|_| AssetSwitchApiError::Internal)?;
+			let to_v4 = Location::try_from(to.clone()).map_err(|_| AssetSwitchApiError::Internal)?;
 			let our_location_for_destination = {
 				let universal_location = UniversalLocation::get();
 				universal_location.invert_target(&to_v4)
-			}.map_err(|_| AssetSwitchApiError::Other(format!("Failed to invert target for target destination {:?}", to)))?;
+			}.map_err(|_| AssetSwitchApiError::Internal)?;
 			let asset_id_v4 = AssetId::try_from(switch_pair.remote_asset_id).map_err(|_| AssetSwitchApiError::Internal)?;
 			let remote_asset_fee_v4 = Asset::try_from(switch_pair.remote_xcm_fee).map_err(|_| AssetSwitchApiError::Internal)?;