fix merge

RegionX-Labs · May 4, 2024 · fab2cc8 · fab2cc8
1 parent 15903e5
commit fab2cc8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/runtime/regionx/src/adapter.rs b/runtime/regionx/src/adapter.rs
@@ -1,5 +1,5 @@
 // TODO: remove this file
-// This has been temporarily added here because the NonFungibleAdapter is in release 1.7.0 
+// This has been temporarily added here because the NonFungibleAdapter is in release 1.7.0
 // or later, but we cannot update to that version now because of ISMP.
 
 // Copyright (C) Parity Technologies (UK) Ltd.
@@ -20,13 +20,13 @@
 
 //! Adapters to work with [`frame_support::traits::tokens::nonfungible`] through XCM.
 
-use xcm_builder::MintLocation;
 use frame_support::{
 	ensure,
 	traits::{tokens::nonfungible, Get},
 };
 use sp_std::{marker::PhantomData, prelude::*, result};
 use xcm::latest::prelude::*;
+use xcm_builder::MintLocation;
 use xcm_executor::traits::{
 	ConvertLocation, Error as MatchError, MatchesNonFungible, TransactAsset,
 };

diff --git a/runtime/regionx/src/lib.rs b/runtime/regionx/src/lib.rs
@@ -23,7 +23,6 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
 extern crate alloc;
 
-
 // TODO remove:
 mod adapter;
 use adapter::NonFungibleAdapter;

diff --git a/runtime/regionx/src/xcm_config.rs b/runtime/regionx/src/xcm_config.rs
@@ -14,9 +14,9 @@
 // along with RegionX.  If not, see <https://www.gnu.org/licenses/>.
 
 use super::{
-	AccountId, AllPalletsWithSystem, AssetId, Balance, Balances, Currencies, ParachainInfo,
-	ParachainSystem, PolkadotXcm, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, UnknownTokens,
-	CORETIME_CHAIN_PARA_ID, NonFungibleAdapter, WeightToFee, XcmpQueue,
+	AccountId, AllPalletsWithSystem, AssetId, Balance, Balances, Currencies, NonFungibleAdapter,
+	ParachainInfo, ParachainSystem, PolkadotXcm, Regions, Runtime, RuntimeCall, RuntimeEvent,
+	RuntimeOrigin, UnknownTokens, WeightToFee, XcmpQueue, CORETIME_CHAIN_PARA_ID,
 };
 use frame_support::{
 	match_types, parameter_types,
@@ -34,7 +34,7 @@ use xcm::latest::prelude::*;
 use xcm_builder::{
 	AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowTopLevelPaidExecutionFrom,
 	DenyReserveTransferToRelayChain, DenyThenTry, EnsureXcmOrigin, FixedWeightBounds,
-	FrameTransactionalProcessor, NativeAsset, ParentIsPreset, RelayChainAsNative,
+	FrameTransactionalProcessor, IsConcrete, NativeAsset, ParentIsPreset, RelayChainAsNative,
 	SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative,
 	SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, TrailingSetTopicAsId,
 	UsingComponents, WithComputedOrigin, WithUniqueTopic,