Remove grpc from beacon_node

beacon_node/client/Cargo.toml

@@ -13,7 +13,6 @@ beacon_chain = { path = "../beacon_chain" }
 store = { path = "../store" }
 network = { path = "../network" }
 eth2-libp2p = { path = "../eth2-libp2p" }
-rpc = { path = "../rpc" }
 rest_api = { path = "../rest_api" }
 websocket_server = { path = "../websocket_server" }
 prometheus = "0.7.0"

beacon_node/client/src/builder.rs

@@ -19,7 +19,6 @@ use genesis::{
 use lighthouse_bootstrap::Bootstrapper;
 use lmd_ghost::LmdGhost;
 use network::{NetworkConfig, NetworkMessage, Service as NetworkService};
-use rpc::Config as RpcConfig;
 use slog::{debug, error, info, warn};
 use std::net::SocketAddr;
 use std::path::Path;
@@ -267,35 +266,6 @@ where
         Ok(self)
     }
 
-    /// Immediately starts the gRPC server (gRPC is soon to be deprecated).
-    pub fn grpc_server(mut self, config: &RpcConfig) -> Result<Self, String> {
-        let beacon_chain = self
-            .beacon_chain
-            .clone()
-            .ok_or_else(|| "grpc_server requires a beacon chain")?;
-        let context = self
-            .runtime_context
-            .as_ref()
-            .ok_or_else(|| "grpc_server requires a runtime_context")?
-            .service_context("grpc");
-        let network_send = self
-            .libp2p_network_send
-            .clone()
-            .ok_or_else(|| "grpc_server requires a libp2p network")?;
-
-        let exit_signal = rpc::start_server(
-            config,
-            &context.executor,
-            network_send,
-            beacon_chain,
-            context.log,
-        );
-
-        self.exit_signals.push(exit_signal);
-
-        Ok(self)
-    }
-
     /// Immediately starts the beacon node REST API http server.
     pub fn http_server(
         mut self,
@@ -305,7 +275,7 @@ where
         let beacon_chain = self
             .beacon_chain
             .clone()
-            .ok_or_else(|| "grpc_server requires a beacon chain")?;
+            .ok_or_else(|| "http_server requires a beacon chain")?;
         let context = self
             .runtime_context
             .as_ref()
@@ -314,11 +284,11 @@ where
         let network = self
             .libp2p_network
             .clone()
-            .ok_or_else(|| "grpc_server requires a libp2p network")?;
+            .ok_or_else(|| "http_server requires a libp2p network")?;
         let network_send = self
             .libp2p_network_send
             .clone()
-            .ok_or_else(|| "grpc_server requires a libp2p network sender")?;
+            .ok_or_else(|| "http_server requires a libp2p network sender")?;
 
         let network_info = rest_api::NetworkInfo {
             network_service: network.clone(),

beacon_node/client/src/config.rs

@@ -53,7 +53,6 @@ pub struct Config {
     /// via the CLI at runtime, instead of from a configuration file saved to disk.
     pub genesis: ClientGenesis,
     pub network: network::NetworkConfig,
-    pub rpc: rpc::Config,
     pub rest_api: rest_api::Config,
     pub websocket_server: websocket_server::Config,
     pub eth1: eth1::Config,
@@ -68,7 +67,6 @@ impl Default for Config {
             db_name: "chain_db".to_string(),
             genesis: <_>::default(),
             network: NetworkConfig::new(),
-            rpc: <_>::default(),
             rest_api: <_>::default(),
             websocket_server: <_>::default(),
             spec_constants: TESTNET_SPEC_CONSTANTS.into(),
@@ -145,7 +143,6 @@ impl Config {
         };
 
         self.network.apply_cli_args(args)?;
-        self.rpc.apply_cli_args(args)?;
         self.rest_api.apply_cli_args(args)?;
         self.websocket_server.apply_cli_args(args)?;