From 8cd71eebd15f914ceb7c175b5543eb0f1ad58486 Mon Sep 17 00:00:00 2001 From: Jacek Sieka Date: Tue, 4 Aug 2020 17:25:29 +0200 Subject: [PATCH] remove secureCodec there may be multiple connections per peerinfo with different codecs --- libp2p/peerinfo.nim | 2 -- libp2p/protocols/secure/noise.nim | 2 -- libp2p/protocols/secure/secio.nim | 2 -- 3 files changed, 6 deletions(-) diff --git a/libp2p/peerinfo.nim b/libp2p/peerinfo.nim index 33a930c0e..f86f9e983 100644 --- a/libp2p/peerinfo.nim +++ b/libp2p/peerinfo.nim @@ -29,7 +29,6 @@ type PeerInfo* = ref object of RootObj peerId*: PeerID addrs*: seq[MultiAddress] - secureCodec*: string protocols*: seq[string] lifefut: Future[void] protoVersion*: string @@ -50,7 +49,6 @@ proc `$`*(p: PeerInfo): string = p.id proc shortLog*(p: PeerInfo): auto = ( id: p.id(), - secureCodec: p.secureCodec, addrs: mapIt(p.addrs, $it), protocols: mapIt(p.protocols, $it), protoVersion: p.protoVersion, diff --git a/libp2p/protocols/secure/noise.nim b/libp2p/protocols/secure/noise.nim index 8f8ea1753..191971446 100644 --- a/libp2p/protocols/secure/noise.nim +++ b/libp2p/protocols/secure/noise.nim @@ -488,8 +488,6 @@ method handshake*(p: Noise, conn: Connection, initiator: bool): Future[SecureCon if conn.peerInfo != nil: conn.peerInfo else: PeerInfo.init(remotePubKey) - peerInfo.secureCodec = NoiseCodec - var tmp = NoiseConnection.init(conn, peerInfo, conn.observedAddr) if initiator: diff --git a/libp2p/protocols/secure/secio.nim b/libp2p/protocols/secure/secio.nim index da96909d8..52c3905b5 100644 --- a/libp2p/protocols/secure/secio.nim +++ b/libp2p/protocols/secure/secio.nim @@ -251,8 +251,6 @@ proc newSecioConn(conn: Connection, if conn.peerInfo != nil: conn.peerInfo else: PeerInfo.init(remotePubKey) - peerInfo.secureCodec = SecioCodec & "(" & cipher & ")" - result = SecioConn.init(conn, peerInfo, conn.observedAddr) let i0 = if order < 0: 1 else: 0