Address comments

EspressoSystems · Jul 10, 2023 · 1aa598d · 1aa598d
1 parent 5ecc17f
commit 1aa598d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 29 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -32,7 +32,7 @@ pub mod types;
 
 pub mod tasks;
 
-use crate::tasks::da_filter;
+use crate::tasks::committee_filter;
 use crate::tasks::view_sync_filter;
 use hotshot_task::task::FilterEvent;
 
@@ -877,7 +877,7 @@ where
             task_runner,
             internal_event_stream.clone(),
             committee_exchange.clone(),
-            FilterEvent(Arc::new(da_filter)),
+            FilterEvent(Arc::new(committee_filter)),
         )
         .await;
         let task_runner = add_network_task(

diff --git a/src/tasks/mod.rs b/src/tasks/mod.rs
@@ -332,7 +332,7 @@ pub fn quorum_filter<
     }
 }
 
-pub fn da_filter<
+pub fn committee_filter<
     TYPES: NodeType<ConsensusType = SequencingConsensus>,
     I: NodeImplementation<
         TYPES,

diff --git a/task-impls/src/consensus.rs b/task-impls/src/consensus.rs
@@ -452,10 +452,16 @@ where
                     }
                 }
             }
-            error!("Couldn't find DAC cert in certs, meaning we haven't received it yet for view {}", *self.cur_view);
+            error!(
+                "Couldn't find DAC cert in certs, meaning we haven't received it yet for view {}",
+                *self.cur_view
+            );
             return false;
         }
-        error!("Could not vote because we don't have a proposal yet for view {}", *self.cur_view);
+        error!(
+            "Could not vote because we don't have a proposal yet for view {}",
+            *self.cur_view
+        );
         return false;
     }
 
@@ -754,15 +760,14 @@ where
                             }
                         });
 
-                        // Because we call the vote if able function above
-                        // if let GeneralConsensusMessage::Vote(vote) = message {
-                        //     info!("Sending vote to next leader {:?}", vote);
-                        //     error!("Vote is {:?}", vote.current_view());
+                        if let GeneralConsensusMessage::Vote(vote) = message {
+                            info!("Sending vote to next leader {:?}", vote);
+                            error!("Vote is {:?}", vote.current_view());
 
-                        //     self.event_stream
-                        //         .publish(SequencingHotShotEvent::QuorumVoteSend(vote))
-                        //         .await;
-                        // };
+                            self.event_stream
+                                .publish(SequencingHotShotEvent::QuorumVoteSend(vote))
+                                .await;
+                        };
                     }
                 }
             }

diff --git a/task-impls/src/network.rs b/task-impls/src/network.rs
@@ -254,22 +254,6 @@ impl<
         return None;
     }
 
-    /// Filter network event.
-    pub fn filter(event: &SequencingHotShotEvent<TYPES, I>) -> bool {
-        match event {
-            SequencingHotShotEvent::QuorumProposalSend(_, _)
-            | SequencingHotShotEvent::QuorumVoteSend(_)
-            | SequencingHotShotEvent::DAProposalSend(_, _)
-            | SequencingHotShotEvent::DAVoteSend(_)
-            | SequencingHotShotEvent::ViewSyncVoteSend(_)
-            | SequencingHotShotEvent::ViewSyncCertificateSend(_, _)
-            | SequencingHotShotEvent::Shutdown
-            | SequencingHotShotEvent::ViewChange(_)
-            | SequencingHotShotEvent::TransactionSend(_) => true,
-
-            _ => false,
-        }
-    }
 }
 
 #[derive(Snafu, Debug)]