address feedback

consensus/consensus-types/src/pipelined_block.rs

@@ -289,8 +289,8 @@ impl PipelinedBlock {
             .expect("pre_commit_result_rx missing.")
     }
 
-    pub fn set_qc(&self, qc: Option<Arc<QuorumCert>>) {
-        *self.block_qc.lock() = qc;
+    pub fn set_qc(&self, qc: Arc<QuorumCert>) {
+        *self.block_qc.lock() = Some(qc)
     }
 }
 

consensus/consensus-types/src/proposal_msg.rs

@@ -26,16 +26,8 @@ impl ProposalMsg {
         }
     }
 
-    /// Returns the epoch associated with the proposal after verifying that the
-    /// payload data is also associated with the same epoch
-    pub fn verified_epoch(&self) -> Result<u64> {
-        let proposal_epoch = self.proposal.epoch();
-
-        self.proposal
-            .payload()
-            .map_or(Ok(()), |p| p.verify_epoch(proposal_epoch))?;
-
-        Ok(proposal_epoch)
+    pub fn epoch(&self) -> u64 {
+        self.proposal.epoch()
     }
 
     /// Verifies that the ProposalMsg is well-formed.
@@ -85,6 +77,9 @@ impl ProposalMsg {
             "Proposal {} does not define an author",
             self.proposal
         );
+        self.proposal
+            .payload()
+            .map_or(Ok(()), |p| p.verify_epoch(self.proposal.epoch()))?;
         Ok(())
     }
 

consensus/src/block_storage/block_store.rs

@@ -278,7 +278,10 @@ impl BlockStore {
         for block in &blocks_to_commit {
             // Given the block is ready to commit, then it certainly must have a QC.
             // However, we keep it an Option to be safe.
-            block.set_qc(self.get_quorum_cert_for_block(block.id()));
+            block.set_qc(
+                self.get_quorum_cert_for_block(block.id())
+                    .expect(&format!("QC for block {} must exist", block.id())),
+            );
         }
 
         let block_tree = self.inner.clone();

consensus/src/payload_manager.rs

@@ -617,21 +617,14 @@ async fn process_payload_helper<T: TDataInfo>(
         }
     }
 
-    let result = {
-        // If the future is completed then use the result.
-        if let Some(result) = fut.clone().now_or_never() {
-            result
-        } else {
-            // Otherwise, append the additional peers to existing responders list
-            // NB: this might append the same signers multiple times, but this
-            // should be very rare and has no negative effects.
-            for responders in existing_responders {
-                responders.lock().append(&mut signers.clone());
-            }
+    // Append the additional peers to existing responders list
+    // NB: this might append the same signers multiple times, but this
+    // should be very rare and has no negative effects.
+    for responders in existing_responders {
+        responders.lock().append(&mut signers.clone());
+    }
 
-            fut.await
-        }
-    };
+    let result = fut.await;
 
     // If error, reschedule before returning the result
     if result.is_err() {
@@ -642,14 +635,14 @@ async fn process_payload_helper<T: TDataInfo>(
             let batches_and_responders = data_ptr
                 .batch_summary
                 .iter()
-                .map(|proof| {
+                .map(|summary| {
                     let mut signers = signers.clone();
-                    signers.append(&mut proof.signers(ordered_authors));
+                    signers.append(&mut summary.signers(ordered_authors));
                     if let Some(author) = block.author() {
                         signers.push(author);
                     }
 
-                    (proof.info().clone(), Arc::new(Mutex::new(signers)))
+                    (summary.info().clone(), Arc::new(Mutex::new(signers)))
                 })
                 .collect();
             data_fut.fut = request_txns_from_quorum_store(

consensus/src/round_manager.rs

@@ -185,7 +185,7 @@ impl UnverifiedEvent {
 
     pub fn epoch(&self) -> anyhow::Result<u64> {
         match self {
-            UnverifiedEvent::ProposalMsg(p) => p.verified_epoch(),
+            UnverifiedEvent::ProposalMsg(p) => Ok(p.epoch()),
             UnverifiedEvent::VoteMsg(v) => Ok(v.epoch()),
             UnverifiedEvent::OrderVoteMsg(v) => Ok(v.epoch()),
             UnverifiedEvent::SyncInfo(s) => Ok(s.epoch()),