AaronFiore/electrum
1
0
Fork 0
Code Activity

lnrouter: penalty code simplification

Browse Source 
Co-authored-by: ghost43 <somber.night@protonmail.com>
This commit is contained in:
bitromortac
2021-04-06 19:27:44 +02:00
parent 4df67a4f78
commit 2a45fdf09b
1 changed files with 5 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
electrum/lnrouter.py
View File

@@ -334,29 +334,11 @@ class LiquidityHintMgr:
can_send = hint.can_send(node_from < node_to) can_send = hint.can_send(node_from < node_to)
cannot_send = hint.cannot_send(node_from < node_to) cannot_send = hint.cannot_send(node_from < node_to)
# if we know nothing about the channel, return a default penalty if cannot_send is not None and amount >= cannot_send:
if (can_send, cannot_send) == (None, None): return inf
return fee_for_edge_msat(amount, DEFAULT_PENALTY_BASE_MSAT, DEFAULT_PENALTY_PROPORTIONAL_MILLIONTH) if can_send is not None and amount <= can_send:
# next cases are with half information return 0
elif can_send and not cannot_send: return fee_for_edge_msat(amount, DEFAULT_PENALTY_BASE_MSAT, DEFAULT_PENALTY_PROPORTIONAL_MILLIONTH)
if amount <= can_send:
return 0
else:
return fee_for_edge_msat(amount, DEFAULT_PENALTY_BASE_MSAT, DEFAULT_PENALTY_PROPORTIONAL_MILLIONTH)
elif not can_send and cannot_send:
if amount >= cannot_send:
return inf
else:
return fee_for_edge_msat(amount, DEFAULT_PENALTY_BASE_MSAT, DEFAULT_PENALTY_PROPORTIONAL_MILLIONTH)
# we know how much we can/cannot send
elif can_send and cannot_send:
if amount <= can_send:
return 0
elif amount < cannot_send:
return fee_for_edge_msat(amount, DEFAULT_PENALTY_BASE_MSAT, DEFAULT_PENALTY_PROPORTIONAL_MILLIONTH)
else:
return inf
return 0
@with_lock @with_lock
def add_to_blacklist(self, node_from: bytes, node_to: bytes, channel_id: ShortChannelID): def add_to_blacklist(self, node_from: bytes, node_to: bytes, channel_id: ShortChannelID):