fix incorrect method name and update test to ensure off-by-one is inv…

…alid
sigp · Jul 22, 2021 · bed92c9 · bed92c9
1 parent 6c76853
commit bed92c9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/beacon_node/network/src/beacon_processor/worker/gossip_methods.rs b/beacon_node/network/src/beacon_processor/worker/gossip_methods.rs
@@ -327,7 +327,7 @@ impl<T: BeaconChainTypes> Worker<T> {
                     "Unknown parent for gossip block";
                     "root" => %block.canonical_root()
                 );
-                self.send_sync_committee_message(SyncMessage::UnknownBlock(peer_id, block));
+                self.send_sync_message(SyncMessage::UnknownBlock(peer_id, block));
                 return;
             }
             Err(e @ BlockError::FutureSlot { .. })
@@ -504,7 +504,7 @@ impl<T: BeaconChainTypes> Worker<T> {
                     "Block with unknown parent attempted to be processed";
                     "peer_id" => %peer_id
                 );
-                self.send_sync_committee_message(SyncMessage::UnknownBlock(peer_id, block));
+                self.send_sync_message(SyncMessage::UnknownBlock(peer_id, block));
             }
             other => {
                 debug!(

diff --git a/beacon_node/network/src/beacon_processor/worker/mod.rs b/beacon_node/network/src/beacon_processor/worker/mod.rs
@@ -25,7 +25,7 @@ impl<T: BeaconChainTypes> Worker<T> {
     /// Send a message to `sync_tx`.
     ///
     /// Creates a log if there is an internal error.
-    fn send_sync_committee_message(&self, message: SyncMessage<T::EthSpec>) {
+    fn send_sync_message(&self, message: SyncMessage<T::EthSpec>) {
         self.sync_tx.send(message).unwrap_or_else(|e| {
             debug!(self.log, "Could not send message to the sync service, likely shutdown";
                 "error" => %e)

diff --git a/beacon_node/network/src/beacon_processor/worker/rpc_methods.rs b/beacon_node/network/src/beacon_processor/worker/rpc_methods.rs
@@ -99,7 +99,7 @@ impl<T: BeaconChainTypes> Worker<T> {
                     finalized_epoch: status.finalized_epoch,
                     finalized_root: status.finalized_root,
                 };
-                self.send_sync_committee_message(SyncMessage::AddPeer(peer_id, info));
+                self.send_sync_message(SyncMessage::AddPeer(peer_id, info));
             }
             Err(e) => error!(self.log, "Could not process status message"; "error" => ?e),
         }

diff --git a/beacon_node/network/src/beacon_processor/worker/sync_methods.rs b/beacon_node/network/src/beacon_processor/worker/sync_methods.rs
@@ -99,7 +99,7 @@ impl<T: BeaconChainTypes> Worker<T> {
                     }
                 };
 
-                self.send_sync_committee_message(SyncMessage::BatchProcessed {
+                self.send_sync_message(SyncMessage::BatchProcessed {
                     chain_id,
                     epoch,
                     result,
@@ -117,7 +117,7 @@ impl<T: BeaconChainTypes> Worker<T> {
                 match self.process_blocks(downloaded_blocks.iter().rev()) {
                     (_, Err(e)) => {
                         debug!(self.log, "Parent lookup failed"; "last_peer_id" => %peer_id, "error" => e);
-                        self.send_sync_committee_message(SyncMessage::ParentLookupFailed {
+                        self.send_sync_message(SyncMessage::ParentLookupFailed {
                             peer_id,
                             chain_head,
                         })