From 4e787fbd30675ce08dd799d1ec99d6b3c2107fa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torsten=20St=C3=BCber?= <torsten.stuber@gmail.com>
Date: Mon, 18 Jul 2022 14:56:22 +0200
Subject: [PATCH] Fix invalid state transitions in pallet-bounties (#11630)

* Pallet-bounty: disallow invalid state transitions

* Fix tests: funding only at even block numbers

* Fix benchmarks: bounties need to be funded

* fix on_initialize

Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
---
 substrate/frame/bounties/src/lib.rs                | 2 +-
 substrate/frame/bounties/src/tests.rs              | 8 ++++----
 substrate/frame/child-bounties/src/benchmarking.rs | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/substrate/frame/bounties/src/lib.rs b/substrate/frame/bounties/src/lib.rs
index 8e28cacb9d..fca758fd96 100644
--- a/substrate/frame/bounties/src/lib.rs
+++ b/substrate/frame/bounties/src/lib.rs
@@ -390,7 +390,7 @@ pub mod pallet {
 			Bounties::<T, I>::try_mutate_exists(bounty_id, |maybe_bounty| -> DispatchResult {
 				let mut bounty = maybe_bounty.as_mut().ok_or(Error::<T, I>::InvalidIndex)?;
 				match bounty.status {
-					BountyStatus::Proposed | BountyStatus::Approved | BountyStatus::Funded => {},
+					BountyStatus::Funded => {},
 					_ => return Err(Error::<T, I>::UnexpectedStatus.into()),
 				};
 
diff --git a/substrate/frame/bounties/src/tests.rs b/substrate/frame/bounties/src/tests.rs
index ff22060079..b4ce039b35 100644
--- a/substrate/frame/bounties/src/tests.rs
+++ b/substrate/frame/bounties/src/tests.rs
@@ -1126,8 +1126,8 @@ fn accept_curator_handles_different_deposit_calculations() {
 		assert_ok!(Bounties::propose_bounty(Origin::signed(0), value, b"12345".to_vec()));
 		assert_ok!(Bounties::approve_bounty(Origin::root(), bounty_index));
 
-		System::set_block_number(3);
-		<Treasury as OnInitialize<u64>>::on_initialize(3);
+		System::set_block_number(4);
+		<Treasury as OnInitialize<u64>>::on_initialize(4);
 
 		assert_ok!(Bounties::propose_curator(Origin::root(), bounty_index, user, fee));
 		assert_ok!(Bounties::accept_curator(Origin::signed(user), bounty_index));
@@ -1150,8 +1150,8 @@ fn accept_curator_handles_different_deposit_calculations() {
 		assert_ok!(Bounties::propose_bounty(Origin::signed(0), value, b"12345".to_vec()));
 		assert_ok!(Bounties::approve_bounty(Origin::root(), bounty_index));
 
-		System::set_block_number(3);
-		<Treasury as OnInitialize<u64>>::on_initialize(3);
+		System::set_block_number(6);
+		<Treasury as OnInitialize<u64>>::on_initialize(6);
 
 		assert_ok!(Bounties::propose_curator(Origin::root(), bounty_index, user, fee));
 		assert_ok!(Bounties::accept_curator(Origin::signed(user), bounty_index));
diff --git a/substrate/frame/child-bounties/src/benchmarking.rs b/substrate/frame/child-bounties/src/benchmarking.rs
index dcb54361fa..ca5af50276 100644
--- a/substrate/frame/child-bounties/src/benchmarking.rs
+++ b/substrate/frame/child-bounties/src/benchmarking.rs
@@ -221,7 +221,7 @@ benchmarks! {
 	unassign_curator {
 		setup_pot_account::<T>();
 		let bounty_setup = activate_child_bounty::<T>(0, T::MaximumReasonLength::get())?;
-		Bounties::<T>::on_initialize(T::BlockNumber::zero());
+		Treasury::<T>::on_initialize(T::BlockNumber::zero());
 		frame_system::Pallet::<T>::set_block_number(T::BountyUpdatePeriod::get() + 1u32.into());
 		let caller = whitelisted_caller();
 	}: _(RawOrigin::Signed(caller), bounty_setup.bounty_id,
@@ -295,7 +295,7 @@ benchmarks! {
 	close_child_bounty_active {
 		setup_pot_account::<T>();
 		let bounty_setup = activate_child_bounty::<T>(0, T::MaximumReasonLength::get())?;
-		Bounties::<T>::on_initialize(T::BlockNumber::zero());
+		Treasury::<T>::on_initialize(T::BlockNumber::zero());
 	}: close_child_bounty(RawOrigin::Root, bounty_setup.bounty_id, bounty_setup.child_bounty_id)
 	verify {
 		assert_last_event::<T>(Event::Canceled {