improvements

Author: xlc

xcm-support/src/tests.rs

@@ -4,7 +4,7 @@
 
 use super::*;
 
-use orml_traits::ConcreteFungibleAsset;
+use orml_traits::{location::RelativeLocations, ConcreteFungibleAsset};
 
 #[derive(Debug, PartialEq, Eq)]
 pub enum TestCurrencyId {
@@ -23,10 +23,10 @@ impl Convert<MultiLocation, Option<TestCurrencyId>> for CurrencyIdConvert {
 		if l == MultiLocation::parent() {
 			return Some(RelayChainToken);
 		}
-		if l == MultiLocation::new(1, X2(Parachain(1), GeneralKey(token_a))) {
+		if l == MultiLocation::sibling_parachain_general_key(1, token_a) {
 			return Some(TokenA);
 		}
-		if l == MultiLocation::new(1, X2(Parachain(2), GeneralKey(token_b))) {
+		if l == MultiLocation::sibling_parachain_general_key(2, token_b) {
 			return Some(TokenB);
 		}
 		None

xtokens/src/lib.rs

@@ -251,7 +251,7 @@ pub mod module {
 			asset: MultiAsset,
 			dest: MultiLocation,
 			recipient: MultiLocation,
-			dest_weight: u64,
+			dest_weight: Weight,
 		) -> Result<Xcm<T::Call>, DispatchError> {
 			let buy_execution = Self::buy_execution(asset.clone(), &dest, dest_weight)?;
 			Ok(WithdrawAsset {
@@ -269,7 +269,7 @@ pub mod module {
 			asset: MultiAsset,
 			reserve: MultiLocation,
 			recipient: MultiLocation,
-			dest_weight: u64,
+			dest_weight: Weight,
 		) -> Result<Xcm<T::Call>, DispatchError> {
 			Ok(WithdrawAsset {
 				assets: asset.clone().into(),
@@ -289,7 +289,7 @@ pub mod module {
 			reserve: MultiLocation,
 			dest: MultiLocation,
 			recipient: MultiLocation,
-			dest_weight: u64,
+			dest_weight: Weight,
 		) -> Result<Xcm<T::Call>, DispatchError> {
 			let mut reanchored_dest = dest.clone();
 			if reserve == MultiLocation::parent() {
@@ -332,7 +332,7 @@ pub mod module {
 			}
 		}
 
-		fn buy_execution(asset: MultiAsset, at: &MultiLocation, weight: u64) -> Result<Order<()>, DispatchError> {
+		fn buy_execution(asset: MultiAsset, at: &MultiLocation, weight: Weight) -> Result<Order<()>, DispatchError> {
 			let inv_at = T::LocationInverter::invert_location(at);
 			let fees = asset.reanchored(&inv_at).map_err(|_| Error::<T>::CannotReanchor)?;
 			Ok(BuyExecution {