From 385401226868778b22142905d235a1848bd6ff52 Mon Sep 17 00:00:00 2001 From: Muharem Ismailov Date: Thu, 10 Aug 2023 15:35:06 +0200 Subject: [PATCH] Pallets: Treasury deprecate `propose_spend` dispatchable (#14538) * treasury deprecate dispatchables * allow deprecated * allow deprecated for benchmarks * allow deprecated in tests * allow deprecated for bounties tests * deprecation month --- substrate/frame/bounties/src/tests.rs | 135 ++++++++++++--- substrate/frame/treasury/src/benchmarking.rs | 6 + substrate/frame/treasury/src/lib.rs | 12 ++ substrate/frame/treasury/src/tests.rs | 165 +++++++++++++++---- 4 files changed, 258 insertions(+), 60 deletions(-) diff --git a/substrate/frame/bounties/src/tests.rs b/substrate/frame/bounties/src/tests.rs index 355483ddac..a6fb89bb86 100644 --- a/substrate/frame/bounties/src/tests.rs +++ b/substrate/frame/bounties/src/tests.rs @@ -228,7 +228,10 @@ fn minting_works() { #[test] fn spend_proposal_takes_min_deposit() { new_test_ext().execute_with(|| { - assert_ok!(Treasury::propose_spend(RuntimeOrigin::signed(0), 1, 3)); + assert_ok!({ + #[allow(deprecated)] + Treasury::propose_spend(RuntimeOrigin::signed(0), 1, 3) + }); assert_eq!(Balances::free_balance(0), 99); assert_eq!(Balances::reserved_balance(0), 1); }); @@ -237,7 +240,10 @@ fn spend_proposal_takes_min_deposit() { #[test] fn spend_proposal_takes_proportional_deposit() { new_test_ext().execute_with(|| { - assert_ok!(Treasury::propose_spend(RuntimeOrigin::signed(0), 100, 3)); + assert_ok!({ + #[allow(deprecated)] + Treasury::propose_spend(RuntimeOrigin::signed(0), 100, 3) + }); assert_eq!(Balances::free_balance(0), 95); assert_eq!(Balances::reserved_balance(0), 5); }); @@ -247,7 +253,10 @@ fn spend_proposal_takes_proportional_deposit() { fn spend_proposal_fails_when_proposer_poor() { new_test_ext().execute_with(|| { assert_noop!( - Treasury::propose_spend(RuntimeOrigin::signed(2), 100, 3), + { + #[allow(deprecated)] + Treasury::propose_spend(RuntimeOrigin::signed(2), 100, 3) + }, TreasuryError::InsufficientProposersBalance, ); }); @@ -258,8 +267,14 @@ fn accepted_spend_proposal_ignored_outside_spend_period() { new_test_ext().execute_with(|| { Balances::make_free_balance_be(&Treasury::account_id(), 101); - assert_ok!(Treasury::propose_spend(RuntimeOrigin::signed(0), 100, 3)); - assert_ok!(Treasury::approve_proposal(RuntimeOrigin::root(), 0)); + assert_ok!({ + #[allow(deprecated)] + Treasury::propose_spend(RuntimeOrigin::signed(0), 100, 3) + }); + assert_ok!({ + #[allow(deprecated)] + Treasury::approve_proposal(RuntimeOrigin::root(), 0) + }); >::on_initialize(1); assert_eq!(Balances::free_balance(3), 0); @@ -285,8 +300,14 @@ fn rejected_spend_proposal_ignored_on_spend_period() { new_test_ext().execute_with(|| { Balances::make_free_balance_be(&Treasury::account_id(), 101); - assert_ok!(Treasury::propose_spend(RuntimeOrigin::signed(0), 100, 3)); - assert_ok!(Treasury::reject_proposal(RuntimeOrigin::root(), 0)); + assert_ok!({ + #[allow(deprecated)] + Treasury::propose_spend(RuntimeOrigin::signed(0), 100, 3) + }); + assert_ok!({ + #[allow(deprecated)] + Treasury::reject_proposal(RuntimeOrigin::root(), 0) + }); >::on_initialize(2); assert_eq!(Balances::free_balance(3), 0); @@ -299,10 +320,19 @@ fn reject_already_rejected_spend_proposal_fails() { new_test_ext().execute_with(|| { Balances::make_free_balance_be(&Treasury::account_id(), 101); - assert_ok!(Treasury::propose_spend(RuntimeOrigin::signed(0), 100, 3)); - assert_ok!(Treasury::reject_proposal(RuntimeOrigin::root(), 0)); + assert_ok!({ + #[allow(deprecated)] + Treasury::propose_spend(RuntimeOrigin::signed(0), 100, 3) + }); + assert_ok!({ + #[allow(deprecated)] + Treasury::reject_proposal(RuntimeOrigin::root(), 0) + }); assert_noop!( - Treasury::reject_proposal(RuntimeOrigin::root(), 0), + { + #[allow(deprecated)] + Treasury::reject_proposal(RuntimeOrigin::root(), 0) + }, TreasuryError::InvalidIndex ); }); @@ -312,7 +342,10 @@ fn reject_already_rejected_spend_proposal_fails() { fn reject_non_existent_spend_proposal_fails() { new_test_ext().execute_with(|| { assert_noop!( - Treasury::reject_proposal(RuntimeOrigin::root(), 0), + { + #[allow(deprecated)] + Treasury::reject_proposal(RuntimeOrigin::root(), 0) + }, pallet_treasury::Error::::InvalidIndex ); }); @@ -322,7 +355,10 @@ fn reject_non_existent_spend_proposal_fails() { fn accept_non_existent_spend_proposal_fails() { new_test_ext().execute_with(|| { assert_noop!( - Treasury::approve_proposal(RuntimeOrigin::root(), 0), + { + #[allow(deprecated)] + Treasury::approve_proposal(RuntimeOrigin::root(), 0) + }, TreasuryError::InvalidIndex ); }); @@ -333,10 +369,19 @@ fn accept_already_rejected_spend_proposal_fails() { new_test_ext().execute_with(|| { Balances::make_free_balance_be(&Treasury::account_id(), 101); - assert_ok!(Treasury::propose_spend(RuntimeOrigin::signed(0), 100, 3)); - assert_ok!(Treasury::reject_proposal(RuntimeOrigin::root(), 0)); + assert_ok!({ + #[allow(deprecated)] + Treasury::propose_spend(RuntimeOrigin::signed(0), 100, 3) + }); + assert_ok!({ + #[allow(deprecated)] + Treasury::reject_proposal(RuntimeOrigin::root(), 0) + }); assert_noop!( - Treasury::approve_proposal(RuntimeOrigin::root(), 0), + { + #[allow(deprecated)] + Treasury::approve_proposal(RuntimeOrigin::root(), 0) + }, TreasuryError::InvalidIndex ); }); @@ -348,8 +393,14 @@ fn accepted_spend_proposal_enacted_on_spend_period() { Balances::make_free_balance_be(&Treasury::account_id(), 101); assert_eq!(Treasury::pot(), 100); - assert_ok!(Treasury::propose_spend(RuntimeOrigin::signed(0), 100, 3)); - assert_ok!(Treasury::approve_proposal(RuntimeOrigin::root(), 0)); + assert_ok!({ + #[allow(deprecated)] + Treasury::propose_spend(RuntimeOrigin::signed(0), 100, 3) + }); + assert_ok!({ + #[allow(deprecated)] + Treasury::approve_proposal(RuntimeOrigin::root(), 0) + }); >::on_initialize(2); assert_eq!(Balances::free_balance(3), 100); @@ -363,8 +414,14 @@ fn pot_underflow_should_not_diminish() { Balances::make_free_balance_be(&Treasury::account_id(), 101); assert_eq!(Treasury::pot(), 100); - assert_ok!(Treasury::propose_spend(RuntimeOrigin::signed(0), 150, 3)); - assert_ok!(Treasury::approve_proposal(RuntimeOrigin::root(), 0)); + assert_ok!({ + #[allow(deprecated)] + Treasury::propose_spend(RuntimeOrigin::signed(0), 150, 3) + }); + assert_ok!({ + #[allow(deprecated)] + Treasury::approve_proposal(RuntimeOrigin::root(), 0) + }); >::on_initialize(2); assert_eq!(Treasury::pot(), 100); // Pot hasn't changed @@ -385,14 +442,26 @@ fn treasury_account_doesnt_get_deleted() { assert_eq!(Treasury::pot(), 100); let treasury_balance = Balances::free_balance(&Treasury::account_id()); - assert_ok!(Treasury::propose_spend(RuntimeOrigin::signed(0), treasury_balance, 3)); - assert_ok!(Treasury::approve_proposal(RuntimeOrigin::root(), 0)); + assert_ok!({ + #[allow(deprecated)] + Treasury::propose_spend(RuntimeOrigin::signed(0), treasury_balance, 3) + }); + assert_ok!({ + #[allow(deprecated)] + Treasury::approve_proposal(RuntimeOrigin::root(), 0) + }); >::on_initialize(2); assert_eq!(Treasury::pot(), 100); // Pot hasn't changed - assert_ok!(Treasury::propose_spend(RuntimeOrigin::signed(0), Treasury::pot(), 3)); - assert_ok!(Treasury::approve_proposal(RuntimeOrigin::root(), 1)); + assert_ok!({ + #[allow(deprecated)] + Treasury::propose_spend(RuntimeOrigin::signed(0), Treasury::pot(), 3) + }); + assert_ok!({ + #[allow(deprecated)] + Treasury::approve_proposal(RuntimeOrigin::root(), 1) + }); >::on_initialize(4); assert_eq!(Treasury::pot(), 0); // Pot is emptied @@ -415,10 +484,22 @@ fn inexistent_account_works() { assert_eq!(Balances::free_balance(Treasury::account_id()), 0); // Account does not exist assert_eq!(Treasury::pot(), 0); // Pot is empty - assert_ok!(Treasury::propose_spend(RuntimeOrigin::signed(0), 99, 3)); - assert_ok!(Treasury::approve_proposal(RuntimeOrigin::root(), 0)); - assert_ok!(Treasury::propose_spend(RuntimeOrigin::signed(0), 1, 3)); - assert_ok!(Treasury::approve_proposal(RuntimeOrigin::root(), 1)); + assert_ok!({ + #[allow(deprecated)] + Treasury::propose_spend(RuntimeOrigin::signed(0), 99, 3) + }); + assert_ok!({ + #[allow(deprecated)] + Treasury::approve_proposal(RuntimeOrigin::root(), 0) + }); + assert_ok!({ + #[allow(deprecated)] + Treasury::propose_spend(RuntimeOrigin::signed(0), 1, 3) + }); + assert_ok!({ + #[allow(deprecated)] + Treasury::approve_proposal(RuntimeOrigin::root(), 1) + }); >::on_initialize(2); assert_eq!(Treasury::pot(), 0); // Pot hasn't changed assert_eq!(Balances::free_balance(3), 0); // Balance of `3` hasn't changed diff --git a/substrate/frame/treasury/src/benchmarking.rs b/substrate/frame/treasury/src/benchmarking.rs index 449549d6c5..b8a53e06f2 100644 --- a/substrate/frame/treasury/src/benchmarking.rs +++ b/substrate/frame/treasury/src/benchmarking.rs @@ -47,8 +47,10 @@ fn setup_proposal, I: 'static>( fn create_approved_proposals, I: 'static>(n: u32) -> Result<(), &'static str> { for i in 0..n { let (caller, value, lookup) = setup_proposal::(i); + #[allow(deprecated)] Treasury::::propose_spend(RawOrigin::Signed(caller).into(), value, lookup)?; let proposal_id = >::get() - 1; + #[allow(deprecated)] Treasury::::approve_proposal(RawOrigin::Root.into(), proposal_id)?; } ensure!(>::get().len() == n as usize, "Not all approved"); @@ -93,6 +95,7 @@ benchmarks_instance_pallet! { reject_proposal { let (caller, value, beneficiary_lookup) = setup_proposal::(SEED); + #[allow(deprecated)] Treasury::::propose_spend( RawOrigin::Signed(caller).into(), value, @@ -107,6 +110,7 @@ benchmarks_instance_pallet! { let p in 0 .. T::MaxApprovals::get() - 1; create_approved_proposals::(p)?; let (caller, value, beneficiary_lookup) = setup_proposal::(SEED); + #[allow(deprecated)] Treasury::::propose_spend( RawOrigin::Signed(caller).into(), value, @@ -119,12 +123,14 @@ benchmarks_instance_pallet! { remove_approval { let (caller, value, beneficiary_lookup) = setup_proposal::(SEED); + #[allow(deprecated)] Treasury::::propose_spend( RawOrigin::Signed(caller).into(), value, beneficiary_lookup )?; let proposal_id = Treasury::::proposal_count() - 1; + #[allow(deprecated)] Treasury::::approve_proposal(RawOrigin::Root.into(), proposal_id)?; let reject_origin = T::RejectOrigin::try_successful_origin().map_err(|_| BenchmarkError::Weightless)?; diff --git a/substrate/frame/treasury/src/lib.rs b/substrate/frame/treasury/src/lib.rs index 49be4d91a4..730fae2a4e 100644 --- a/substrate/frame/treasury/src/lib.rs +++ b/substrate/frame/treasury/src/lib.rs @@ -336,6 +336,10 @@ pub mod pallet { /// - O(1) #[pallet::call_index(0)] #[pallet::weight(T::WeightInfo::propose_spend())] + #[allow(deprecated)] + #[deprecated( + note = "`propose_spend` will be removed in February 2024. Use `spend` instead." + )] pub fn propose_spend( origin: OriginFor, #[pallet::compact] value: BalanceOf, @@ -364,6 +368,10 @@ pub mod pallet { /// - O(1) #[pallet::call_index(1)] #[pallet::weight((T::WeightInfo::reject_proposal(), DispatchClass::Operational))] + #[allow(deprecated)] + #[deprecated( + note = "`reject_proposal` will be removed in February 2024. Use `spend` instead." + )] pub fn reject_proposal( origin: OriginFor, #[pallet::compact] proposal_id: ProposalIndex, @@ -392,6 +400,10 @@ pub mod pallet { /// - O(1). #[pallet::call_index(2)] #[pallet::weight((T::WeightInfo::approve_proposal(T::MaxApprovals::get()), DispatchClass::Operational))] + #[allow(deprecated)] + #[deprecated( + note = "`approve_proposal` will be removed in February 2024. Use `spend` instead." + )] pub fn approve_proposal( origin: OriginFor, #[pallet::compact] proposal_id: ProposalIndex, diff --git a/substrate/frame/treasury/src/tests.rs b/substrate/frame/treasury/src/tests.rs index 79497d5586..ba45d5f6ff 100644 --- a/substrate/frame/treasury/src/tests.rs +++ b/substrate/frame/treasury/src/tests.rs @@ -216,7 +216,10 @@ fn minting_works() { #[test] fn spend_proposal_takes_min_deposit() { new_test_ext().execute_with(|| { - assert_ok!(Treasury::propose_spend(RuntimeOrigin::signed(0), 1, 3)); + assert_ok!({ + #[allow(deprecated)] + Treasury::propose_spend(RuntimeOrigin::signed(0), 1, 3) + }); assert_eq!(Balances::free_balance(0), 99); assert_eq!(Balances::reserved_balance(0), 1); }); @@ -225,7 +228,10 @@ fn spend_proposal_takes_min_deposit() { #[test] fn spend_proposal_takes_proportional_deposit() { new_test_ext().execute_with(|| { - assert_ok!(Treasury::propose_spend(RuntimeOrigin::signed(0), 100, 3)); + assert_ok!({ + #[allow(deprecated)] + Treasury::propose_spend(RuntimeOrigin::signed(0), 100, 3) + }); assert_eq!(Balances::free_balance(0), 95); assert_eq!(Balances::reserved_balance(0), 5); }); @@ -235,7 +241,10 @@ fn spend_proposal_takes_proportional_deposit() { fn spend_proposal_fails_when_proposer_poor() { new_test_ext().execute_with(|| { assert_noop!( - Treasury::propose_spend(RuntimeOrigin::signed(2), 100, 3), + { + #[allow(deprecated)] + Treasury::propose_spend(RuntimeOrigin::signed(2), 100, 3) + }, Error::::InsufficientProposersBalance, ); }); @@ -246,8 +255,14 @@ fn accepted_spend_proposal_ignored_outside_spend_period() { new_test_ext().execute_with(|| { Balances::make_free_balance_be(&Treasury::account_id(), 101); - assert_ok!(Treasury::propose_spend(RuntimeOrigin::signed(0), 100, 3)); - assert_ok!(Treasury::approve_proposal(RuntimeOrigin::root(), 0)); + assert_ok!({ + #[allow(deprecated)] + Treasury::propose_spend(RuntimeOrigin::signed(0), 100, 3) + }); + assert_ok!({ + #[allow(deprecated)] + Treasury::approve_proposal(RuntimeOrigin::root(), 0) + }); >::on_initialize(1); assert_eq!(Balances::free_balance(3), 0); @@ -273,8 +288,14 @@ fn rejected_spend_proposal_ignored_on_spend_period() { new_test_ext().execute_with(|| { Balances::make_free_balance_be(&Treasury::account_id(), 101); - assert_ok!(Treasury::propose_spend(RuntimeOrigin::signed(0), 100, 3)); - assert_ok!(Treasury::reject_proposal(RuntimeOrigin::root(), 0)); + assert_ok!({ + #[allow(deprecated)] + Treasury::propose_spend(RuntimeOrigin::signed(0), 100, 3) + }); + assert_ok!({ + #[allow(deprecated)] + Treasury::reject_proposal(RuntimeOrigin::root(), 0) + }); >::on_initialize(2); assert_eq!(Balances::free_balance(3), 0); @@ -287,10 +308,19 @@ fn reject_already_rejected_spend_proposal_fails() { new_test_ext().execute_with(|| { Balances::make_free_balance_be(&Treasury::account_id(), 101); - assert_ok!(Treasury::propose_spend(RuntimeOrigin::signed(0), 100, 3)); - assert_ok!(Treasury::reject_proposal(RuntimeOrigin::root(), 0)); + assert_ok!({ + #[allow(deprecated)] + Treasury::propose_spend(RuntimeOrigin::signed(0), 100, 3) + }); + assert_ok!({ + #[allow(deprecated)] + Treasury::reject_proposal(RuntimeOrigin::root(), 0) + }); assert_noop!( - Treasury::reject_proposal(RuntimeOrigin::root(), 0), + { + #[allow(deprecated)] + Treasury::reject_proposal(RuntimeOrigin::root(), 0) + }, Error::::InvalidIndex ); }); @@ -300,7 +330,10 @@ fn reject_already_rejected_spend_proposal_fails() { fn reject_non_existent_spend_proposal_fails() { new_test_ext().execute_with(|| { assert_noop!( - Treasury::reject_proposal(RuntimeOrigin::root(), 0), + { + #[allow(deprecated)] + Treasury::reject_proposal(RuntimeOrigin::root(), 0) + }, Error::::InvalidIndex ); }); @@ -310,7 +343,10 @@ fn reject_non_existent_spend_proposal_fails() { fn accept_non_existent_spend_proposal_fails() { new_test_ext().execute_with(|| { assert_noop!( - Treasury::approve_proposal(RuntimeOrigin::root(), 0), + { + #[allow(deprecated)] + Treasury::approve_proposal(RuntimeOrigin::root(), 0) + }, Error::::InvalidIndex ); }); @@ -321,10 +357,19 @@ fn accept_already_rejected_spend_proposal_fails() { new_test_ext().execute_with(|| { Balances::make_free_balance_be(&Treasury::account_id(), 101); - assert_ok!(Treasury::propose_spend(RuntimeOrigin::signed(0), 100, 3)); - assert_ok!(Treasury::reject_proposal(RuntimeOrigin::root(), 0)); + assert_ok!({ + #[allow(deprecated)] + Treasury::propose_spend(RuntimeOrigin::signed(0), 100, 3) + }); + assert_ok!({ + #[allow(deprecated)] + Treasury::reject_proposal(RuntimeOrigin::root(), 0) + }); assert_noop!( - Treasury::approve_proposal(RuntimeOrigin::root(), 0), + { + #[allow(deprecated)] + Treasury::approve_proposal(RuntimeOrigin::root(), 0) + }, Error::::InvalidIndex ); }); @@ -336,8 +381,14 @@ fn accepted_spend_proposal_enacted_on_spend_period() { Balances::make_free_balance_be(&Treasury::account_id(), 101); assert_eq!(Treasury::pot(), 100); - assert_ok!(Treasury::propose_spend(RuntimeOrigin::signed(0), 100, 3)); - assert_ok!(Treasury::approve_proposal(RuntimeOrigin::root(), 0)); + assert_ok!({ + #[allow(deprecated)] + Treasury::propose_spend(RuntimeOrigin::signed(0), 100, 3) + }); + assert_ok!({ + #[allow(deprecated)] + Treasury::approve_proposal(RuntimeOrigin::root(), 0) + }); >::on_initialize(2); assert_eq!(Balances::free_balance(3), 100); @@ -351,8 +402,14 @@ fn pot_underflow_should_not_diminish() { Balances::make_free_balance_be(&Treasury::account_id(), 101); assert_eq!(Treasury::pot(), 100); - assert_ok!(Treasury::propose_spend(RuntimeOrigin::signed(0), 150, 3)); - assert_ok!(Treasury::approve_proposal(RuntimeOrigin::root(), 0)); + assert_ok!({ + #[allow(deprecated)] + Treasury::propose_spend(RuntimeOrigin::signed(0), 150, 3) + }); + assert_ok!({ + #[allow(deprecated)] + Treasury::approve_proposal(RuntimeOrigin::root(), 0) + }); >::on_initialize(2); assert_eq!(Treasury::pot(), 100); // Pot hasn't changed @@ -373,14 +430,26 @@ fn treasury_account_doesnt_get_deleted() { assert_eq!(Treasury::pot(), 100); let treasury_balance = Balances::free_balance(&Treasury::account_id()); - assert_ok!(Treasury::propose_spend(RuntimeOrigin::signed(0), treasury_balance, 3)); - assert_ok!(Treasury::approve_proposal(RuntimeOrigin::root(), 0)); + assert_ok!({ + #[allow(deprecated)] + Treasury::propose_spend(RuntimeOrigin::signed(0), treasury_balance, 3) + }); + assert_ok!({ + #[allow(deprecated)] + Treasury::approve_proposal(RuntimeOrigin::root(), 0) + }); >::on_initialize(2); assert_eq!(Treasury::pot(), 100); // Pot hasn't changed - assert_ok!(Treasury::propose_spend(RuntimeOrigin::signed(0), Treasury::pot(), 3)); - assert_ok!(Treasury::approve_proposal(RuntimeOrigin::root(), 1)); + assert_ok!({ + #[allow(deprecated)] + Treasury::propose_spend(RuntimeOrigin::signed(0), Treasury::pot(), 3) + }); + assert_ok!({ + #[allow(deprecated)] + Treasury::approve_proposal(RuntimeOrigin::root(), 1) + }); >::on_initialize(4); assert_eq!(Treasury::pot(), 0); // Pot is emptied @@ -403,10 +472,22 @@ fn inexistent_account_works() { assert_eq!(Balances::free_balance(Treasury::account_id()), 0); // Account does not exist assert_eq!(Treasury::pot(), 0); // Pot is empty - assert_ok!(Treasury::propose_spend(RuntimeOrigin::signed(0), 99, 3)); - assert_ok!(Treasury::approve_proposal(RuntimeOrigin::root(), 0)); - assert_ok!(Treasury::propose_spend(RuntimeOrigin::signed(0), 1, 3)); - assert_ok!(Treasury::approve_proposal(RuntimeOrigin::root(), 1)); + assert_ok!({ + #[allow(deprecated)] + Treasury::propose_spend(RuntimeOrigin::signed(0), 99, 3) + }); + assert_ok!({ + #[allow(deprecated)] + Treasury::approve_proposal(RuntimeOrigin::root(), 0) + }); + assert_ok!({ + #[allow(deprecated)] + Treasury::propose_spend(RuntimeOrigin::signed(0), 1, 3) + }); + assert_ok!({ + #[allow(deprecated)] + Treasury::approve_proposal(RuntimeOrigin::root(), 1) + }); >::on_initialize(2); assert_eq!(Treasury::pot(), 0); // Pot hasn't changed assert_eq!(Balances::free_balance(3), 0); // Balance of `3` hasn't changed @@ -448,14 +529,26 @@ fn max_approvals_limited() { Balances::make_free_balance_be(&0, u64::MAX); for _ in 0..::MaxApprovals::get() { - assert_ok!(Treasury::propose_spend(RuntimeOrigin::signed(0), 100, 3)); - assert_ok!(Treasury::approve_proposal(RuntimeOrigin::root(), 0)); + assert_ok!({ + #[allow(deprecated)] + Treasury::propose_spend(RuntimeOrigin::signed(0), 100, 3) + }); + assert_ok!({ + #[allow(deprecated)] + Treasury::approve_proposal(RuntimeOrigin::root(), 0) + }); } // One too many will fail - assert_ok!(Treasury::propose_spend(RuntimeOrigin::signed(0), 100, 3)); + assert_ok!({ + #[allow(deprecated)] + Treasury::propose_spend(RuntimeOrigin::signed(0), 100, 3) + }); assert_noop!( - Treasury::approve_proposal(RuntimeOrigin::root(), 0), + { + #[allow(deprecated)] + Treasury::approve_proposal(RuntimeOrigin::root(), 0) + }, Error::::TooManyApprovals ); }); @@ -466,8 +559,14 @@ fn remove_already_removed_approval_fails() { new_test_ext().execute_with(|| { Balances::make_free_balance_be(&Treasury::account_id(), 101); - assert_ok!(Treasury::propose_spend(RuntimeOrigin::signed(0), 100, 3)); - assert_ok!(Treasury::approve_proposal(RuntimeOrigin::root(), 0)); + assert_ok!({ + #[allow(deprecated)] + Treasury::propose_spend(RuntimeOrigin::signed(0), 100, 3) + }); + assert_ok!({ + #[allow(deprecated)] + Treasury::approve_proposal(RuntimeOrigin::root(), 0) + }); assert_eq!(Treasury::approvals(), vec![0]); assert_ok!(Treasury::remove_approval(RuntimeOrigin::root(), 0)); assert_eq!(Treasury::approvals(), vec![]);