AaronFiore/electrum
1
0
Fork 0
Code Activity

lnchannel: rm "is_closing" method - has confusing semantics

Browse Source 
(and there is intentional behaviour changes here, due to erroneous use of "is_closing")
This commit is contained in:
SomberNight
2022-06-10 15:10:52 +02:00
parent ff1c8b912e
commit ee85f98fd6
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
electrum/lnchannel.py
View File

@@ -196,9 +196,6 @@ class AbstractChannel(Logger, ABC):
def is_open(self): def is_open(self):
return self.get_state() == ChannelState.OPEN return self.get_state() == ChannelState.OPEN
def is_closing(self):
return ChannelState.SHUTDOWN <= self.get_state() <= ChannelState.FORCE_CLOSING
def is_closed(self): def is_closed(self):
# the closing txid has been saved # the closing txid has been saved
return self.get_state() >= ChannelState.CLOSING return self.get_state() >= ChannelState.CLOSING
@@ -785,7 +782,7 @@ class Channel(AbstractChannel):
def can_send_ctx_updates(self) -> bool: def can_send_ctx_updates(self) -> bool:
"""Whether we can send update_fee, update_*_htlc changes to the remote.""" """Whether we can send update_fee, update_*_htlc changes to the remote."""
if not (self.is_open() or self.is_closing()): if self.get_state() not in (ChannelState.OPEN, ChannelState.SHUTDOWN):
return False return False
if self.peer_state != PeerState.GOOD: if self.peer_state != PeerState.GOOD:
return False return False
@@ -794,7 +791,7 @@ class Channel(AbstractChannel):
return True return True
def can_send_update_add_htlc(self) -> bool: def can_send_update_add_htlc(self) -> bool:
return self.can_send_ctx_updates() and not self.is_closing() return self.can_send_ctx_updates() and self.is_open()
def is_frozen_for_sending(self) -> bool: def is_frozen_for_sending(self) -> bool:
if self.lnworker and self.lnworker.channel_db is None and not self.lnworker.is_trampoline_peer(self.node_id): if self.lnworker and self.lnworker.channel_db is None and not self.lnworker.is_trampoline_peer(self.node_id):