chore: refactor runtimes code

dip-template/pallets/pallet-postit/src/lib.rs

@@ -65,7 +65,7 @@ pub mod pallet {
 		type OriginCheck: EnsureOrigin<<Self as frame_system::Config>::RuntimeOrigin, Success = Self::OriginSuccess>;
 		type OriginSuccess: GetUsername<Username = Self::Username>;
 		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
-		type Username: Encode + Decode + TypeInfo + MaxEncodedLen + Clone + PartialEq + Debug + Default;
+		type Username: Encode + Decode + TypeInfo + MaxEncodedLen + Clone + PartialEq + Debug;
 	}
 
 	#[pallet::storage]

dip-template/runtimes/dip-provider/src/lib.rs

@@ -31,7 +31,7 @@
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
 use pallet_did_lookup::linkable_account::LinkableAccountId;
-use pallet_web3_names::web3_name::AsciiWeb3Name;
+use pallet_web3_names::Web3NameOf;
 use parity_scale_codec::{Decode, Encode};
 use scale_info::TypeInfo;
 pub use sp_consensus_aura::sr25519::AuthorityId as AuraId;
@@ -437,8 +437,7 @@ impl pallet_did_lookup::Config for Runtime {
 	type WeightInfo = weights::pallet_did_lookup::WeightInfo<Runtime>;
 }
 
-pub type Web3Name = AsciiWeb3Name<Runtime>;
-
+pub type Web3Name = runtime_common::Web3Name<3, 32>;
 impl pallet_web3_names::Config for Runtime {
 	type BalanceMigrationManager = ();
 	type BanOrigin = EnsureRoot<AccountId>;
@@ -642,7 +641,7 @@ impl_runtime_apis! {
 				BlockNumber
 			>
 		> {
-			let name: pallet_web3_names::web3_name::AsciiWeb3Name<Runtime> = name.try_into().ok()?;
+			let name: Web3NameOf<Runtime> = name.try_into().ok()?;
 			pallet_web3_names::Owner::<Runtime>::get(&name)
 				.and_then(|owner_info| {
 					did::Did::<Runtime>::get(&owner_info.owner).map(|details| (owner_info, details))

integration-tests/emulated/src/mock/para_chains.rs

@@ -139,7 +139,7 @@ decl_test_parachains! {
 		runtime = peregrine_runtime,
 		core = {
 			XcmpMessageHandler: peregrine_runtime::XcmpQueue,
-			LocationToAccountId: peregrine_runtime::xcm_config::LocationToAccountIdConverter,
+			LocationToAccountId: peregrine_runtime::xcm::LocationToAccountIdConverter,
 			ParachainInfo: peregrine_runtime::ParachainInfo,
 			MessageOrigin: cumulus_primitives_core::AggregateMessageOrigin,
 		},

nodes/parachain/src/command.rs

@@ -18,7 +18,7 @@
 use cumulus_primitives_core::ParaId;
 use frame_benchmarking_cli::{BenchmarkCmd, SUBSTRATE_REFERENCE_HARDWARE};
 use log::info;
-use runtime_common::Block;
+use runtime_common::opaque::Block;
 use sc_cli::SubstrateCli;
 use sc_executor::NativeExecutionDispatch;
 use sp_runtime::traits::AccountIdConversion;

nodes/parachain/src/rpc.rs

@@ -32,7 +32,7 @@ use sp_api::ProvideRuntimeApi;
 use sp_block_builder::BlockBuilder;
 use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};
 
-use runtime_common::{AccountId, Balance, Block, Nonce};
+use runtime_common::{opaque::Block, AccountId, Balance, Nonce};
 
 /// A type representing all RPC extensions.
 pub(crate) type RpcExtension = jsonrpsee::RpcModule<()>;

nodes/standalone/src/rpc.rs

@@ -33,7 +33,7 @@ use sp_api::ProvideRuntimeApi;
 use sp_block_builder::BlockBuilder;
 use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};
 
-use runtime_common::{AccountId, Balance, Block, Nonce};
+use runtime_common::{opaque::Block, AccountId, Balance, Nonce};
 
 /// Full client dependencies.
 pub(crate) struct FullDeps<C, P> {

pallets/pallet-migration/src/benchmarking.rs

@@ -242,6 +242,6 @@ benchmarks! {
 
 impl_benchmark_test_suite! {
 	Pallet,
-	crate::mock::runtime::ExtBuilder::default().build_with_keystore(),
-	crate::mock::runtime::Test
+	crate::mock::ExtBuilder::default().build_with_keystore(),
+	crate::mock::Test
 }

pallets/pallet-migration/src/lib.rs

@@ -22,7 +22,7 @@ pub mod default_weights;
 
 #[cfg(feature = "runtime-benchmarks")]
 mod benchmarking;
-#[cfg(any(test, feature = "runtime-benchmarks"))]
+#[cfg(test)]
 mod mock;
 #[cfg(test)]
 mod test;
@@ -48,6 +48,7 @@ pub mod pallet {
 	use frame_support::{
 		pallet_prelude::*,
 		traits::{fungible::Inspect, Currency, ReservableCurrency},
+		DefaultNoBound,
 	};
 	use frame_system::pallet_prelude::*;
 	use sp_runtime::{traits::Hash, SaturatedConversion};
@@ -66,15 +67,10 @@ pub mod pallet {
 
 	pub type HashOf<T> = <T as frame_system::Config>::Hash;
 
-	#[derive(Encode, Decode, TypeInfo, Debug, Clone, PartialEq, Eq)]
+	#[derive(Encode, Decode, TypeInfo, Debug, Clone, PartialEq, Eq, DefaultNoBound)]
 	pub struct EntriesToMigrate<T>
 	where
-		T: Config
-			+ did::Config
-			+ delegation::Config
-			+ frame_system::Config
-			+ pallet_web3_names::Config
-			+ public_credentials::Config,
+		T: Config + did::Config + delegation::Config + pallet_web3_names::Config + public_credentials::Config,
 	{
 		pub attestation: BoundedVec<ClaimHashOf<T>, <T as Config>::MaxMigrationsPerPallet>,
 		pub delegation: BoundedVec<DelegationNodeIdOf<T>, <T as Config>::MaxMigrationsPerPallet>,