Merge latest master

beacon_node/eth2-libp2p/Cargo.toml

@@ -13,9 +13,9 @@ enr =  { git = "https://github.com/SigP/rust-libp2p/", rev = "be5710bbde69d8c5be
 types = { path =  "../../eth2/types" }
 serde = "1.0"
 serde_derive = "1.0"
-ssz = { path = "../../eth2/utils/ssz" }
-ssz_derive = { path = "../../eth2/utils/ssz_derive" }
-slog = { version = "2.4.1" , features = ["max_level_trace", "release_max_level_trace"] }
+eth2_ssz = { path = "../../eth2/utils/ssz" }
+eth2_ssz_derive = { path = "../../eth2/utils/ssz_derive" }
+slog = { version = "^2.4.1" , features = ["max_level_trace"] }
 version = { path = "../version" }
 tokio = "0.1.16"
 futures = "0.1.25"

beacon_node/eth2-libp2p/src/rpc/protocol.rs

@@ -25,6 +25,8 @@ const PROTOCOL_PREFIX: &str = "/eth/serenity/rpc/";
 const REQUEST_TIMEOUT: u64 = 3;
 
 /// Implementation of the `ConnectionUpgrade` for the RPC protocol.
+const MAX_READ_SIZE: usize = 4_194_304; // 4M
+
 #[derive(Debug, Clone)]
 pub struct RPCProtocol;
 

beacon_node/eth2-libp2p/src/service.rs

@@ -109,8 +109,6 @@ impl Stream for Service {
 
     fn poll(&mut self) -> Poll<Option<Self::Item>, Self::Error> {
         loop {
-            // TODO: Currently only gossipsub events passed here.
-            // Build a type for more generic events
             match self.swarm.poll() {
                 //Behaviour events
                 Ok(Async::Ready(Some(event))) => match event {