Companion of paritytech/polkadot-sdk#3820

darwinia-network · Dec 25, 2024 · 33b3fee · 33b3fee
1 parent b4ac1a3
commit 33b3fee
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 111 deletions.
diff --git a/pallet/staking/src/mock.rs b/pallet/staking/src/mock.rs
@@ -177,9 +177,6 @@ impl pallet_treasury::Config for Runtime {
 	type PalletId = TreasuryPalletId;
 	type Paymaster = frame_support::traits::tokens::PayFromAccount<Balances, TreasuryAccount>;
 	type PayoutPeriod = ();
-	type ProposalBond = ();
-	type ProposalBondMaximum = ();
-	type ProposalBondMinimum = ();
 	type RejectOrigin = frame_system::EnsureRoot<AccountId>;
 	type RuntimeEvent = RuntimeEvent;
 	type SpendFunds = ();

diff --git a/runtime/crab/src/pallets/governance.rs b/runtime/crab/src/pallets/governance.rs
@@ -100,10 +100,6 @@ impl pallet_whitelist::Config for Runtime {
 	type WhitelistOrigin = RootOrAtLeastFourFifth<TechnicalCollective>;
 }
 
-frame_support::parameter_types! {
-	pub const ProposalBond: sp_runtime::Permill = sp_runtime::Permill::from_percent(5);
-}
-
 impl pallet_treasury::Config for Runtime {
 	type ApproveOrigin = RootOr<GeneralAdmin>;
 	type AssetKind = ();
@@ -121,9 +117,6 @@ impl pallet_treasury::Config for Runtime {
 	type Paymaster =
 		frame_support::traits::tokens::PayFromAccount<Balances, pallet_config::TreasuryAccount>;
 	type PayoutPeriod = ConstU32<{ 14 * DAYS }>;
-	type ProposalBond = ProposalBond;
-	type ProposalBondMaximum = ();
-	type ProposalBondMinimum = ConstU128<DARWINIA_PROPOSAL_REQUIREMENT>;
 	type RejectOrigin = RootOr<GeneralAdmin>;
 	type RuntimeEvent = RuntimeEvent;
 	type SpendFunds = ();

diff --git a/runtime/crab/src/weights/pallet_treasury.rs b/runtime/crab/src/weights/pallet_treasury.rs
@@ -71,53 +71,6 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> {
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	/// Storage: `Treasury::ProposalCount` (r:1 w:1)
-	/// Proof: `Treasury::ProposalCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `Treasury::Proposals` (r:0 w:1)
-	/// Proof: `Treasury::Proposals` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	fn propose_spend() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `208`
-		//  Estimated: `1489`
-		// Minimum execution time: 21_000_000 picoseconds.
-		Weight::from_parts(22_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 1489))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Treasury::Proposals` (r:1 w:1)
-	/// Proof: `Treasury::Proposals` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(116), added: 2591, mode: `MaxEncodedLen`)
-	fn reject_proposal() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `470`
-		//  Estimated: `6172`
-		// Minimum execution time: 34_000_000 picoseconds.
-		Weight::from_parts(34_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 6172))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: `Treasury::Proposals` (r:1 w:0)
-	/// Proof: `Treasury::Proposals` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Treasury::Approvals` (r:1 w:1)
-	/// Proof: `Treasury::Approvals` (`max_values`: Some(1), `max_size`: Some(402), added: 897, mode: `MaxEncodedLen`)
-	/// The range of component `p` is `[0, 99]`.
-	fn approve_proposal(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `470 + p * (8 ±0)`
-		//  Estimated: `3549`
-		// Minimum execution time: 6_000_000 picoseconds.
-		Weight::from_parts(7_881_848, 0)
-			.saturating_add(Weight::from_parts(0, 3549))
-			// Standard Error: 759
-			.saturating_add(Weight::from_parts(18_240, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Treasury::Approvals` (r:1 w:1)
-	/// Proof: `Treasury::Approvals` (`max_values`: Some(1), `max_size`: Some(402), added: 897, mode: `MaxEncodedLen`)
 	fn remove_approval() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `127`

diff --git a/runtime/darwinia/src/pallets/governance.rs b/runtime/darwinia/src/pallets/governance.rs
@@ -100,10 +100,6 @@ impl pallet_whitelist::Config for Runtime {
 	type WhitelistOrigin = RootOrAtLeastFourFifth<TechnicalCollective>;
 }
 
-frame_support::parameter_types! {
-	pub const ProposalBond: sp_runtime::Permill = sp_runtime::Permill::from_percent(5);
-}
-
 impl pallet_treasury::Config for Runtime {
 	type ApproveOrigin = RootOr<GeneralAdmin>;
 	type AssetKind = ();
@@ -121,9 +117,6 @@ impl pallet_treasury::Config for Runtime {
 	type Paymaster =
 		frame_support::traits::tokens::PayFromAccount<Balances, pallet_config::TreasuryAccount>;
 	type PayoutPeriod = ConstU32<{ 28 * DAYS }>;
-	type ProposalBond = ProposalBond;
-	type ProposalBondMaximum = ();
-	type ProposalBondMinimum = ConstU128<DARWINIA_PROPOSAL_REQUIREMENT>;
 	type RejectOrigin = RootOr<GeneralAdmin>;
 	type RuntimeEvent = RuntimeEvent;
 	type SpendFunds = ();

diff --git a/runtime/darwinia/src/weights/pallet_treasury.rs b/runtime/darwinia/src/weights/pallet_treasury.rs
@@ -71,53 +71,6 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> {
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	/// Storage: `Treasury::ProposalCount` (r:1 w:1)
-	/// Proof: `Treasury::ProposalCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `Treasury::Proposals` (r:0 w:1)
-	/// Proof: `Treasury::Proposals` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	fn propose_spend() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `275`
-		//  Estimated: `1489`
-		// Minimum execution time: 21_000_000 picoseconds.
-		Weight::from_parts(21_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 1489))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Treasury::Proposals` (r:1 w:1)
-	/// Proof: `Treasury::Proposals` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(116), added: 2591, mode: `MaxEncodedLen`)
-	fn reject_proposal() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `571`
-		//  Estimated: `6172`
-		// Minimum execution time: 34_000_000 picoseconds.
-		Weight::from_parts(34_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 6172))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: `Treasury::Proposals` (r:1 w:0)
-	/// Proof: `Treasury::Proposals` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// Storage: `Treasury::Approvals` (r:1 w:1)
-	/// Proof: `Treasury::Approvals` (`max_values`: Some(1), `max_size`: Some(402), added: 897, mode: `MaxEncodedLen`)
-	/// The range of component `p` is `[0, 99]`.
-	fn approve_proposal(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `537 + p * (8 ±0)`
-		//  Estimated: `3549`
-		// Minimum execution time: 6_000_000 picoseconds.
-		Weight::from_parts(8_025_378, 0)
-			.saturating_add(Weight::from_parts(0, 3549))
-			// Standard Error: 757
-			.saturating_add(Weight::from_parts(17_148, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Treasury::Approvals` (r:1 w:1)
-	/// Proof: `Treasury::Approvals` (`max_values`: Some(1), `max_size`: Some(402), added: 897, mode: `MaxEncodedLen`)
 	fn remove_approval() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `194`