AaronFiore/electrum
1
0
Fork 0
Code Activity

move LNPeer handshake back into initialize

Browse Source
This commit is contained in:
ThomasV
2019-02-02 08:53:06 +01:00
parent 42cbe74e95
commit a3c6f82bb2
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
electrum/lnbase.py
View File

@@ -232,6 +232,9 @@ class Peer(PrintError):
self.transport.send_bytes(gen_msg(message_name, **kwargs)) self.transport.send_bytes(gen_msg(message_name, **kwargs))
async def initialize(self): async def initialize(self):
if isinstance(self.transport, LNTransport):
await self.transport.handshake()
self.channel_db.add_recent_peer(self.transport.peer_addr)
self.send_message("init", gflen=0, lflen=1, localfeatures=self.localfeatures) self.send_message("init", gflen=0, lflen=1, localfeatures=self.localfeatures)
@property @property

1
electrum/lntransport.py
View File

@@ -214,6 +214,7 @@ class LNTransport(LNTransportBase):
self.remote_pubkey = peer_addr.pubkey self.remote_pubkey = peer_addr.pubkey
self.host = peer_addr.host self.host = peer_addr.host
self.port = peer_addr.port self.port = peer_addr.port
self.peer_addr = peer_addr
def name(self): def name(self):
return str(self.host) + ':' + str(self.port) return str(self.host) + ':' + str(self.port)

5
electrum/lnworker.py
View File

@@ -249,11 +249,6 @@ class LNWorker(PrintError):
port = int(port) port = int(port)
peer_addr = LNPeerAddr(host, port, node_id) peer_addr = LNPeerAddr(host, port, node_id)
transport = LNTransport(self.node_keypair.privkey, peer_addr) transport = LNTransport(self.node_keypair.privkey, peer_addr)
try:
await transport.handshake()
except:
return
self.channel_db.add_recent_peer(peer_addr)
self._last_tried_peer[peer_addr] = time.time() self._last_tried_peer[peer_addr] = time.time()
self.print_error("adding peer", peer_addr) self.print_error("adding peer", peer_addr)
peer = Peer(self, node_id, transport, request_initial_sync=self.config.get("request_initial_sync", True)) peer = Peer(self, node_id, transport, request_initial_sync=self.config.get("request_initial_sync", True))