Merge branch 'master' into as-listener

mxinden · Jan 13, 2022 · 97957ca · 97957ca
2 parents cd5e790 + ddc0351
commit 97957ca
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/protocols/gossipsub/src/handler.rs b/protocols/gossipsub/src/handler.rs
@@ -211,9 +211,11 @@ impl ProtocolsHandler for GossipsubHandler {
 
     fn inject_fully_negotiated_inbound(
         &mut self,
-        (substream, peer_kind): <Self::InboundProtocol as InboundUpgrade<NegotiatedSubstream>>::Output,
+        protocol: <Self::InboundProtocol as InboundUpgrade<NegotiatedSubstream>>::Output,
         _info: Self::InboundOpenInfo,
     ) {
+        let (substream, peer_kind) = protocol;
+
         // If the peer doesn't support the protocol, reject all substreams
         if self.protocol_unsupported {
             return;
@@ -233,9 +235,11 @@ impl ProtocolsHandler for GossipsubHandler {
 
     fn inject_fully_negotiated_outbound(
         &mut self,
-        (substream, peer_kind): <Self::OutboundProtocol as OutboundUpgrade<NegotiatedSubstream>>::Output,
+        protocol: <Self::OutboundProtocol as OutboundUpgrade<NegotiatedSubstream>>::Output,
         message: Self::OutboundOpenInfo,
     ) {
+        let (substream, peer_kind) = protocol;
+
         // If the peer doesn't support the protocol, reject all substreams
         if self.protocol_unsupported {
             return;

diff --git a/protocols/mdns/src/behaviour/iface/dns.rs b/protocols/mdns/src/behaviour/iface/dns.rs
@@ -127,7 +127,7 @@ pub fn build_query_response(
     // Encode the addresses as TXT records, and multiple TXT records into a
     // response packet.
     for addr in addresses {
-        let txt_to_send = format!("dnsaddr={}/p2p/{}", addr.to_string(), peer_id.to_base58());
+        let txt_to_send = format!("dnsaddr={}/p2p/{}", addr, peer_id.to_base58());
         let mut txt_record = Vec::with_capacity(txt_to_send.len());
         match append_txt_record(&mut txt_record, &peer_name_bytes, ttl, &txt_to_send) {
             Ok(()) => {