From 0e9c70750030d91fc6eefa8125307b19fe20e902 Mon Sep 17 00:00:00 2001 From: ThomasV Date: Tue, 19 Mar 2019 12:46:54 +0100 Subject: [PATCH] lnrouter: fix get_last_good_address: one_or_none -> all --- electrum/lnrouter.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/electrum/lnrouter.py b/electrum/lnrouter.py index 40b770669..2e4e7ce20 100644 --- a/electrum/lnrouter.py +++ b/electrum/lnrouter.py @@ -261,14 +261,11 @@ class ChannelDB(SqlDB): @sql def get_last_good_address(self, node_id) -> Optional[LNPeerAddr]: - adr_db = self.DBSession \ - .query(Address) \ - .filter_by(node_id = node_id.hex()) \ - .order_by(Address.last_connected_date.desc()) \ - .one_or_none() - if not adr_db: + r = self.DBSession.query(Address).filter_by(node_id=node_id.hex()).order_by(Address.last_connected_date.desc()).all() + if not r: return None - return LNPeerAddr(adr_db.host, adr_db.port, bytes.fromhex(adr_db.node_id)) + addr = r[0] + return LNPeerAddr(addr.host, addr.port, bytes.fromhex(addr.node_id)) @sql def get_recent_peers(self):