Correct bugs in new sync threading

beacon_node/network/src/message_handler.rs

@@ -9,7 +9,7 @@ use eth2_libp2p::{
 };
 use futures::future::Future;
 use futures::stream::Stream;
-use slog::{debug, trace, warn};
+use slog::{debug, o, trace, warn};
 use ssz::{Decode, DecodeError};
 use std::sync::Arc;
 use tokio::sync::mpsc;
@@ -51,7 +51,8 @@ impl<T: BeaconChainTypes + 'static> MessageHandler<T> {
         executor: &tokio::runtime::TaskExecutor,
         log: slog::Logger,
     ) -> error::Result<mpsc::UnboundedSender<HandlerMessage>> {
-        trace!(log, "Service starting");
+        let message_handler_log = log.new(o!("Service"=> "Message Handler"));
+        trace!(message_handler_log, "Service starting");
 
         let (handler_send, handler_recv) = mpsc::unbounded_channel();
 
@@ -63,7 +64,7 @@ impl<T: BeaconChainTypes + 'static> MessageHandler<T> {
         let mut handler = MessageHandler {
             network_send,
             message_processor,
-            log: log.clone(),
+            log: message_handler_log,
         };
 
         // spawn handler task and move the message handler instance into the spawned thread

beacon_node/network/src/service.rs

@@ -34,13 +34,8 @@ impl<T: BeaconChainTypes + 'static> Service<T> {
         // build the network channel
         let (network_send, network_recv) = mpsc::unbounded_channel::<NetworkMessage>();
         // launch message handler thread
-        let message_handler_log = log.new(o!("Service" => "MessageHandler"));
+        let message_handler_send =
-        let message_handler_send = MessageHandler::spawn(
+            MessageHandler::spawn(beacon_chain, network_send.clone(), executor, log.clone())?;
-            beacon_chain,
-            network_send.clone(),
-            executor,
-            message_handler_log,
-        )?;
 
         let network_log = log.new(o!("Service" => "Network"));
         // launch libp2p service

beacon_node/network/src/sync/manager.rs

@@ -251,7 +251,7 @@ pub fn spawn<T: BeaconChainTypes>(
     // create an instance of the SyncManager
     let sync_manager = SyncManager {
         chain: beacon_chain,
-        state: ManagerState::Regular,
+        state: ManagerState::Stalled,
         input_channel: sync_recv,
         network,
         import_queue: HashMap::new(),
@@ -510,7 +510,7 @@ impl<T: BeaconChainTypes> SyncManager<T> {
         &mut self,
         peer_id: PeerId,
         request_id: RequestId,
-        blocks: Vec<BeaconBlock<T::EthSpec>>,
+        mut blocks: Vec<BeaconBlock<T::EthSpec>>,
     ) {
         // find the request
         let parent_request = match self
@@ -545,6 +545,11 @@ impl<T: BeaconChainTypes> SyncManager<T> {
             return;
         }
 
+        // add the block to response
+        parent_request
+            .downloaded_blocks
+            .push(blocks.pop().expect("must exist"));
+
         // queue for processing
         parent_request.state = BlockRequestsState::ReadyToProcess;
     }
@@ -594,7 +599,6 @@ impl<T: BeaconChainTypes> SyncManager<T> {
             "peer" => format!("{:?}", peer_id),
         );
         self.full_peers.insert(peer_id);
-        self.update_state();
     }
 
     /* Processing State Functions */
@@ -1077,7 +1081,6 @@ impl<T: BeaconChainTypes> Future for SyncManager<T> {
                 Ok(Async::Ready(Some(message))) => match message {
                     SyncMessage::AddPeer(peer_id, info) => {
                         self.add_peer(peer_id, info);
-                        dbg!("add peer");
                     }
                     SyncMessage::BeaconBlocksResponse {
                         peer_id,
@@ -1118,17 +1121,13 @@ impl<T: BeaconChainTypes> Future for SyncManager<T> {
             //need to be called.
             let mut re_run = false;
 
-            dbg!(self.import_queue.len());
             // only process batch requests if there are any
             if !self.import_queue.is_empty() {
                 // process potential block requests
                 self.process_potential_block_requests();
 
-                dbg!(self.import_queue.len());
                 // process any complete long-range batches
                 re_run = re_run || self.process_complete_batches();
-                dbg!(self.import_queue.len());
-                dbg!(&self.state);
             }
 
             // only process parent objects if we are in regular sync
@@ -1140,9 +1139,6 @@ impl<T: BeaconChainTypes> Future for SyncManager<T> {
                 re_run = re_run || self.process_complete_parent_requests();
             }
 
-            dbg!(self.import_queue.len());
-            dbg!(&self.state);
-
             // Shutdown the thread if the chain has termined
             if let None = self.chain.upgrade() {
                 return Ok(Async::Ready(()));
@@ -1152,8 +1148,6 @@ impl<T: BeaconChainTypes> Future for SyncManager<T> {
                 break;
             }
         }
-        dbg!(self.import_queue.len());
-        dbg!(&self.state);
 
         // update the state of the manager
         self.update_state();

beacon_node/network/src/sync/simple_sync.rs

@@ -352,7 +352,7 @@ impl<T: BeaconChainTypes> MessageProcessor<T> {
             "count" => beacon_blocks.len(),
         );
 
-        self.send_to_sync(SyncMessage::RecentBeaconBlocksResponse {
+        self.send_to_sync(SyncMessage::BeaconBlocksResponse {
             peer_id,
             request_id,
             beacon_blocks,
@@ -368,12 +368,12 @@ impl<T: BeaconChainTypes> MessageProcessor<T> {
     ) {
         debug!(
             self.log,
-            "BeaconBlocksResponse";
+            "RecentBeaconBlocksResponse";
             "peer" => format!("{:?}", peer_id),
             "count" => beacon_blocks.len(),
         );
 
-        self.send_to_sync(SyncMessage::BeaconBlocksResponse {
+        self.send_to_sync(SyncMessage::RecentBeaconBlocksResponse {
             peer_id,
             request_id,
             beacon_blocks,

tests/ef_tests/eth2.0-spec-tests

@@ -1 +1 @@
-Subproject commit aaa1673f508103e11304833e0456e4149f880065
+Subproject commit ae6dd9011df05fab8c7e651c09cf9c940973bf81