Merge & fix

Signed-off-by: Xavier Lau <[email protected]>
darwinia-network · Jul 25, 2024 · 3de8ac1 · 3de8ac1
2 parents b5827bb + 9c8b0fc
commit 3de8ac1
Show file tree

Hide file tree

Showing 21 changed files with 786 additions and 461 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/pallet/account-migration/src/mock.rs b/pallet/account-migration/src/mock.rs
@@ -136,11 +136,12 @@ impl darwinia_deposit::Config for Runtime {
 impl darwinia_staking::Config for Runtime {
 	type Currency = Balances;
 	type Deposit = Deposit;
+	type ElectionResultProvider = ();
 	type IssuingManager = ();
 	type Kton = Dummy;
-	type KtonRewardDistributionContract = ();
 	type MaxDeposits = ();
 	type RewardToKton = ();
+	type RewardToRing = ();
 	type Ring = Dummy;
 	type RuntimeEvent = RuntimeEvent;
 	type ShouldEndSession = ();

diff --git a/pallet/staking/src/benchmarking.rs b/pallet/staking/src/benchmarking.rs
@@ -19,7 +19,7 @@
 // darwinia
 use crate::*;
 use darwinia_deposit::SimpleAsset;
-use dc_types::UNIT;
+use dc_primitives::UNIT;
 // polkadot-sdk
 use frame_benchmarking::v2;
 use frame_system::RawOrigin;
@@ -162,16 +162,25 @@ mod benchmarks {
 	fn set_rate_limit() {
 		// Worst-case scenario:
 		//
-		// Set max unstake ring successfully.
+		// Set successfully.
 		#[extrinsic_call]
 		_(RawOrigin::Root, 1);
 	}
 
+	#[benchmark]
+	fn set_kton_reward_distribution_contract() {
+		// Worst-case scenario:
+		//
+		// Set successfully.
+		#[extrinsic_call]
+		_(RawOrigin::Root, frame_benchmarking::whitelisted_caller::<T::AccountId>());
+	}
+
 	#[benchmark]
 	fn set_collator_count() {
 		// Worst-case scenario:
 		//
-		// Set collator count successfully.
+		// Set successfully.
 		#[extrinsic_call]
 		_(RawOrigin::Root, 1);
 	}