From 5e62782d27a18d8c57da28617181c66cd57076b5 Mon Sep 17 00:00:00 2001
From: Muharem <ismailov.m.h@gmail.com>
Date: Mon, 24 Jun 2024 14:31:55 +0200
Subject: [PATCH] treasury pallet: remove unused config parameters (#4831)
Remove unused config parameters `ApproveOrigin` and `OnSlash` from the
treasury pallet. Add `OnSlash` config parameter to the bounties and tips
pallets.
part of https://github.com/paritytech/polkadot-sdk/issues/3800
---
.../collectives-westend/src/fellowship/mod.rs | 10 +-------
polkadot/runtime/common/src/impls.rs | 2 --
polkadot/runtime/rococo/src/lib.rs | 3 +--
polkadot/runtime/westend/src/lib.rs | 2 --
prdoc/pr_4831.prdoc | 25 +++++++++++++++++++
substrate/bin/node/runtime/src/lib.rs | 7 ++----
substrate/frame/bounties/src/benchmarking.rs | 4 +--
substrate/frame/bounties/src/lib.rs | 3 +++
substrate/frame/bounties/src/tests.rs | 6 ++---
substrate/frame/child-bounties/src/tests.rs | 3 +--
substrate/frame/tips/src/lib.rs | 3 +++
substrate/frame/tips/src/tests.rs | 6 ++---
substrate/frame/treasury/src/lib.rs | 6 -----
substrate/frame/treasury/src/tests.rs | 2 --
14 files changed, 42 insertions(+), 40 deletions(-)
create mode 100644 prdoc/pr_4831.prdoc
diff --git a/cumulus/parachains/runtimes/collectives/collectives-westend/src/fellowship/mod.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/fellowship/mod.rs
index c7f8561b998..5e956bcdfee 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-westend/src/fellowship/mod.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-westend/src/fellowship/mod.rs
@@ -30,7 +30,7 @@ use frame_support::{
parameter_types,
traits::{
tokens::UnityOrOuterConversion, EitherOf, EitherOfDiverse, FromContains, MapSuccess,
- NeverEnsureOrigin, OriginTrait, TryWithMorphedArg,
+ OriginTrait, TryWithMorphedArg,
},
PalletId,
};
@@ -284,14 +284,6 @@ pub type FellowshipTreasuryPaymaster = PayOverXcm<
pub type FellowshipTreasuryInstance = pallet_treasury::Instance1;
impl pallet_treasury::Config<FellowshipTreasuryInstance> for Runtime {
- // The creation of proposals via the treasury pallet is deprecated and should not be utilized.
- // Instead, public or fellowship referenda should be used to propose and command the treasury
- // spend or spend_local dispatchables. The parameters below have been configured accordingly to
- // discourage its use.
- // TODO: replace with `NeverEnsure` once polkadot-sdk 1.5 is released.
- type ApproveOrigin = NeverEnsureOrigin<()>;
- type OnSlash = ();
-
type WeightInfo = weights::pallet_treasury::WeightInfo<Runtime>;
type PalletId = FellowshipTreasuryPalletId;
type Currency = Balances;
diff --git a/polkadot/runtime/common/src/impls.rs b/polkadot/runtime/common/src/impls.rs
index 72ece79f194..709cc69cdbe 100644
--- a/polkadot/runtime/common/src/impls.rs
+++ b/polkadot/runtime/common/src/impls.rs
@@ -328,10 +328,8 @@ mod tests {
impl pallet_treasury::Config for Test {
type Currency = pallet_balances::Pallet<Test>;
- type ApproveOrigin = frame_system::EnsureRoot<AccountId>;
type RejectOrigin = frame_system::EnsureRoot<AccountId>;
type RuntimeEvent = RuntimeEvent;
- type OnSlash = ();
type SpendPeriod = ();
type Burn = ();
type BurnDestination = ();
diff --git a/polkadot/runtime/rococo/src/lib.rs b/polkadot/runtime/rococo/src/lib.rs
index abbdca013ae..cb40a43a997 100644
--- a/polkadot/runtime/rococo/src/lib.rs
+++ b/polkadot/runtime/rococo/src/lib.rs
@@ -498,10 +498,8 @@ parameter_types! {
impl pallet_treasury::Config for Runtime {
type PalletId = TreasuryPalletId;
type Currency = Balances;
- type ApproveOrigin = EitherOfDiverse<EnsureRoot<AccountId>, Treasurer>;
type RejectOrigin = EitherOfDiverse<EnsureRoot<AccountId>, Treasurer>;
type RuntimeEvent = RuntimeEvent;
- type OnSlash = Treasury;
type SpendPeriod = SpendPeriod;
type Burn = Burn;
type BurnDestination = Society;
@@ -560,6 +558,7 @@ impl pallet_bounties::Config for Runtime {
type RuntimeEvent = RuntimeEvent;
type MaximumReasonLength = MaximumReasonLength;
type WeightInfo = weights::pallet_bounties::WeightInfo<Runtime>;
+ type OnSlash = Treasury;
}
parameter_types! {
diff --git a/polkadot/runtime/westend/src/lib.rs b/polkadot/runtime/westend/src/lib.rs
index 789e023730b..aefc4e2db37 100644
--- a/polkadot/runtime/westend/src/lib.rs
+++ b/polkadot/runtime/westend/src/lib.rs
@@ -683,10 +683,8 @@ parameter_types! {
impl pallet_treasury::Config for Runtime {
type PalletId = TreasuryPalletId;
type Currency = Balances;
- type ApproveOrigin = EitherOfDiverse<EnsureRoot<AccountId>, Treasurer>;
type RejectOrigin = EitherOfDiverse<EnsureRoot<AccountId>, Treasurer>;
type RuntimeEvent = RuntimeEvent;
- type OnSlash = Treasury;
type SpendPeriod = SpendPeriod;
type Burn = Burn;
type BurnDestination = ();
diff --git a/prdoc/pr_4831.prdoc b/prdoc/pr_4831.prdoc
new file mode 100644
index 00000000000..8629ead6e81
--- /dev/null
+++ b/prdoc/pr_4831.prdoc
@@ -0,0 +1,25 @@
+title: "treasury pallet: - remove unused config parameters"
+
+doc:
+ - audience: Runtime Dev
+ description: |
+ Remove unused config parameters `ApproveOrigin` and `OnSlash` from the treasury pallet.
+ Add `OnSlash` config parameter to the bounties and tips pallets.
+
+crates:
+ - name: pallet-treasury
+ bump: major
+ - name: pallet-bounties
+ bump: major
+ - name: pallet-tips
+ bump: major
+ - name: collectives-westend-runtime
+ bump: patch
+ - name: polkadot-runtime-common
+ bump: patch
+ - name: rococo-runtime
+ bump: patch
+ - name: westend-runtime
+ bump: patch
+ - name: kitchensink-runtime
+ bump: patch
diff --git a/substrate/bin/node/runtime/src/lib.rs b/substrate/bin/node/runtime/src/lib.rs
index ca041da2b50..9bde1bc5c85 100644
--- a/substrate/bin/node/runtime/src/lib.rs
+++ b/substrate/bin/node/runtime/src/lib.rs
@@ -1229,16 +1229,11 @@ parameter_types! {
impl pallet_treasury::Config for Runtime {
type PalletId = TreasuryPalletId;
type Currency = Balances;
- type ApproveOrigin = EitherOfDiverse<
- EnsureRoot<AccountId>,
- pallet_collective::EnsureProportionAtLeast<AccountId, CouncilCollective, 3, 5>,
- >;
type RejectOrigin = EitherOfDiverse<
EnsureRoot<AccountId>,
pallet_collective::EnsureProportionMoreThan<AccountId, CouncilCollective, 1, 2>,
>;
type RuntimeEvent = RuntimeEvent;
- type OnSlash = ();
type SpendPeriod = SpendPeriod;
type Burn = Burn;
type BurnDestination = ();
@@ -1292,6 +1287,7 @@ impl pallet_bounties::Config for Runtime {
type MaximumReasonLength = MaximumReasonLength;
type WeightInfo = pallet_bounties::weights::SubstrateWeight<Runtime>;
type ChildBountyManager = ChildBounties;
+ type OnSlash = Treasury;
}
parameter_types! {
@@ -1336,6 +1332,7 @@ impl pallet_tips::Config for Runtime {
type TipReportDepositBase = TipReportDepositBase;
type MaxTipAmount = ConstU128<{ 500 * DOLLARS }>;
type WeightInfo = pallet_tips::weights::SubstrateWeight<Runtime>;
+ type OnSlash = Treasury;
}
parameter_types! {
diff --git a/substrate/frame/bounties/src/benchmarking.rs b/substrate/frame/bounties/src/benchmarking.rs
index 3558847c8fe..a009b132f05 100644
--- a/substrate/frame/bounties/src/benchmarking.rs
+++ b/substrate/frame/bounties/src/benchmarking.rs
@@ -177,7 +177,7 @@ benchmarks_instance_pallet! {
Bounties::<T, I>::propose_bounty(RawOrigin::Signed(caller).into(), value, reason)?;
let bounty_id = BountyCount::<T, I>::get() - 1;
let approve_origin =
- T::ApproveOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
+ T::RejectOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
}: close_bounty<T::RuntimeOrigin>(approve_origin, bounty_id)
close_bounty_active {
@@ -186,7 +186,7 @@ benchmarks_instance_pallet! {
Treasury::<T, I>::on_initialize(BlockNumberFor::<T>::zero());
let bounty_id = BountyCount::<T, I>::get() - 1;
let approve_origin =
- T::ApproveOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
+ T::RejectOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?;
}: close_bounty<T::RuntimeOrigin>(approve_origin, bounty_id)
verify {
assert_last_event::<T, I>(Event::BountyCanceled { index: bounty_id }.into())
diff --git a/substrate/frame/bounties/src/lib.rs b/substrate/frame/bounties/src/lib.rs
index c930868bf10..e27ecbda3a2 100644
--- a/substrate/frame/bounties/src/lib.rs
+++ b/substrate/frame/bounties/src/lib.rs
@@ -245,6 +245,9 @@ pub mod pallet {
/// The child bounty manager.
type ChildBountyManager: ChildBountyManager<BalanceOf<Self, I>>;
+
+ /// Handler for the unbalanced decrease when slashing for a rejected bounty.
+ type OnSlash: OnUnbalanced<pallet_treasury::NegativeImbalanceOf<Self, I>>;
}
#[pallet::error]
diff --git a/substrate/frame/bounties/src/tests.rs b/substrate/frame/bounties/src/tests.rs
index 205765e9286..9f3a52263ec 100644
--- a/substrate/frame/bounties/src/tests.rs
+++ b/substrate/frame/bounties/src/tests.rs
@@ -83,10 +83,8 @@ parameter_types! {
impl pallet_treasury::Config for Test {
type PalletId = TreasuryPalletId;
type Currency = pallet_balances::Pallet<Test>;
- type ApproveOrigin = frame_system::EnsureRoot<u128>;
type RejectOrigin = frame_system::EnsureRoot<u128>;
type RuntimeEvent = RuntimeEvent;
- type OnSlash = ();
type SpendPeriod = ConstU64<2>;
type Burn = Burn;
type BurnDestination = (); // Just gets burned.
@@ -107,10 +105,8 @@ impl pallet_treasury::Config for Test {
impl pallet_treasury::Config<Instance1> for Test {
type PalletId = TreasuryPalletId2;
type Currency = pallet_balances::Pallet<Test>;
- type ApproveOrigin = frame_system::EnsureRoot<u128>;
type RejectOrigin = frame_system::EnsureRoot<u128>;
type RuntimeEvent = RuntimeEvent;
- type OnSlash = ();
type SpendPeriod = ConstU64<2>;
type Burn = Burn;
type BurnDestination = (); // Just gets burned.
@@ -149,6 +145,7 @@ impl Config for Test {
type MaximumReasonLength = ConstU32<16384>;
type WeightInfo = ();
type ChildBountyManager = ();
+ type OnSlash = ();
}
impl Config<Instance1> for Test {
@@ -164,6 +161,7 @@ impl Config<Instance1> for Test {
type MaximumReasonLength = ConstU32<16384>;
type WeightInfo = ();
type ChildBountyManager = ();
+ type OnSlash = ();
}
type TreasuryError = pallet_treasury::Error<Test>;
diff --git a/substrate/frame/child-bounties/src/tests.rs b/substrate/frame/child-bounties/src/tests.rs
index be6fd62bb4c..125844fa70e 100644
--- a/substrate/frame/child-bounties/src/tests.rs
+++ b/substrate/frame/child-bounties/src/tests.rs
@@ -83,10 +83,8 @@ parameter_types! {
impl pallet_treasury::Config for Test {
type PalletId = TreasuryPalletId;
type Currency = pallet_balances::Pallet<Test>;
- type ApproveOrigin = frame_system::EnsureRoot<u128>;
type RejectOrigin = frame_system::EnsureRoot<u128>;
type RuntimeEvent = RuntimeEvent;
- type OnSlash = ();
type SpendPeriod = ConstU64<2>;
type Burn = Burn;
type BurnDestination = ();
@@ -123,6 +121,7 @@ impl pallet_bounties::Config for Test {
type MaximumReasonLength = ConstU32<300>;
type WeightInfo = ();
type ChildBountyManager = ChildBounties;
+ type OnSlash = ();
}
impl pallet_child_bounties::Config for Test {
type RuntimeEvent = RuntimeEvent;
diff --git a/substrate/frame/tips/src/lib.rs b/substrate/frame/tips/src/lib.rs
index 8c360fb57d7..e16ee041fcd 100644
--- a/substrate/frame/tips/src/lib.rs
+++ b/substrate/frame/tips/src/lib.rs
@@ -169,6 +169,9 @@ pub mod pallet {
/// update weights file when altering this method.
type Tippers: SortedMembers<Self::AccountId> + ContainsLengthBound;
+ /// Handler for the unbalanced decrease when slashing for a removed tip.
+ type OnSlash: OnUnbalanced<NegativeImbalanceOf<Self, I>>;
+
/// Weight information for extrinsics in this pallet.
type WeightInfo: WeightInfo;
}
diff --git a/substrate/frame/tips/src/tests.rs b/substrate/frame/tips/src/tests.rs
index ad987cc6cd6..7e4a9368ad0 100644
--- a/substrate/frame/tips/src/tests.rs
+++ b/substrate/frame/tips/src/tests.rs
@@ -104,10 +104,8 @@ parameter_types! {
impl pallet_treasury::Config for Test {
type PalletId = TreasuryPalletId;
type Currency = pallet_balances::Pallet<Test>;
- type ApproveOrigin = frame_system::EnsureRoot<u128>;
type RejectOrigin = frame_system::EnsureRoot<u128>;
type RuntimeEvent = RuntimeEvent;
- type OnSlash = ();
type SpendPeriod = ConstU64<2>;
type Burn = Burn;
type BurnDestination = (); // Just gets burned.
@@ -128,10 +126,8 @@ impl pallet_treasury::Config for Test {
impl pallet_treasury::Config<Instance1> for Test {
type PalletId = TreasuryPalletId2;
type Currency = pallet_balances::Pallet<Test>;
- type ApproveOrigin = frame_system::EnsureRoot<u128>;
type RejectOrigin = frame_system::EnsureRoot<u128>;
type RuntimeEvent = RuntimeEvent;
- type OnSlash = ();
type SpendPeriod = ConstU64<2>;
type Burn = Burn;
type BurnDestination = (); // Just gets burned.
@@ -162,6 +158,7 @@ impl Config for Test {
type DataDepositPerByte = ConstU64<1>;
type MaxTipAmount = ConstU64<10_000_000>;
type RuntimeEvent = RuntimeEvent;
+ type OnSlash = ();
type WeightInfo = ();
}
@@ -174,6 +171,7 @@ impl Config<Instance1> for Test {
type DataDepositPerByte = ConstU64<1>;
type MaxTipAmount = ConstU64<10_000_000>;
type RuntimeEvent = RuntimeEvent;
+ type OnSlash = ();
type WeightInfo = ();
}
diff --git a/substrate/frame/treasury/src/lib.rs b/substrate/frame/treasury/src/lib.rs
index 4677a0e0335..b437e5ef137 100644
--- a/substrate/frame/treasury/src/lib.rs
+++ b/substrate/frame/treasury/src/lib.rs
@@ -205,9 +205,6 @@ pub mod pallet {
/// The staking balance.
type Currency: Currency<Self::AccountId> + ReservableCurrency<Self::AccountId>;
- /// Origin from which approvals must come.
- type ApproveOrigin: EnsureOrigin<Self::RuntimeOrigin>;
-
/// Origin from which rejections must come.
type RejectOrigin: EnsureOrigin<Self::RuntimeOrigin>;
@@ -215,9 +212,6 @@ pub mod pallet {
type RuntimeEvent: From<Event<Self, I>>
+ IsType<<Self as frame_system::Config>::RuntimeEvent>;
- /// Handler for the unbalanced decrease when slashing for a rejected proposal or bounty.
- type OnSlash: OnUnbalanced<NegativeImbalanceOf<Self, I>>;
-
/// Period between successive spends.
#[pallet::constant]
type SpendPeriod: Get<BlockNumberFor<Self>>;
diff --git a/substrate/frame/treasury/src/tests.rs b/substrate/frame/treasury/src/tests.rs
index 94f5e6b7094..97b73592819 100644
--- a/substrate/frame/treasury/src/tests.rs
+++ b/substrate/frame/treasury/src/tests.rs
@@ -164,10 +164,8 @@ impl<N: Get<u64>> ConversionFromAssetBalance<u64, u32, u64> for MulBy<N> {
impl Config for Test {
type PalletId = TreasuryPalletId;
type Currency = pallet_balances::Pallet<Test>;
- type ApproveOrigin = frame_system::EnsureRoot<u128>;
type RejectOrigin = frame_system::EnsureRoot<u128>;
type RuntimeEvent = RuntimeEvent;
- type OnSlash = ();
type SpendPeriod = ConstU64<2>;
type Burn = Burn;
type BurnDestination = (); // Just gets burned.
--
GitLab