Part.2

darwinia-network · Oct 17, 2024 · 48443c5 · 48443c5
1 parent fb26050
commit 48443c5
Show file tree

Hide file tree

Showing 7 changed files with 311 additions and 1,001 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/pallet/staking/Cargo.toml b/pallet/staking/Cargo.toml
@@ -17,8 +17,6 @@ scale-info = { workspace = true }
 darwinia-ethtx-forwarder = { workspace = true }
 dc-inflation             = { workspace = true }
 dc-types                 = { workspace = true }
-# darwinia optional
-darwinia-deposit = { workspace = true, optional = true }
 
 # frontier
 fp-evm = { workspace = true }
@@ -39,9 +37,6 @@ frame-benchmarking = { workspace = true, optional = true }
 pretty_env_logger = { version = "0.5" }
 serde             = { version = "1.0", features = ["derive"] }
 
-# darwinia
-darwinia-deposit = { workspace = true, features = ["std"] }
-
 # polkadot-sdk
 pallet-balances  = { workspace = true, features = ["std"] }
 pallet-session   = { workspace = true, features = ["std"] }
@@ -61,8 +56,6 @@ std = [
 	# darwinia
 	"darwinia-ethtx-forwarder/std",
 	"dc-inflation/std",
-	# darwinia optional
-	"darwinia-deposit?/std",
 
 	# frontier
 	"fp-evm/std",
@@ -82,7 +75,6 @@ std = [
 
 runtime-benchmarks = [
 	# darwinia
-	"darwinia-deposit",
 	"darwinia-ethtx-forwarder/runtime-benchmarks",
 
 	# polkadot-sdk

diff --git a/pallet/staking/src/benchmarking.rs b/pallet/staking/src/benchmarking.rs
@@ -18,7 +18,6 @@
 
 // darwinia
 use crate::*;
-use darwinia_deposit::SimpleAsset;
 use dc_types::UNIT;
 // polkadot-sdk
 use frame_benchmarking::v2;
@@ -32,108 +31,20 @@ mod benchmarks {
 	// polkadot-sdk
 	use frame_support::traits::Currency;
 
-	fn deposit_for<T>(who: &T::AccountId, count: u32) -> Vec<DepositId<T>>
-	where
-		T: Config + darwinia_deposit::Config,
-	{
-		(0..count.min(<<T as darwinia_deposit::Config>::MaxDeposits>::get()) as u16)
-			.map(|x| {
-				<darwinia_deposit::Pallet<T>>::lock(
-					RawOrigin::Signed(who.to_owned()).into(),
-					UNIT,
-					1,
-				)
-				.unwrap();
-
-				x.into()
-			})
-			.collect()
-	}
-
 	#[benchmark]
-	fn stake(x: Linear<0, 1_023>) {
+	fn unstake_all_for() {
 		let a = frame_benchmarking::whitelisted_caller();
-
-		// Remove `+ 1` after https://github.com/paritytech/substrate/pull/13655.
-		<T as darwinia_deposit::Config>::Ring::make_free_balance_be(&a, 1_024 * UNIT + 1);
-		<T as darwinia_deposit::Config>::Kton::mint(&a, UNIT).unwrap();
-
-		let deposits = deposit_for::<T>(&a, x);
-
-		// Worst-case scenario:
-		//
-		// The total number of deposit items has reached `darwinia_deposits::Config::MaxDeposits`.
-		#[extrinsic_call]
-		_(RawOrigin::Signed(a), UNIT, deposits);
-	}
-
-	#[benchmark]
-	fn unstake(x: Linear<0, 1_023>) {
-		let a = frame_benchmarking::whitelisted_caller();
-
-		// Remove `+ 1` after https://github.com/paritytech/substrate/pull/13655.
-		<T as darwinia_deposit::Config>::Ring::make_free_balance_be(&a, 1_024 * UNIT + 1);
-		<T as darwinia_deposit::Config>::Kton::mint(&a, UNIT).unwrap();
-
-		let deposits = deposit_for::<T>(&a, x);
-
-		<Pallet<T>>::stake(RawOrigin::Signed(a.clone()).into(), UNIT, deposits.clone()).unwrap();
-
-		// Worst-case scenario:
-		//
-		// The total number of deposit items has reached `darwinia_deposits::Config::MaxDeposits`.
-		#[extrinsic_call]
-		_(RawOrigin::Signed(a), UNIT, deposits);
-	}
-
-	#[benchmark]
-	fn collect() {
-		let a = frame_benchmarking::whitelisted_caller();
-
-		// Worst-case scenario:
-		//
-		// None.
-		#[extrinsic_call]
-		_(RawOrigin::Signed(a), Default::default());
-	}
-
-	#[benchmark]
-	fn nominate() {
-		let a = frame_benchmarking::whitelisted_caller::<T::AccountId>();
 		let a_cloned = a.clone();
 
-		// Remove `+ 1` after https://github.com/paritytech/substrate/pull/13655.
-		<T as darwinia_deposit::Config>::Ring::make_free_balance_be(&a, UNIT + 1);
-
-		<Pallet<T>>::stake(RawOrigin::Signed(a.clone()).into(), UNIT, Default::default()).unwrap();
-		<Pallet<T>>::collect(RawOrigin::Signed(a.clone()).into(), Default::default()).unwrap();
-
 		// Worst-case scenario:
 		//
-		// Nominate the target collator successfully.
+		// The total number of deposit items has reached `darwinia_deposits::Config::MaxDeposits`.
 		#[extrinsic_call]
 		_(RawOrigin::Signed(a), a_cloned);
 	}
 
 	#[benchmark]
-	fn chill() {
-		let a = frame_benchmarking::whitelisted_caller::<T::AccountId>();
-
-		<T as darwinia_deposit::Config>::Ring::make_free_balance_be(&a, UNIT);
-
-		<Pallet<T>>::stake(RawOrigin::Signed(a.clone()).into(), UNIT, Default::default()).unwrap();
-		<Pallet<T>>::collect(RawOrigin::Signed(a.clone()).into(), Default::default()).unwrap();
-		<Pallet<T>>::nominate(RawOrigin::Signed(a.clone()).into(), a.clone()).unwrap();
-
-		// Worst-case scenario:
-		//
-		// Collect and nominate at the same time.
-		#[extrinsic_call]
-		_(RawOrigin::Signed(a));
-	}
-
-	#[benchmark]
-	fn payout() {
+	fn allocate_ring_staking_reward_of() {
 		let a = frame_benchmarking::whitelisted_caller::<T::AccountId>();
 		let a_cloned = a.clone();
 
@@ -142,12 +53,12 @@ mod benchmarks {
 	}
 
 	#[benchmark]
-	fn set_rate_limit() {
+	fn set_ring_staking_contract() {
 		// Worst-case scenario:
 		//
 		// Set successfully.
 		#[extrinsic_call]
-		_(RawOrigin::Root, 1);
+		_(RawOrigin::Root, frame_benchmarking::whitelisted_caller::<T::AccountId>());
 	}
 
 	#[benchmark]