Part.5

Cargo.toml

@@ -39,7 +39,6 @@ darwinia-common-runtime           = { path = "runtime/common", default-features
 darwinia-deposit                  = { path = "pallet/deposit", default-features = false }
 darwinia-ethtx-forwarder          = { path = "pallet/ethtx-forwarder", default-features = false }
 darwinia-precompile-assets        = { path = "precompile/assets", default-features = false }
-darwinia-precompile-deposit       = { path = "precompile/deposit", default-features = false }
 darwinia-precompile-staking       = { path = "precompile/staking", default-features = false }
 darwinia-precompile-state-storage = { path = "precompile/state-storage", default-features = false }
 darwinia-runtime                  = { path = "runtime/darwinia" }

Makefile.toml

@@ -19,7 +19,7 @@ args      = ["fmt"]
 [tasks.clippy]
 env     = { "SKIP_WASM_BUILD" = "1" }
 command = "cargo"
-args    = ["clippy"]
+args    = ["clippy", "--all-features"]
 
 [tasks.c]
 alias = "clippy"

node/src/service/mod.rs

@@ -398,12 +398,14 @@ where
 			);
 
 			// Create a mocked parachain inherent data provider to pass all validations in the
-			// parachain system. Without this, the pending functionality will fail.
-			let mut state_proof_builder =
-				cumulus_test_relay_sproof_builder::RelayStateSproofBuilder::default();
-			state_proof_builder.para_id = para_id;
-			state_proof_builder.current_slot = relay_chain_slot;
-			state_proof_builder.included_para_head = Some(polkadot_primitives::HeadData(vec![]));
+			// parachain system.
+			// Without this, the pending functionality will fail.
+			let state_proof_builder = cumulus_test_relay_sproof_builder::RelayStateSproofBuilder {
+				para_id,
+				current_slot: relay_chain_slot,
+				included_para_head: Some(polkadot_primitives::HeadData(vec![])),
+				..Default::default()
+			};
 			let (relay_parent_storage_root, relay_chain_state) =
 				state_proof_builder.into_state_root_and_proof();
 			let parachain_inherent_data =
@@ -924,12 +926,14 @@ where
 				SlotDuration::from_millis(RELAY_CHAIN_SLOT_DURATION_MILLIS as u64),
 			);
 			// Create a mocked parachain inherent data provider to pass all validations in the
-			// parachain system. Without this, the pending functionality will fail.
-			let mut state_proof_builder =
-				cumulus_test_relay_sproof_builder::RelayStateSproofBuilder::default();
-			state_proof_builder.para_id = para_id;
-			state_proof_builder.current_slot = relay_chain_slot;
-			state_proof_builder.included_para_head = Some(polkadot_primitives::HeadData(vec![]));
+			// parachain system.
+			// Without this, the pending functionality will fail.
+			let state_proof_builder = cumulus_test_relay_sproof_builder::RelayStateSproofBuilder {
+				para_id,
+				current_slot: relay_chain_slot,
+				included_para_head: Some(polkadot_primitives::HeadData(vec![])),
+				..Default::default()
+			};
 			let (relay_parent_storage_root, relay_chain_state) =
 				state_proof_builder.into_state_root_and_proof();
 			let parachain_inherent_data =

pallet/account-migration/src/benchmarking.rs

@@ -79,18 +79,14 @@ mod benchmarks {
 					expired_time: Default::default(),
 					in_use: Default::default(),
 				};
-				<T as darwinia_deposit::Config>::MaxDeposits::get() as usize
+				512
 			],
 		);
 		<Ledgers<T>>::insert(
 			from,
 			OldLedger {
 				staked_ring: 1,
-				staked_deposits: BoundedVec::truncate_from(vec![
-					Default::default();
-					<T as darwinia_deposit::Config>::MaxDeposits::get()
-						as usize
-				]),
+				staked_deposits: BoundedVec::truncate_from(vec![Default::default(); 512]),
 				unstaking_ring: BoundedVec::truncate_from(vec![
 					(
 						Default::default(),

pallet/account-migration/src/lib.rs

@@ -108,10 +108,7 @@ pub mod pallet {
 		> + pallet_assets::Config<Balance = Balance, AssetId = AssetId>
 		+ pallet_balances::Config<Balance = Balance>
 		+ darwinia_deposit::Config
-		+ darwinia_staking::Config<
-			Deposit = darwinia_deposit::Pallet<Self>,
-			MaxDeposits = ConstU32<512>,
-		>
+		+ darwinia_staking::Config
 	{
 		/// Override the [`frame_system::Config::RuntimeEvent`].
 		type RuntimeEvent: From<Event> + IsType<<Self as frame_system::Config>::RuntimeEvent>;

pallet/deposit/src/lib.rs

@@ -235,7 +235,7 @@ pub mod pallet {
 				}
 			}
 
-			T::Ring::transfer(&account_id(), &who, to_claim.0, AllowDeath)?;
+			T::Ring::transfer(&account_id(), who, to_claim.0, AllowDeath)?;
 			T::Ring::transfer(&account_id(), &T::Treasury::get(), to_migrate.0, AllowDeath)?;
 			T::DepositMigrator::migrate(who.clone(), to_migrate.0, to_migrate.2)?;
 

pallet/staking/src/benchmarking.rs

@@ -18,7 +18,6 @@
 
 // darwinia
 use crate::*;
-use dc_types::UNIT;
 // polkadot-sdk
 use frame_benchmarking::v2;
 use frame_system::RawOrigin;
@@ -28,12 +27,10 @@ use sp_std::prelude::*;
 mod benchmarks {
 	// darwinia
 	use super::*;
-	// polkadot-sdk
-	use frame_support::traits::Currency;
 
 	#[benchmark]
 	fn unstake_all_for() {
-		let a = frame_benchmarking::whitelisted_caller();
+		let a = frame_benchmarking::whitelisted_caller::<T::AccountId>();
 		let a_cloned = a.clone();
 
 		// Worst-case scenario: