diff --git a/runtime/parachains/src/inclusion/mod.rs b/runtime/parachains/src/inclusion/mod.rs index c2baa94b9335..695cd351b8e6 100644 --- a/runtime/parachains/src/inclusion/mod.rs +++ b/runtime/parachains/src/inclusion/mod.rs @@ -467,7 +467,6 @@ impl Pallet { candidates: Vec>, scheduled: Vec, group_validators: GV, - full_check: FullCheck, ) -> Result, DispatchError> where GV: Fn(GroupIndex) -> Option>, @@ -523,13 +522,7 @@ impl Pallet { 'next_backed_candidate: for (candidate_idx, backed_candidate) in candidates.iter().enumerate() { - if let FullCheck::Yes = full_check { - check_ctx.verify_backed_candidate( - parent_hash, - candidate_idx, - backed_candidate, - )?; - } + check_ctx.verify_backed_candidate(parent_hash, candidate_idx, backed_candidate)?; let para_id = backed_candidate.descriptor().para_id; let mut backers = bitvec::bitvec![BitOrderLsb0, u8; 0; validators.len()]; diff --git a/runtime/parachains/src/inclusion/tests.rs b/runtime/parachains/src/inclusion/tests.rs index 21e3848f795f..d64fadf8aecb 100644 --- a/runtime/parachains/src/inclusion/tests.rs +++ b/runtime/parachains/src/inclusion/tests.rs @@ -988,7 +988,6 @@ fn candidate_checks() { vec![backed], vec![chain_b_assignment.clone()], &group_validators, - FullCheck::Yes, ), Error::::UnscheduledCandidate ); @@ -1044,7 +1043,6 @@ fn candidate_checks() { vec![backed_b, backed_a], vec![chain_a_assignment.clone(), chain_b_assignment.clone()], &group_validators, - FullCheck::Yes, ), Error::::UnscheduledCandidate ); @@ -1078,7 +1076,6 @@ fn candidate_checks() { vec![backed], vec![chain_a_assignment.clone()], &group_validators, - FullCheck::Yes, ), Error::::InsufficientBacking ); @@ -1114,7 +1111,6 @@ fn candidate_checks() { vec![backed], vec![chain_a_assignment.clone()], &group_validators, - FullCheck::Yes, ), Error::::CandidateNotInParentContext ); @@ -1154,7 +1150,6 @@ fn candidate_checks() { thread_a_assignment.clone(), ], &group_validators, - FullCheck::Yes, ), Error::::WrongCollator, ); @@ -1193,7 +1188,6 @@ fn candidate_checks() { vec![backed], vec![thread_a_assignment.clone()], &group_validators, - FullCheck::Yes, ), Error::::NotCollatorSigned ); @@ -1244,7 +1238,6 @@ fn candidate_checks() { vec![backed], vec![chain_a_assignment.clone()], &group_validators, - FullCheck::Yes, ), Error::::CandidateScheduledBeforeParaFree ); @@ -1285,7 +1278,6 @@ fn candidate_checks() { vec![backed], vec![chain_a_assignment.clone()], &group_validators, - FullCheck::Yes, ), Error::::CandidateScheduledBeforeParaFree ); @@ -1330,7 +1322,6 @@ fn candidate_checks() { vec![backed], vec![chain_a_assignment.clone()], &group_validators, - FullCheck::Yes, ), Error::::PrematureCodeUpgrade ); @@ -1365,7 +1356,6 @@ fn candidate_checks() { vec![backed], vec![chain_a_assignment.clone()], &group_validators, - FullCheck::Yes, ), Err(Error::::ValidationDataHashMismatch.into()), ); @@ -1401,7 +1391,6 @@ fn candidate_checks() { vec![backed], vec![chain_a_assignment.clone()], &group_validators, - FullCheck::Yes, ), Error::::InvalidValidationCodeHash ); @@ -1437,7 +1426,6 @@ fn candidate_checks() { vec![backed], vec![chain_a_assignment.clone()], &group_validators, - FullCheck::Yes, ), Error::::ParaHeadMismatch ); @@ -1607,7 +1595,6 @@ fn backing_works() { thread_a_assignment.clone(), ], &group_validators, - FullCheck::Yes, ) .expect("candidates scheduled, in order, and backed"); @@ -1805,7 +1792,6 @@ fn can_include_candidate_with_ok_code_upgrade() { vec![backed_a], vec![chain_a_assignment.clone()], &group_validators, - FullCheck::Yes, ) .expect("candidates scheduled, in order, and backed"); diff --git a/runtime/parachains/src/paras_inherent/mod.rs b/runtime/parachains/src/paras_inherent/mod.rs index 1645f74ee804..66ce3cc5dfb8 100644 --- a/runtime/parachains/src/paras_inherent/mod.rs +++ b/runtime/parachains/src/paras_inherent/mod.rs @@ -522,7 +522,6 @@ impl Pallet { backed_candidates, scheduled, >::group_validators, - full_check, )?; METRICS.on_disputes_included(checked_disputes.len() as u64);