Merge pull request #8 from SurfingNerd/merge-i247-0.12

Merge i247

Author: SurfingNerd

Cargo.lock

@@ -75,7 +75,7 @@ kvdb = "0.1"
 kvdb-rocksdb = "0.1.3"
 journaldb = { path = "crates/db/journaldb" }
 stats = { path = "crates/util/stats" }
-prometheus = "0.13.3"
+prometheus = "0.14"
 fs-swap = "0.2.6"
 net2 = "0.2.38"
 

Cargo.toml

@@ -594,7 +594,7 @@ impl NetworkProtocolHandler for SyncProtocolHandler {
     fn read(&self, io: &dyn NetworkContext, peer: &PeerId, packet_id: u8, data: &[u8]) {
         let session_info = io.session_info(*peer);
         if session_info.is_none() {
-            debug!(target: "sync", "Received packet from peer, where no Session info is available anymore (was just disconnected ??): {peer}");
+            debug!(target: "sync", "Received packet from peer, where no Session info is available anymore (was just disconnected ?): {peer}");
             return;
         }
         let node_id = io.session_info(*peer).unwrap().id;
@@ -614,7 +614,7 @@ impl NetworkProtocolHandler for SyncProtocolHandler {
             .unwrap_or_else(|| panic!("peer not found: {peer}"))
             .id;
         if io.is_reserved_peer(*peer) {
-            trace!(target: "sync", "Connected to reserved peer {node_id:?} {peer}" );
+            debug!(target: "sync", "Connected to reserved peer {node_id:?} {peer}" );
         }
         // If warp protocol is supported only allow warp handshake
         let warp_protocol = io.protocol_version(PAR_PROTOCOL, *peer).unwrap_or(0) != 0;
@@ -630,7 +630,7 @@ impl NetworkProtocolHandler for SyncProtocolHandler {
     fn disconnected(&self, io: &dyn NetworkContext, peer: &PeerId) {
         trace_time!("sync::disconnected");
         if io.is_reserved_peer(*peer) {
-            warn!(target: "sync", "Disconnected from reserved peer peerID: {} protocol: {} peer: {}",peer , io.subprotocol_name(),  io.session_info(*peer).expect("").id.map_or("".to_string(), |f| format!("{:?}", f)));
+            debug!(target: "sync", "Disconnected from reserved peer peerID: {} protocol: {} peer: {}",peer , io.subprotocol_name(),  io.session_info(*peer).expect("").id.map_or("".to_string(), |f| format!("{:?}", f)));
         }
         if io.subprotocol_name() != PAR_PROTOCOL {
             self.sync.write().on_peer_aborting(

crates/ethcore/sync/src/api.rs

@@ -6,5 +6,5 @@ edition = "2018"
 
 [dependencies]
 log = "0.4"
-prometheus = "0.13.3"
+prometheus = "0.14"
 vergen = "0.1"