♻️ small additional decesion cleanup

Polimec · Jul 15, 2024 · a00641a · a00641a
1 parent bcd1f6b
commit a00641a
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 16 deletions.
diff --git a/pallets/funding/src/benchmarking.rs b/pallets/funding/src/benchmarking.rs
@@ -2280,7 +2280,7 @@ mod benchmarks {
 
 		// * validity checks *
 		let project_details = inst.get_project_details(project_id);
-		assert_eq!(project_details.status, ProjectStatus::AwaitingProjectDecision);
+
 		assert_eq!(project_details.evaluation_round_info.evaluators_outcome, EvaluatorsOutcome::Slashed)
 	}
 	#[benchmark]
@@ -2338,7 +2338,6 @@ mod benchmarks {
 
 		// * validity checks *
 		let project_details = inst.get_project_details(project_id);
-		assert_eq!(project_details.status, ProjectStatus::AwaitingProjectDecision);
 		assert_eq!(project_details.evaluation_round_info.evaluators_outcome, EvaluatorsOutcome::Unchanged)
 	}
 	#[benchmark]
@@ -2455,8 +2454,6 @@ mod benchmarks {
 			vec![],
 		);
 
-		assert_eq!(inst.get_project_details(project_id).status, ProjectStatus::AwaitingProjectDecision);
-
 		#[block]
 		{
 			Pallet::<T>::do_project_decision(project_id, FundingOutcomeDecision::AcceptFunding).unwrap();

diff --git a/pallets/funding/src/instantiator/chain_interactions.rs b/pallets/funding/src/instantiator/chain_interactions.rs
@@ -680,8 +680,7 @@ impl<
 			matches!(
 				project_details.status,
 				ProjectStatus::FundingSuccessful |
-					ProjectStatus::FundingFailed |
-					ProjectStatus::AwaitingProjectDecision
+					ProjectStatus::FundingFailed
 			),
 			"Project should be in Finished status"
 		);

diff --git a/pallets/funding/src/lib.rs b/pallets/funding/src/lib.rs
@@ -985,12 +985,6 @@ pub mod pallet {
 		#[pallet::weight(WeightInfoOf::<T>::end_funding_automatically_rejected_evaluators_slashed(
 		1,
 		)
-		.max(WeightInfoOf::<T>::end_funding_awaiting_decision_evaluators_slashed(
-		1,
-		))
-		.max(WeightInfoOf::<T>::end_funding_awaiting_decision_evaluators_unchanged(
-		1,
-		))
 		.max(WeightInfoOf::<T>::end_funding_automatically_accepted_evaluators_rewarded(
 		1,
 		<T as Config>::MaxEvaluationsPerProject::get(),

diff --git a/pallets/funding/src/tests/4_community.rs b/pallets/funding/src/tests/4_community.rs
@@ -981,8 +981,6 @@ mod contribute_extrinsic {
 			inst.start_remainder_or_end_funding(project_id).unwrap();
 			inst.finish_funding(project_id).unwrap();
 
-			assert_eq!(inst.get_project_details(project_id).status, ProjectStatus::AwaitingProjectDecision);
-
 			let settlement_block = inst.get_update_block(project_id, &UpdateType::StartSettlement).unwrap();
 			inst.jump_to_block(settlement_block);
 

diff --git a/pallets/funding/src/tests/5_remainder.rs b/pallets/funding/src/tests/5_remainder.rs
@@ -1074,7 +1074,6 @@ mod contribute_extrinsic {
 
 			inst.finish_funding(project_id).unwrap();
 
-			assert_eq!(inst.get_project_details(project_id).status, ProjectStatus::AwaitingProjectDecision);
 			let decision_block = inst
 				.get_update_block(project_id, &UpdateType::ProjectDecision(FundingOutcomeDecision::AcceptFunding))
 				.unwrap();

diff --git a/pallets/funding/src/types.rs b/pallets/funding/src/types.rs
@@ -701,7 +701,6 @@ pub mod inner_types {
 		Auction,
 		CommunityRound(BlockNumber),
 		FundingFailed,
-		AwaitingProjectDecision,
 		FundingSuccessful,
 		SettlementStarted(FundingOutcome),
 		SettlementFinished(FundingOutcome),