Polkadot v1.1.0

libs/mocks/Cargo.toml

@@ -27,7 +27,7 @@ cfg-traits = { workspace = true }
 cfg-types = { workspace = true }
 
 orml-traits = { workspace = true }
-xcm = { workspace = true }
+staging-xcm = { workspace = true }
 
 mock-builder = { workspace = true }
 
@@ -46,7 +46,7 @@ std = [
   "sp-io/std",
   "sp-runtime/std",
   "orml-traits/std",
-  "xcm/std",
+  "staging-xcm/std",
   "mock-builder/std",
 ]
 runtime-benchmarks = [

libs/mocks/src/asset_registry.rs

@@ -1,41 +1,44 @@
-#[frame_support::pallet]
+#[frame_support::pallet(dev_mode)]
 pub mod pallet {
 	use frame_support::pallet_prelude::*;
 	use mock_builder::{execute_call, register_call};
 	use orml_traits::asset_registry::{AssetMetadata, Inspect, Mutate};
-	use xcm::{v3::prelude::MultiLocation, VersionedMultiLocation};
+	use sp_std::fmt::Debug;
+	use staging_xcm::{v3::prelude::MultiLocation, VersionedMultiLocation};
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
 		type AssetId;
-		type Balance;
+		type Balance: Clone + Debug + Eq + PartialEq;
 		type CustomMetadata: Parameter + Member + TypeInfo;
+		type StringLimit: Get<u32>;
 	}
 
 	#[pallet::pallet]
 	pub struct Pallet<T>(_);
 
 	#[pallet::storage]
-	pub(super) type CallIds<T: Config> = StorageMap<
-		_,
-		Blake2_128Concat,
-		<Blake2_128 as frame_support::StorageHasher>::Output,
-		mock_builder::CallId,
-	>;
+	type CallIds<T: Config> = StorageMap<_, _, String, mock_builder::CallId>;
 
 	impl<T: Config> Pallet<T> {
 		pub fn mock_asset_id(f: impl Fn(&MultiLocation) -> Option<T::AssetId> + 'static) {
 			register_call!(f);
 		}
 
 		pub fn mock_metadata(
-			f: impl Fn(&T::AssetId) -> Option<AssetMetadata<T::Balance, T::CustomMetadata>> + 'static,
+			f: impl Fn(
+					&T::AssetId,
+				) -> Option<AssetMetadata<T::Balance, T::CustomMetadata, T::StringLimit>>
+				+ 'static,
 		) {
 			register_call!(f);
 		}
 
 		pub fn mock_metadata_by_location(
-			f: impl Fn(&MultiLocation) -> Option<AssetMetadata<T::Balance, T::CustomMetadata>> + 'static,
+			f: impl Fn(
+					&MultiLocation,
+				) -> Option<AssetMetadata<T::Balance, T::CustomMetadata, T::StringLimit>>
+				+ 'static,
 		) {
 			register_call!(f);
 		}
@@ -49,7 +52,7 @@ pub mod pallet {
 		pub fn mock_register_asset(
 			f: impl Fn(
 					Option<T::AssetId>,
-					AssetMetadata<T::Balance, T::CustomMetadata>,
+					AssetMetadata<T::Balance, T::CustomMetadata, T::StringLimit>,
 				) -> DispatchResult
 				+ 'static,
 		) {
@@ -60,8 +63,8 @@ pub mod pallet {
 			f: impl Fn(
 					T::AssetId,
 					Option<u32>,
-					Option<Vec<u8>>,
-					Option<Vec<u8>>,
+					Option<BoundedVec<u8, T::StringLimit>>,
+					Option<BoundedVec<u8, T::StringLimit>>,
 					Option<T::Balance>,
 					Option<Option<VersionedMultiLocation>>,
 					Option<T::CustomMetadata>,
@@ -76,20 +79,21 @@ pub mod pallet {
 		type AssetId = T::AssetId;
 		type Balance = T::Balance;
 		type CustomMetadata = T::CustomMetadata;
+		type StringLimit = T::StringLimit;
 
 		fn asset_id(a: &MultiLocation) -> Option<Self::AssetId> {
 			execute_call!(a)
 		}
 
 		fn metadata(
 			a: &Self::AssetId,
-		) -> Option<AssetMetadata<Self::Balance, Self::CustomMetadata>> {
+		) -> Option<AssetMetadata<Self::Balance, Self::CustomMetadata, Self::StringLimit>> {
 			execute_call!(a)
 		}
 
 		fn metadata_by_location(
 			a: &MultiLocation,
-		) -> Option<AssetMetadata<Self::Balance, Self::CustomMetadata>> {
+		) -> Option<AssetMetadata<Self::Balance, Self::CustomMetadata, Self::StringLimit>> {
 			execute_call!(a)
 		}
 
@@ -101,16 +105,16 @@ pub mod pallet {
 	impl<T: Config> Mutate for Pallet<T> {
 		fn register_asset(
 			a: Option<Self::AssetId>,
-			b: AssetMetadata<Self::Balance, Self::CustomMetadata>,
+			b: AssetMetadata<Self::Balance, Self::CustomMetadata, Self::StringLimit>,
 		) -> DispatchResult {
 			execute_call!((a, b))
 		}
 
 		fn update_asset(
 			a: Self::AssetId,
 			b: Option<u32>,
-			c: Option<Vec<u8>>,
-			d: Option<Vec<u8>>,
+			c: Option<BoundedVec<u8, Self::StringLimit>>,
+			d: Option<BoundedVec<u8, Self::StringLimit>>,
 			e: Option<Self::Balance>,
 			g: Option<Option<VersionedMultiLocation>>,
 			h: Option<Self::CustomMetadata>,

libs/mocks/src/change_guard.rs

@@ -1,4 +1,4 @@
-#[frame_support::pallet]
+#[frame_support::pallet(dev_mode)]
 pub mod pallet {
 	use cfg_traits::changes::ChangeGuard;
 	use frame_support::pallet_prelude::*;
@@ -15,12 +15,7 @@ pub mod pallet {
 	pub struct Pallet<T>(_);
 
 	#[pallet::storage]
-	pub(super) type CallIds<T: Config> = StorageMap<
-		_,
-		Blake2_128Concat,
-		<Blake2_128 as frame_support::StorageHasher>::Output,
-		mock_builder::CallId,
-	>;
+	type CallIds<T: Config> = StorageMap<_, _, String, mock_builder::CallId>;
 
 	impl<T: Config> Pallet<T> {
 		pub fn mock_note(

libs/mocks/src/currency_conversion.rs

@@ -1,4 +1,4 @@
-#[frame_support::pallet]
+#[frame_support::pallet(dev_mode)]
 pub mod pallet {
 	use cfg_traits::IdentityCurrencyConversion;
 	use frame_support::pallet_prelude::*;
@@ -14,12 +14,7 @@ pub mod pallet {
 	pub struct Pallet<T>(_);
 
 	#[pallet::storage]
-	pub(super) type CallIds<T: Config> = StorageMap<
-		_,
-		Blake2_128Concat,
-		<Blake2_128 as frame_support::StorageHasher>::Output,
-		mock_builder::CallId,
-	>;
+	type CallIds<T: Config> = StorageMap<_, _, String, mock_builder::CallId>;
 
 	impl<T: Config> Pallet<T> {
 		pub fn mock_stable_to_stable(

libs/mocks/src/data.rs

@@ -1,4 +1,4 @@
-#[frame_support::pallet]
+#[frame_support::pallet(dev_mode)]
 pub mod pallet {
 	use cfg_traits::data::{DataCollection, DataRegistry};
 	use frame_support::pallet_prelude::*;
@@ -17,12 +17,7 @@ pub mod pallet {
 	pub struct Pallet<T>(_);
 
 	#[pallet::storage]
-	pub(super) type CallIds<T: Config> = StorageMap<
-		_,
-		Blake2_128Concat,
-		<Blake2_128 as frame_support::StorageHasher>::Output,
-		mock_builder::CallId,
-	>;
+	type CallIds<T: Config> = StorageMap<_, _, String, mock_builder::CallId>;
 
 	impl<T: Config> Pallet<T> {
 		pub fn mock_get(

libs/mocks/src/fees.rs

@@ -1,25 +1,20 @@
-#[frame_support::pallet]
+#[frame_support::pallet(dev_mode)]
 pub mod pallet {
-	use cfg_traits::fees::{Fee, FeeKey, Fees};
+	use cfg_traits::fees::{Fee, Fees};
 	use frame_support::{pallet_prelude::*, traits::tokens::Balance};
 	use mock_builder::{execute_call, register_call};
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
 		type Balance: Balance;
-		type FeeKey: FeeKey;
+		type FeeKey;
 	}
 
 	#[pallet::pallet]
 	pub struct Pallet<T>(_);
 
 	#[pallet::storage]
-	pub(super) type CallIds<T: Config> = StorageMap<
-		_,
-		Blake2_128Concat,
-		<Blake2_128 as frame_support::StorageHasher>::Output,
-		mock_builder::CallId,
-	>;
+	type CallIds<T: Config> = StorageMap<_, _, String, mock_builder::CallId>;
 
 	impl<T: Config> Pallet<T> {
 		pub fn mock_fee_value(f: impl Fn(T::FeeKey) -> T::Balance + 'static) {

libs/mocks/src/investment.rs

@@ -1,4 +1,4 @@
-#[frame_support::pallet]
+#[frame_support::pallet(dev_mode)]
 pub mod pallet {
 	use cfg_traits::investments::{Investment, InvestmentCollector};
 	use frame_support::pallet_prelude::*;
@@ -16,12 +16,7 @@ pub mod pallet {
 	pub struct Pallet<T>(_);
 
 	#[pallet::storage]
-	pub(super) type CallIds<T: Config> = StorageMap<
-		_,
-		Blake2_128Concat,
-		<Blake2_128 as frame_support::StorageHasher>::Output,
-		mock_builder::CallId,
-	>;
+	type CallIds<T: Config> = StorageMap<_, _, String, mock_builder::CallId>;
 
 	impl<T: Config> Pallet<T> {
 		pub fn mock_update_investment(

libs/mocks/src/lib.rs

@@ -55,61 +55,51 @@ pub mod reexport {
 #[macro_export]
 macro_rules! make_runtime_for_mock {
 	($runtime_name:ident, $mock_name:ident, $pallet:ident, $externalities:ident) => {
-        use $crate::reexport::frame_support::traits::{ConstU16, ConstU32, ConstU64, Everything};
-        use $crate::reexport::sp_core::H256;
-        use $crate::reexport::sp_runtime::{
-            testing::Header,
-            traits::{BlakeTwo256, IdentityLookup},
-        };
-        use $crate::reexport::frame_system;
+		use $crate::reexport::{
+			frame_support,
+			frame_support::traits::{ConstU16, ConstU32, ConstU64, Everything},
+			frame_system,
+			sp_core::H256,
+			sp_io,
+			sp_runtime::traits::{BlakeTwo256, IdentityLookup},
+		};
 
-        type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
-        type Block = frame_system::mocking::MockBlock<Runtime>;
+		frame_support::construct_runtime!(
+			pub enum $runtime_name {
+				System: frame_system,
+				$mock_name: $pallet,
+			}
+		);
 
-        $crate::reexport::frame_support::construct_runtime!(
-            pub enum $runtime_name where
-                Block = Block,
-                NodeBlock = Block,
-                UncheckedExtrinsic = UncheckedExtrinsic,
-            {
-                System: frame_system,
-                $mock_name: $pallet,
-            }
-        );
+		impl frame_system::Config for Runtime {
+			type AccountData = ();
+			type AccountId = u64;
+			type BaseCallFilter = Everything;
+			type Block = frame_system::mocking::MockBlock<Runtime>;
+			type BlockHashCount = ConstU64<250>;
+			type BlockLength = ();
+			type BlockWeights = ();
+			type DbWeight = ();
+			type Hash = H256;
+			type Hashing = BlakeTwo256;
+			type Lookup = IdentityLookup<Self::AccountId>;
+			type MaxConsumers = ConstU32<16>;
+			type Nonce = u64;
+			type OnKilledAccount = ();
+			type OnNewAccount = ();
+			type OnSetCode = ();
+			type PalletInfo = PalletInfo;
+			type RuntimeCall = RuntimeCall;
+			type RuntimeEvent = RuntimeEvent;
+			type RuntimeOrigin = RuntimeOrigin;
+			type SS58Prefix = ConstU16<42>;
+			type SystemWeightInfo = ();
+			type Version = ();
+		}
 
-        impl frame_system::Config for Runtime {
-            type AccountData = ();
-            type AccountId = u64;
-            type BaseCallFilter = Everything;
-            type BlockHashCount = ConstU64<250>;
-            type BlockLength = ();
-            type BlockNumber = u64;
-            type BlockWeights = ();
-            type DbWeight = ();
-            type Hash = H256;
-            type Hashing = BlakeTwo256;
-            type Header = Header;
-            type Index = u64;
-            type Lookup = IdentityLookup<Self::AccountId>;
-            type MaxConsumers = ConstU32<16>;
-            type OnKilledAccount = ();
-            type OnNewAccount = ();
-            type OnSetCode = ();
-            type PalletInfo = PalletInfo;
-            type RuntimeCall = RuntimeCall;
-            type RuntimeEvent = RuntimeEvent;
-            type RuntimeOrigin = RuntimeOrigin;
-            type SS58Prefix = ConstU16<42>;
-            type SystemWeightInfo = ();
-            type Version = ();
-        }
-
-        pub fn $externalities() -> $crate::reexport::sp_io::TestExternalities {
-            frame_system::GenesisConfig::default()
-                .build_storage::<Runtime>()
-                .unwrap()
-                .into()
-        }
+		pub fn $externalities() -> sp_io::TestExternalities {
+			sp_io::TestExternalities::default()
+		}
 	};
 }
 

libs/mocks/src/liquidity_pools.rs

@@ -33,10 +33,9 @@ impl Codec for MessageMock {
 	}
 }
 
-#[frame_support::pallet]
+#[frame_support::pallet(dev_mode)]
 pub mod pallet {
 	use cfg_traits::liquidity_pools::InboundQueue;
-	use cfg_types::domain_address::DomainAddress;
 	use frame_support::pallet_prelude::*;
 	use mock_builder::{execute_call, register_call};
 
@@ -52,15 +51,10 @@ pub mod pallet {
 	pub struct Pallet<T>(_);
 
 	#[pallet::storage]
-	pub(super) type CallIds<T: Config> = StorageMap<
-		_,
-		Blake2_128Concat,
-		<Blake2_128 as frame_support::StorageHasher>::Output,
-		mock_builder::CallId,
-	>;
+	type CallIds<T: Config> = StorageMap<_, _, String, mock_builder::CallId>;
 
 	impl<T: Config> Pallet<T> {
-		pub fn mock_submit(f: impl Fn(DomainAddress, MessageMock) -> DispatchResult + 'static) {
+		pub fn mock_submit(f: impl Fn(T::DomainAddress, MessageMock) -> DispatchResult + 'static) {
 			register_call!(move |(sender, msg)| f(sender, msg));
 		}
 	}