Fix compile issues and modify type names

beacon_node/rpc/src/beacon_block.rs

@@ -1,17 +1,20 @@
+use crossbeam_channel;
+use eth2_libp2p::rpc::methods::BlockRootSlot;
+use eth2_libp2p::PubsubMessage;
 use futures::Future;
 use grpcio::{RpcContext, UnarySink};
+use network::NetworkMessage;
 use protos::services::{
     BeaconBlock as BeaconBlockProto, ProduceBeaconBlockRequest, ProduceBeaconBlockResponse,
     PublishBeaconBlockRequest, PublishBeaconBlockResponse,
 };
 use protos::services_grpc::BeaconBlockService;
 use slog::Logger;
-use crossbeam_channel;
-use network::NetworkMessage;
+use types::{Hash256, Slot};
 
 #[derive(Clone)]
 pub struct BeaconBlockServiceInstance {
-    network_chan: crossbeam_channel::Sender<NetworkMessage>,
+    pub network_chan: crossbeam_channel::Sender<NetworkMessage>,
     pub log: Logger,
 }
 
@@ -47,14 +50,21 @@ impl BeaconBlockService for BeaconBlockServiceInstance {
         sink: UnarySink<PublishBeaconBlockResponse>,
     ) {
         let block = req.get_block();
-        println!("publishing {:?}", block);
+        let block_root = Hash256::from_slice(block.get_block_root());
+        let block_slot = BlockRootSlot {
+            block_root,
+            slot: Slot::from(block.get_slot()),
+        };
+        println!("publishing block with root {:?}", block_root);
 
-
-        // TODO: Obtain from the network properly.
-        let topic = types::TopicBuilder::from("beacon_chain").build();
+        // TODO: Obtain topics from the network service properly.
+        let topic = types::TopicBuilder::new("beacon_chain".to_string()).build();
+        let message = PubsubMessage::Block(block_slot);
         println!("Sending beacon block to gossipsub");
-        network_chan.send(NetworkMessage::Publish(
-
+        self.network_chan.send(NetworkMessage::Publish {
+            topics: vec![topic],
+            message,
+        });
 
         // TODO: actually process the block.
         let mut resp = PublishBeaconBlockResponse::new();

beacon_node/rpc/src/lib.rs

@@ -11,6 +11,7 @@ use self::validator::ValidatorServiceInstance;
 pub use config::Config as RPCConfig;
 use futures::{future, Future};
 use grpcio::{Environment, Server, ServerBuilder};
+use network::NetworkMessage;
 use protos::services_grpc::{
     create_beacon_block_service, create_beacon_node_service, create_validator_service,
 };
@@ -42,8 +43,9 @@ pub fn start_server(
 
     let beacon_block_service = {
         let instance = BeaconBlockServiceInstance {
-            network_chan
-            log: log.clone() };
+            network_chan,
+            log: log.clone(),
+        };
         create_beacon_block_service(instance)
     };
     let validator_service = {