From 06a72614cb25d3a353e639a9d14c9a1770a9877d Mon Sep 17 00:00:00 2001
From: pscott <30843220+pscott@users.noreply.github.com>
Date: Thu, 18 Jun 2020 09:42:42 +0200
Subject: [PATCH] Make all features explicit (#1251)

* Make all features explicit

* Remove default feature and add missing newline to cargo.toml

* Fix compilation for --feature libp2p-websocket

Signed-off-by: pscott <scottpiriou@gmail.com>

* Remove 'with-arbitrary'
---
 beacon_node/eth2-libp2p/Cargo.toml     | 3 +++
 beacon_node/eth2-libp2p/src/service.rs | 2 +-
 beacon_node/rest_api/Cargo.toml        | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/beacon_node/eth2-libp2p/Cargo.toml b/beacon_node/eth2-libp2p/Cargo.toml
index 8b64e6ad9..5adc2d2db 100644
--- a/beacon_node/eth2-libp2p/Cargo.toml
+++ b/beacon_node/eth2-libp2p/Cargo.toml
@@ -51,3 +51,6 @@ slog-term = "2.5.0"
 slog-async = "2.5.0"
 tempdir = "0.3.7"
 exit-future = "0.2.0"
+
+[features]
+libp2p-websocket = []
diff --git a/beacon_node/eth2-libp2p/src/service.rs b/beacon_node/eth2-libp2p/src/service.rs
index 70e57804b..95d7485c7 100644
--- a/beacon_node/eth2-libp2p/src/service.rs
+++ b/beacon_node/eth2-libp2p/src/service.rs
@@ -379,7 +379,7 @@ fn build_transport(
     #[cfg(feature = "libp2p-websocket")]
     let transport = {
         let trans_clone = transport.clone();
-        transport.or_transport(websocket::WsConfig::new(trans_clone))
+        transport.or_transport(libp2p::websocket::WsConfig::new(trans_clone))
     };
     // Authentication
     let transport = transport
diff --git a/beacon_node/rest_api/Cargo.toml b/beacon_node/rest_api/Cargo.toml
index 122887d71..e226df87f 100644
--- a/beacon_node/rest_api/Cargo.toml
+++ b/beacon_node/rest_api/Cargo.toml
@@ -46,3 +46,6 @@ assert_matches = "1.3.0"
 remote_beacon_node = { path = "../../common/remote_beacon_node" }
 node_test_rig = { path = "../../testing/node_test_rig" }
 tree_hash = "0.1.0"
+
+[features]
+fake_crypto = []