Merge pull request #2167 from dusk-network/2152-remove-disable_winnin…

…g_att_check

Change `verify_block_header` to ` verify_candidate_header`

consensus/src/operations.rs

@@ -81,10 +81,9 @@ impl fmt::Display for VerificationOutput {
 
 #[async_trait::async_trait]
 pub trait Operations: Send + Sync {
-    async fn verify_block_header(
+    async fn verify_candidate_header(
         &self,
         candidate_header: &Header,
-        disable_winning_att_check: bool,
     ) -> Result<(u8, Vec<Voter>, Vec<Voter>), Error>;
 
     async fn verify_faults(

consensus/src/validation/step.rs

@@ -79,9 +79,8 @@ impl<T: Operations + 'static> ValidationStep<T> {
         let candidate = candidate.expect("Candidate to be already checked");
         let header = candidate.header();
 
-        // Verify candidate header (all fields except the winning attestation)
-        // NB: Winning attestation is produced only on reaching consensus
-        let vote = match executor.verify_block_header(header, true).await {
+        // Verify candidate header
+        let vote = match executor.verify_candidate_header(header).await {
             Ok((_, voters, _)) => {
                 // Call Verify State Transition to make sure transactions set is
                 // valid

node/src/chain/consensus.rs

@@ -252,10 +252,9 @@ impl<DB: database::DB, VM: vm::VMExecution> Executor<DB, VM> {
 
 #[async_trait::async_trait]
 impl<DB: database::DB, VM: vm::VMExecution> Operations for Executor<DB, VM> {
-    async fn verify_block_header(
+    async fn verify_candidate_header(
         &self,
         candidate_header: &Header,
-        disable_winning_att_check: bool,
     ) -> Result<(u8, Vec<Voter>, Vec<Voter>), Error> {
         let validator = Validator::new(
             self.db.clone(),
@@ -264,7 +263,7 @@ impl<DB: database::DB, VM: vm::VMExecution> Operations for Executor<DB, VM> {
         );
 
         validator
-            .execute_checks(candidate_header, disable_winning_att_check)
+            .execute_checks(candidate_header, true)
             .await
             .map_err(operations::Error::InvalidHeader)
     }