From a31d6bcb22f6010a9b737efe780cff1fef940f02 Mon Sep 17 00:00:00 2001
From: Age Manning <Age@AgeManning.com>
Date: Wed, 3 Apr 2019 13:50:11 +1100
Subject: [PATCH] RPC methods get pubsub topics from chain spec

---
 beacon_node/network/src/sync/simple_sync.rs | 3 ++-
 beacon_node/rpc/src/attestation.rs          | 5 ++++-
 beacon_node/rpc/src/beacon_block.rs         | 6 +++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/beacon_node/network/src/sync/simple_sync.rs b/beacon_node/network/src/sync/simple_sync.rs
index 2382e47a4..0e2103900 100644
--- a/beacon_node/network/src/sync/simple_sync.rs
+++ b/beacon_node/network/src/sync/simple_sync.rs
@@ -4,7 +4,8 @@ use beacon_chain::{BeaconChain, BeaconChainTypes, BlockProcessingOutcome};
 use eth2_libp2p::rpc::methods::*;
 use eth2_libp2p::rpc::{RPCRequest, RPCResponse, RequestId};
 use eth2_libp2p::PeerId;
-use slog::{debug, error, info, o, warn};
+use slog::{debug, error, info, o, trace, warn};
+use ssz::TreeHash;
 use std::collections::HashMap;
 use std::sync::Arc;
 use std::time::Duration;
diff --git a/beacon_node/rpc/src/attestation.rs b/beacon_node/rpc/src/attestation.rs
index a64ec620f..c89cbbbb0 100644
--- a/beacon_node/rpc/src/attestation.rs
+++ b/beacon_node/rpc/src/attestation.rs
@@ -136,8 +136,11 @@ impl<T: BeaconChainTypes> AttestationService for AttestationServiceInstance<T> {
                     "type" => "valid_attestation",
                 );
 
+                // get the network topic to send on
+                let topic_string = self.chain.get_spec().shard_topic_prefix.clone();
+
                 // valid attestation, propagate to the network
-                let topic = types::TopicBuilder::new("attestations".to_string()).build();
+                let topic = types::TopicBuilder::new(topic_string).build();
                 let message = PubsubMessage::Attestation(attestation);
 
                 self.network_chan
diff --git a/beacon_node/rpc/src/beacon_block.rs b/beacon_node/rpc/src/beacon_block.rs
index 533fd285a..791c5008d 100644
--- a/beacon_node/rpc/src/beacon_block.rs
+++ b/beacon_node/rpc/src/beacon_block.rs
@@ -104,9 +104,9 @@ impl<T: BeaconChainTypes> BeaconBlockService for BeaconBlockServiceInstance<T> {
                                 "block_root" => format!("{}", block_root),
                             );
 
-                            // TODO: Obtain topics from the network service properly.
-                            let topic =
-                                types::TopicBuilder::new("beacon_chain".to_string()).build();
+                            // get the network topic to send on
+                            let topic_string = self.chain.get_spec().beacon_chain_topic.clone();
+                            let topic = types::TopicBuilder::new(topic_string).build();
                             let message = PubsubMessage::Block(block);
 
                             // Publish the block to the p2p network via gossipsub.