AaronFiore/electrum
1
0
Fork 0
Code Activity

follow-up previous commit

Browse Source
This commit is contained in:
ThomasV
2019-03-05 17:37:01 +01:00
parent 46aa5c1958
commit 436c313790
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
electrum/lnrouter.py
View File

@@ -521,16 +521,16 @@ class ChannelDB(PrintError):
old_policy.timestamp = new_policy.timestamp old_policy.timestamp = new_policy.timestamp
@sql @sql
def get_policy_for_node(self, node) -> Optional['Policy']: def get_policy_for_node(self, channel_info, node) -> Optional['Policy']:
""" """
raises when initiator/non-initiator both unequal node raises when initiator/non-initiator both unequal node
""" """
if node.hex() not in (self.node1_id, self.node2_id): if node.hex() not in (channel_info.node1_id, channel_info.node2_id):
raise Exception("the given node is not a party in this channel") raise Exception("the given node is not a party in this channel")
n1 = self.DBSession.query(Policy).filter_by(short_channel_id = self.short_channel_id, start_node = self.node1_id).one_or_none() n1 = self.DBSession.query(Policy).filter_by(short_channel_id = channel_info.short_channel_id, start_node = channel_info.node1_id).one_or_none()
if n1: if n1:
return n1 return n1
n2 = self.DBSession.query(Policy).filter_by(short_channel_id = self.short_channel_id, start_node = self.node2_id).one_or_none() n2 = self.DBSession.query(Policy).filter_by(short_channel_id = channel_info.short_channel_id, start_node = channel_info.node2_id).one_or_none()
return n2 return n2
@sql @sql

4
electrum/lnworker.py
View File

@@ -635,7 +635,7 @@ class LNWorker(PrintError):
cltv_expiry_delta = 1 # lnd won't even try with zero cltv_expiry_delta = 1 # lnd won't even try with zero
missing_info = True missing_info = True
if channel_info: if channel_info:
policy = channel_info.get_policy_for_node(chan.node_id) policy = self.channel_db.get_policy_for_node(channel_info, chan.node_id)
if policy: if policy:
fee_base_msat = policy.fee_base_msat fee_base_msat = policy.fee_base_msat
fee_proportional_millionths = policy.fee_proportional_millionths fee_proportional_millionths = policy.fee_proportional_millionths
@@ -774,7 +774,7 @@ class LNWorker(PrintError):
await self.add_peer(peer.host, peer.port, peer.pubkey) await self.add_peer(peer.host, peer.port, peer.pubkey)
return return
# try random address for node_id # try random address for node_id
node_info = await self.channel_db._nodes_get(chan.node_id) node_info = self.channel_db.nodes_get(chan.node_id)
if not node_info: return if not node_info: return
addresses = self.channel_db.get_node_addresses(node_info) addresses = self.channel_db.get_node_addresses(node_info)
if not addresses: return if not addresses: return