homa-lite: update cross-chain transfer

modules/homa-lite/src/lib.rs

@@ -31,7 +31,7 @@ use orml_traits::{MultiCurrency, XcmTransfer};
 use primitives::{Balance, CurrencyId};
 use sp_runtime::{traits::Zero, ArithmeticError, FixedPointNumber, Permill};
 use sp_std::{ops::Mul, prelude::*};
-use xcm::opaque::v0::{MultiLocation, Outcome};
+use xcm::opaque::v0::MultiLocation;
 
 pub use module::*;
 pub use weights::WeightInfo;
@@ -193,17 +193,14 @@ pub mod module {
 				.expect("Max rewards cannot be above 100%; qed");
 
 			// All checks pass. Proceed with Xcm transfer.
-			let xcm_result = T::XcmTransfer::transfer(
+			T::XcmTransfer::transfer(
 				who.clone(),
 				staking_currency,
 				amount,
 				T::SovereignSubAccountLocation::get(),
 				Self::xcm_dest_weight(),
-			)?;
-			ensure!(
-				matches!(xcm_result, Outcome::Complete(_)),
-				Error::<T>::XcmTransferFailed
-			);
+			)
+			.map_err(|_| Error::<T>::XcmTransferFailed)?;
 
 			// Mint the liquid currency into the user's account.
 			T::Currency::deposit(T::LiquidCurrencyId::get(), &who, liquid_to_mint)?;

modules/homa-lite/src/mock.rs

@@ -24,11 +24,11 @@ use super::*;
 use frame_support::{ord_parameter_types, parameter_types};
 use frame_system::EnsureSignedBy;
 use module_support::mocks::MockAddressMapping;
-use orml_traits::{parameter_type_with_key, XcmExecutionResult, XcmTransfer};
+use orml_traits::{parameter_type_with_key, XcmTransfer};
 use primitives::{Amount, TokenSymbol};
 use sp_core::H256;
 use sp_runtime::{testing::Header, traits::IdentityLookup, AccountId32};
-use xcm::opaque::v0::{Junction, MultiAsset, MultiLocation, NetworkId, Outcome};
+use xcm::opaque::v0::{Junction, MultiAsset, MultiLocation, NetworkId};
 
 pub type AccountId = AccountId32;
 pub type BlockNumber = u64;
@@ -75,10 +75,10 @@ impl XcmTransfer<AccountId, Balance, CurrencyId> for MockXcm {
 		_amount: Balance,
 		_dest: MultiLocation,
 		_dest_weight: Weight,
-	) -> XcmExecutionResult {
+	) -> DispatchResult {
 		match who {
-			INVALID_CALLER => Ok(Outcome::Error(xcm::opaque::v0::Error::Undefined)),
-			_ => Ok(Outcome::Complete(0)),
+			INVALID_CALLER => Err(DispatchError::Other("Invalid caller")),
+			_ => Ok(()),
 		}
 	}
 
@@ -88,8 +88,8 @@ impl XcmTransfer<AccountId, Balance, CurrencyId> for MockXcm {
 		_asset: MultiAsset,
 		_dest: MultiLocation,
 		_dest_weight: Weight,
-	) -> XcmExecutionResult {
-		Ok(Outcome::Complete(0))
+	) -> DispatchResult {
+		Ok(())
 	}
 }