Darwinia <> Darwinia Parachain

runtime/common/src/helixbridge/mod.rs

@@ -605,9 +605,10 @@ pub mod pallet {
 
 				let message_nonce =
 					T::MessageNoncer::outbound_latest_generated_nonce(T::MessageLaneId::get());
-				return Ok(message_nonce);
+
+				Ok(message_nonce)
 			} else {
-				return Err(Error::<T>::BackingAccountNone.into());
+				Err(Error::<T>::BackingAccountNone.into())
 			}
 		}
 	}

runtime/common/src/message_router/mod.rs

@@ -174,7 +174,7 @@ pub mod pallet {
 						TargetXcmExecConfig::<T>::get(T::MoonbeamLocation::get())
 							.ok_or(Error::<T>::TargetXcmExecNotConfig)?;
 					remote_weight = T::MoonbeamWeigher::weight(&mut Self::extend_remote_xcm(
-						raw_account.clone(),
+						raw_account,
 						remote_xcm.clone(),
 						MultiAsset { id: AssetId::from(T::LocalAssetId::get()), fun: Fungible(0) },
 					))
@@ -185,7 +185,7 @@ pub mod pallet {
 						TargetXcmExecConfig::<T>::get(T::AstarLocation::get())
 							.ok_or(Error::<T>::TargetXcmExecNotConfig)?;
 					remote_weight = T::AstarWeigher::weight(&mut Self::extend_remote_xcm(
-						raw_account.clone(),
+						raw_account,
 						remote_xcm.clone(),
 						MultiAsset { id: AssetId::from(T::LocalAssetId::get()), fun: Fungible(0) },
 					))
@@ -229,7 +229,7 @@ pub mod pallet {
 
 			// Toggle the xcm_fee relative to a target context
 			let ancestry = T::LocationInverter::ancestry();
-			let mut remote_xcm_fee_anchor_dest = remote_xcm_fee.clone();
+			let mut remote_xcm_fee_anchor_dest = remote_xcm_fee;
 			match target {
 				Target::Moonbeam => {
 					remote_xcm_fee_anchor_dest
@@ -292,7 +292,8 @@ pub mod pallet {
 				DescendOrigin(X1(AccountId32 { network: NetworkId::Any, id: raw_account })),
 			]);
 			extend_xcm.0.extend(xcm.0.into_iter());
-			return extend_xcm;
+
+			extend_xcm
 		}
 	}
 }

runtime/crab-parachain/src/lib.rs

@@ -140,35 +140,32 @@ frame_support::construct_runtime! {
 		NodeBlock = OpaqueBlock,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		// System support stuff.
 		System: frame_system::{Pallet, Call, Storage, Config, Event<T>} = 0,
 		ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Inherent, Storage, Config, Event<T>, ValidateUnsigned} = 1,
 		Timestamp: pallet_timestamp::{Pallet, Call, Inherent, Storage} = 3,
 		ParachainInfo: parachain_info::{Pallet, Storage, Config} = 4,
 
-		// Monetary stuff.
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 5,
 		TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Event<T>} = 6,
 
-		// Collator support. the order of these 4 are important and shall not change.
+		// Collator things. the order of these 4 are important and shall not change.
 		Authorship: pallet_authorship::{Pallet, Call, Storage} = 7,
 		CollatorSelection: pallet_collator_selection::{Pallet, Call, Storage, Event<T>, Config<T>} = 8,
 		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>} = 9,
 		Aura: pallet_aura::{Pallet, Storage, Config<T>} = 10,
 		AuraExt: cumulus_pallet_aura_ext::{Pallet, Storage, Config} = 11,
+		RemoteGovernance: dp_common_runtime::remote_governance::{Pallet, Call, Storage, Event<T>} = 25,
 
-		// XCM helpers.
+		// XCM things.
 		XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 12,
 		PolkadotXcm: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin, Config} = 13,
 		CumulusXcm: cumulus_pallet_xcm::{Pallet, Event<T>, Origin} = 14,
 		DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 15,
 
-		// Handy utilities.
 		Utility: pallet_utility::{Pallet, Call, Event} = 16,
 		Multisig: pallet_multisig::{Pallet, Call, Storage, Event<T>} = 17,
 		Proxy: pallet_proxy::{Pallet, Call, Storage, Event<T>} = 18,
 		Sudo: pallet_sudo::{Pallet, Call, Storage, Config<T>, Event<T>} = 19,
-		RemoteGovernance: dp_common_runtime::remote_governance::{Pallet, Call, Storage, Event<T>} = 25,
 
 		// Crab Parachain <> Crab.
 		BridgeCrabGrandpa: pallet_bridge_grandpa::<Instance1>::{Pallet, Call, Storage} = 20,

runtime/crab-parachain/src/pallets/helixbridge.rs

@@ -53,7 +53,7 @@ frame_support::parameter_types! {
 	pub const ParachainIssuingPalletId: PalletId = PalletId(*b"da/paais");
 	pub const CrabChainId: ChainId = CRAB_CHAIN_ID;
 	pub const CrabSmartChainId: u64 = 44;
-	pub const MaxNonceReserves: u32 = 1024;
+	pub const MaxNonceReserves: u32 = 4096;
 }
 
 impl Config for Runtime {

runtime/crab-parachain/src/pallets/mod.rs

@@ -31,6 +31,9 @@ pub use aura::*;
 pub mod aura_ext;
 pub use aura_ext::*;
 
+pub mod remote_governance;
+pub use remote_governance::*;
+
 pub mod xcmp_queue;
 pub use xcmp_queue::*;
 
@@ -55,9 +58,6 @@ pub use proxy::*;
 pub mod sudo;
 pub use sudo::*;
 
-pub mod remote_governance;
-pub use remote_governance::*;
-
 pub mod bridge_dispatch;
 pub use bridge_dispatch::*;