From f18509be6ac600afb0e6f1c3f999daeb960c5756 Mon Sep 17 00:00:00 2001 From: muharem Date: Sat, 8 Jul 2023 11:17:12 +0200 Subject: [PATCH 1/6] treasury deprecate dispatchables --- frame/treasury/src/lib.rs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/frame/treasury/src/lib.rs b/frame/treasury/src/lib.rs index 509ab933430bb..8290805bf3556 100644 --- a/frame/treasury/src/lib.rs +++ b/frame/treasury/src/lib.rs @@ -346,6 +346,9 @@ pub mod pallet { /// - O(1) #[pallet::call_index(0)] #[pallet::weight(T::WeightInfo::propose_spend())] + #[deprecated( + note = "`propose_spend` will be removed in January 2024. Use `spend` instead." + )] pub fn propose_spend( origin: OriginFor, #[pallet::compact] value: BalanceOf, @@ -374,6 +377,9 @@ pub mod pallet { /// - O(1) #[pallet::call_index(1)] #[pallet::weight((T::WeightInfo::reject_proposal(), DispatchClass::Operational))] + #[deprecated( + note = "`reject_proposal` will be removed in January 2024. Use `spend` instead." + )] pub fn reject_proposal( origin: OriginFor, #[pallet::compact] proposal_id: ProposalIndex, @@ -402,6 +408,9 @@ pub mod pallet { /// - O(1). #[pallet::call_index(2)] #[pallet::weight((T::WeightInfo::approve_proposal(T::MaxApprovals::get()), DispatchClass::Operational))] + #[deprecated( + note = "`approve_proposal` will be removed in January 2024. Use `spend` instead." + )] pub fn approve_proposal( origin: OriginFor, #[pallet::compact] proposal_id: ProposalIndex, From 4edf3a3afe32403698c6dcabecd0c4e697d2dde4 Mon Sep 17 00:00:00 2001 From: muharem Date: Mon, 10 Jul 2023 18:17:18 +0200 Subject: [PATCH 2/6] allow deprecated --- frame/treasury/src/lib.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frame/treasury/src/lib.rs b/frame/treasury/src/lib.rs index 8290805bf3556..f0ed271070b4f 100644 --- a/frame/treasury/src/lib.rs +++ b/frame/treasury/src/lib.rs @@ -346,6 +346,7 @@ 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 January 2024. Use `spend` instead." )] @@ -377,6 +378,7 @@ 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 January 2024. Use `spend` instead." )] @@ -408,6 +410,7 @@ 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 January 2024. Use `spend` instead." )] From 8a2dab83fbcf2156f435e9048a240a2dc8525ff8 Mon Sep 17 00:00:00 2001 From: muharem Date: Tue, 11 Jul 2023 14:35:27 +0200 Subject: [PATCH 3/6] allow deprecated for benchmarks --- frame/treasury/src/benchmarking.rs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/frame/treasury/src/benchmarking.rs b/frame/treasury/src/benchmarking.rs index a3761083e4faa..f607ac5cbec96 100644 --- a/frame/treasury/src/benchmarking.rs +++ b/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)?; From 80647f7f04aacc9bb691fdfd53f410043122a444 Mon Sep 17 00:00:00 2001 From: muharem Date: Tue, 1 Aug 2023 12:28:10 +0200 Subject: [PATCH 4/6] allow deprecated in tests --- frame/treasury/src/tests.rs | 165 ++++++++++++++++++++++++++++-------- 1 file changed, 132 insertions(+), 33 deletions(-) diff --git a/frame/treasury/src/tests.rs b/frame/treasury/src/tests.rs index 0659c2f5941b1..6e029f4d3c9f2 100644 --- a/frame/treasury/src/tests.rs +++ b/frame/treasury/src/tests.rs @@ -223,7 +223,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); }); @@ -232,7 +235,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); }); @@ -242,7 +248,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, ); }); @@ -253,8 +262,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); @@ -280,8 +295,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); @@ -294,10 +315,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 ); }); @@ -307,7 +337,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 ); }); @@ -317,7 +350,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 ); }); @@ -328,10 +364,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 ); }); @@ -343,8 +388,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); @@ -358,8 +409,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 @@ -380,14 +437,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 @@ -410,10 +479,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 @@ -455,14 +536,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 ); }); @@ -473,8 +566,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![]); From 2d45c1b5f4c434f5a79a7c36767a8d71639b4c65 Mon Sep 17 00:00:00 2001 From: muharem Date: Tue, 8 Aug 2023 11:29:37 +0200 Subject: [PATCH 5/6] allow deprecated for bounties tests --- frame/bounties/src/tests.rs | 135 ++++++++++++++++++++++++++++-------- 1 file changed, 108 insertions(+), 27 deletions(-) diff --git a/frame/bounties/src/tests.rs b/frame/bounties/src/tests.rs index 9fe34b16029cb..5bbc868c946af 100644 --- a/frame/bounties/src/tests.rs +++ b/frame/bounties/src/tests.rs @@ -236,7 +236,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); }); @@ -245,7 +248,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); }); @@ -255,7 +261,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, ); }); @@ -266,8 +275,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); @@ -293,8 +308,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); @@ -307,10 +328,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 ); }); @@ -320,7 +350,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 ); }); @@ -330,7 +363,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 ); }); @@ -341,10 +377,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 ); }); @@ -356,8 +401,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); @@ -371,8 +422,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 @@ -393,14 +450,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 @@ -423,10 +492,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 From 703213dfc7475f90e33abb5c653ea5fbd37f92c6 Mon Sep 17 00:00:00 2001 From: muharem Date: Tue, 8 Aug 2023 12:36:21 +0200 Subject: [PATCH 6/6] deprecation month --- frame/treasury/src/lib.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frame/treasury/src/lib.rs b/frame/treasury/src/lib.rs index fd0a976c60768..730fae2a4e92c 100644 --- a/frame/treasury/src/lib.rs +++ b/frame/treasury/src/lib.rs @@ -338,7 +338,7 @@ pub mod pallet { #[pallet::weight(T::WeightInfo::propose_spend())] #[allow(deprecated)] #[deprecated( - note = "`propose_spend` will be removed in January 2024. Use `spend` instead." + note = "`propose_spend` will be removed in February 2024. Use `spend` instead." )] pub fn propose_spend( origin: OriginFor, @@ -370,7 +370,7 @@ pub mod pallet { #[pallet::weight((T::WeightInfo::reject_proposal(), DispatchClass::Operational))] #[allow(deprecated)] #[deprecated( - note = "`reject_proposal` will be removed in January 2024. Use `spend` instead." + note = "`reject_proposal` will be removed in February 2024. Use `spend` instead." )] pub fn reject_proposal( origin: OriginFor, @@ -402,7 +402,7 @@ pub mod pallet { #[pallet::weight((T::WeightInfo::approve_proposal(T::MaxApprovals::get()), DispatchClass::Operational))] #[allow(deprecated)] #[deprecated( - note = "`approve_proposal` will be removed in January 2024. Use `spend` instead." + note = "`approve_proposal` will be removed in February 2024. Use `spend` instead." )] pub fn approve_proposal( origin: OriginFor,