diff --git a/protocols/kad/src/behaviour.rs b/protocols/kad/src/behaviour.rs index 8f467408..baf331e6 100644 --- a/protocols/kad/src/behaviour.rs +++ b/protocols/kad/src/behaviour.rs @@ -330,7 +330,7 @@ where kbucket::Entry::Absent(entry) => { debug!( "Will insert newly connected node {} with key {}", - entry.key().clone().into_preimage().to_base58(), + entry.key().clone().into_preimage(), bs58::encode(entry.key().as_ref()).into_string() ); let contact = Contact { @@ -624,8 +624,8 @@ where debug!( "Local provider for {}: {}; source: {}; found? {}", bs58::encode(key).into_string(), - p.provider.to_base58(), - source.to_base58(), + p.provider, + source, entry.is_some() ); entry @@ -718,7 +718,7 @@ where let weight = trust.weight(contact.public_key.clone()).unwrap_or(0); debug!( "Calculated weight for {} pk {}: {}", - entry.key().preimage().to_base58(), + entry.key().preimage(), bs58::encode(contact.public_key.encode().to_vec().as_slice()).into_string(), weight ); @@ -1164,7 +1164,7 @@ where let len = kademlia_key.len(); let kademlia_key = &kademlia_key[len - 10..]; - let peer_id = node.key.preimage().to_base58(); + let peer_id = node.key.preimage().to_string(); let len = peer_id.len(); let peer_id = &peer_id[len - 10..]; @@ -1361,7 +1361,7 @@ where let provider_peers = self.provider_peers(&key, &source); debug!( "provider peers: {}", - provider_peers.iter().map(|p| p.node_id.to_base58() + ", ").collect::() + provider_peers.iter().map(|p| p.node_id.to_string() + ", ").collect::() ); let closer_peers = self.find_closest(&kbucket::Key::new(key), &source); self.queued_events.push_back(NetworkBehaviourAction::NotifyHandler { diff --git a/protocols/kad/src/query/peers/closest.rs b/protocols/kad/src/query/peers/closest.rs index 4d53711f..0678fbbe 100644 --- a/protocols/kad/src/query/peers/closest.rs +++ b/protocols/kad/src/query/peers/closest.rs @@ -289,7 +289,7 @@ impl ClosestPeersIter { trace!( "ClosestPeerIter: target = {}; peer {} timed out", bs58::encode(&self.target).into_string(), - peer.key.preimage().to_base58() + peer.key.preimage() ); } else if at_capacity { @@ -311,7 +311,7 @@ impl ClosestPeersIter { trace!( "ClosestPeerIter: target = {}; peer {} succeeded", bs58::encode(&self.target).into_string(), - peer.key.preimage().to_base58() + peer.key.preimage() ); *cnt += 1; // If `num_results` successful results have been delivered for the @@ -331,7 +331,7 @@ impl ClosestPeersIter { trace!( "ClosestPeerIter: target = {}; new peer {}. Capacity left? {}", bs58::encode(&self.target).into_string(), - peer.key.preimage().to_base58(), + peer.key.preimage(), !at_capacity ); if !at_capacity { @@ -349,7 +349,7 @@ impl ClosestPeersIter { trace!( "ClosestPeerIter: target = {}; peer {} is {:?}", bs58::encode(&self.target).into_string(), - peer.key.preimage().to_base58(), + peer.key.preimage(), peer.state ); }