refactor(pop-node): pallet config - testnet

r0gue-io · Apr 15, 2024 · 7fded02 · 7fded02
1 parent afc7072
commit 7fded02
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/runtime/testnet/src/assets_config.rs → runtime/testnet/src/config/assets.rs b/runtime/testnet/src/assets_config.rs → runtime/testnet/src/config/assets.rs
diff --git a/runtime/testnet/src/contracts_config.rs → runtime/testnet/src/config/contracts.rs b/runtime/testnet/src/contracts_config.rs → runtime/testnet/src/config/contracts.rs
diff --git a/runtime/testnet/src/config/mod.rs b/runtime/testnet/src/config/mod.rs
@@ -0,0 +1,5 @@
+mod assets;
+mod contracts;
+mod proxy;
+// Public due to integration tests crate.
+pub mod xcm;
diff --git a/runtime/testnet/src/proxy_config.rs → runtime/testnet/src/config/proxy.rs b/runtime/testnet/src/proxy_config.rs → runtime/testnet/src/config/proxy.rs
@@ -1,7 +1,8 @@
 use crate::{
-	assets_config::TrustBackedAssetsCall, deposit, Balance, Balances, Runtime, RuntimeCall,
+	deposit, Balance, Balances, Runtime, RuntimeCall,
 	RuntimeEvent,
 };
+use super::assets::TrustBackedAssetsCall;
 use codec::{Decode, Encode, MaxEncodedLen};
 use sp_runtime::{traits::BlakeTwo256, RuntimeDebug};
 

diff --git a/runtime/testnet/src/xcm_config.rs → runtime/testnet/src/config/xcm.rs b/runtime/testnet/src/xcm_config.rs → runtime/testnet/src/config/xcm.rs
@@ -1,4 +1,4 @@
-use super::{
+use crate::{
 	AccountId, AllPalletsWithSystem, Balances, ParachainInfo, ParachainSystem, PolkadotXcm,
 	Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, WeightToFee, XcmpQueue,
 };

diff --git a/runtime/testnet/src/lib.rs b/runtime/testnet/src/lib.rs
@@ -6,12 +6,9 @@
 #[cfg(feature = "std")]
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
-mod assets_config;
-mod contracts_config;
 mod extensions;
-mod proxy_config;
 mod weights;
-pub mod xcm_config;
+mod config;
 
 use cumulus_pallet_parachain_system::RelayNumberMonotonicallyIncreases;
 use polkadot_runtime_common::xcm_sender::NoPriceForMessageDelivery;
@@ -60,7 +57,7 @@ pub use pop_runtime_common::{
 	RELAY_CHAIN_SLOT_DURATION_MILLIS, SLOT_DURATION, UNINCLUDED_SEGMENT_CAPACITY, UNIT,
 };
 pub use sp_runtime::{MultiAddress, Perbill, Permill};
-use xcm_config::{RelayLocation, XcmOriginToTransactDispatchOrigin};
+use config::xcm::{RelayLocation, XcmOriginToTransactDispatchOrigin};
 
 #[cfg(any(feature = "std", test))]
 pub use sp_runtime::BuildStorage;
@@ -433,7 +430,7 @@ impl pallet_message_queue::Config for Runtime {
 	#[cfg(not(feature = "runtime-benchmarks"))]
 	type MessageProcessor = xcm_builder::ProcessXcmMessage<
 		AggregateMessageOrigin,
-		xcm_executor::XcmExecutor<xcm_config::XcmConfig>,
+		xcm_executor::XcmExecutor<config::xcm::XcmConfig>,
 		RuntimeCall,
 	>;
 	type Size = u32;