Propagate RPC through network service.

- Basic network message handler threading
- Correct references

beacon_node/network/src/message_handler.rs

@@ -1,7 +1,10 @@
 use crate::error;
 use crate::messages::NodeMessage;
-use crossbeam_channel::{unbounded as channel, Sender};
-use libp2p::PeerId;
+use crossbeam_channel::{unbounded as channel, Sender, TryRecvError};
+use futures::future;
+use futures::prelude::*;
+use libp2p::rpc;
+use libp2p::{PeerId, RpcEvent};
 use slog::debug;
 use sync::SimpleSync;
 use types::Hash256;
@@ -11,9 +14,11 @@ pub struct MessageHandler {
     sync: SimpleSync,
     //TODO: Implement beacon chain
     //chain: BeaconChain
+    log: slog::Logger,
 }
 
 /// Types of messages the handler can receive.
+#[derive(Debug, Clone)]
 pub enum HandlerMessage {
     /// Peer has connected.
     PeerConnected(PeerId),
@@ -21,11 +26,16 @@ pub enum HandlerMessage {
     PeerDisconnected(PeerId),
     /// A Node message has been received.
     Message(PeerId, NodeMessage),
+    /// An RPC response/request has been received.
+    RPC(RpcEvent),
 }
 
 impl MessageHandler {
     /// Initializes and runs the MessageHandler.
-    pub fn new(log: slog::Logger) -> error::Result<Sender<HandlerMessage>> {
+    pub fn new(
+        executor: &tokio::runtime::TaskExecutor,
+        log: slog::Logger,
+    ) -> error::Result<Sender<HandlerMessage>> {
         debug!(log, "Service starting");
 
         let (handler_send, handler_recv) = channel();
@@ -33,12 +43,29 @@ impl MessageHandler {
         // Initialise sync and begin processing in thread
         //TODO: Load genesis from BeaconChain
         let temp_genesis = Hash256::zero();
+
+        // generate the Message handler
         let sync = SimpleSync::new(temp_genesis);
+        //TODO: Initialise beacon chain
+        let mut handler = MessageHandler {
+            sync,
+            log: log.clone(),
+        };
 
-        let handler = MessageHandler { sync };
-
-        // spawn handler thread
+        // spawn handler task
+        // TODO: Handle manual termination of thread
+        executor.spawn(future::poll_fn(move || -> Result<_, _> {
+            loop {
+                handler.handle_message(handler_recv.recv().map_err(|_| {
+                    debug!(log, "Handler channel closed. Handler terminating");
+                })?);
+            }
+        }));
 
         Ok(handler_send)
     }
+
+    fn handle_message(&mut self, message: HandlerMessage) {
+        debug!(self.log, "Message received {:?}", message);
+    }
 }

beacon_node/network/src/messages.rs

@@ -1,27 +1,16 @@
 use libp2p::PeerId;
+use libp2p::{HelloMessage, RpcEvent};
 use types::{Hash256, Slot};
 
 /// Messages between nodes across the network.
 #[derive(Debug, Clone)]
 pub enum NodeMessage {
-    Status(Status),
+    RPC(RpcEvent),
     BlockRequest,
     // TODO: only for testing - remove
     Message(String),
 }
 
-#[derive(Debug, Clone)]
-pub struct Status {
-    /// Current node version.
-    version: u8,
-    /// Genesis Hash.
-    genesis_hash: Hash256,
-    /// Best known slot number.
-    best_slot: Slot,
-    /// Best known slot hash.
-    best_slot_hash: Hash256,
-}
-
 /// Types of messages that the network service can receive.
 #[derive(Debug, Clone)]
 pub enum NetworkMessage {

beacon_node/network/src/service.rs

@@ -28,12 +28,12 @@ pub struct Service {
 impl Service {
     pub fn new(
         config: NetworkConfig,
-        executor: TaskExecutor,
+        executor: &TaskExecutor,
         log: slog::Logger,
     ) -> error::Result<(Arc<Self>, Sender<NetworkMessage>)> {
         // launch message handler thread
         let message_handler_log = log.new(o!("Service" => "MessageHandler"));
-        let message_handler_send = MessageHandler::new(message_handler_log)?;
+        let message_handler_send = MessageHandler::new(executor, message_handler_log)?;
 
         // launch libp2p service
         let libp2p_log = log.new(o!("Service" => "Libp2p"));
@@ -61,7 +61,7 @@ impl Service {
 fn spawn_service(
     libp2p_service: LibP2PService,
     message_handler_send: crossbeam_channel::Sender<HandlerMessage>,
-    executor: TaskExecutor,
+    executor: &TaskExecutor,
     log: slog::Logger,
 ) -> error::Result<(
     crossbeam_channel::Sender<NetworkMessage>,
@@ -99,6 +99,15 @@ fn network_service(
         // poll the swarm
         loop {
             match libp2p_service.poll() {
+                Ok(Async::Ready(Some(Libp2pEvent::RPC(rpc_event)))) => {
+                    debug!(
+                        libp2p_service.log,
+                        "RPC Event: Rpc message received: {:?}", rpc_event
+                    );
+                    message_handler_send
+                        .send(HandlerMessage::RPC(rpc_event))
+                        .map_err(|_| "failed to send rpc to handler");
+                }
                 Ok(Async::Ready(Some(Libp2pEvent::Message(m)))) => debug!(
                     libp2p_service.log,
                     "Network Service: Message received: {}", m