Browse Source

simplify syntax

regtest_lnd
ThomasV 6 years ago
committed by SomberNight
parent
commit
241b855dbb
No known key found for this signature in database GPG Key ID: B33B5F232C6271E9
  1. 13
      electrum/lnhtlc.py

13
electrum/lnhtlc.py

@ -659,15 +659,8 @@ class HTLCStateMachine(PrintError):
pending_fee = FeeUpdate(self, rate=feerate) pending_fee = FeeUpdate(self, rate=feerate)
self.fee_mgr.append(pending_fee) self.fee_mgr.append(pending_fee)
@staticmethod
def remove_unlocked(log):
copy = []
for i in log:
if type(i) is not UpdateAddHtlc or i.locked_in[LOCAL] is not None or i.locked_in[REMOTE] is not None:
copy.append(i)
return copy
def to_save(self): def to_save(self):
is_locked = lambda i: type(i) is not UpdateAddHtlc or i.locked_in[LOCAL] is not None or i.locked_in[REMOTE] is not None
return { return {
"local_config": self.local_config, "local_config": self.local_config,
"remote_config": self.remote_config, "remote_config": self.remote_config,
@ -679,8 +672,8 @@ class HTLCStateMachine(PrintError):
"funding_outpoint": self.funding_outpoint, "funding_outpoint": self.funding_outpoint,
"node_id": self.node_id, "node_id": self.node_id,
"remote_commitment_to_be_revoked": str(self.remote_commitment_to_be_revoked), "remote_commitment_to_be_revoked": str(self.remote_commitment_to_be_revoked),
"remote_log": [(type(x).__name__, x) for x in self.remove_unlocked(self.log[REMOTE])], "remote_log": [(type(x).__name__, x) for x in filter(is_locked, self.log[REMOTE])],
"local_log": [(type(x).__name__, x) for x in self.remove_unlocked(self.log[LOCAL])], "local_log": [(type(x).__name__, x) for x in filter(is_locked, self.log[LOCAL])],
"fee_updates": [x.to_save() for x in self.fee_mgr], "fee_updates": [x.to_save() for x in self.fee_mgr],
"onion_keys": {str(k): bh2u(v) for k, v in self.onion_keys.items()}, "onion_keys": {str(k): bh2u(v) for k, v in self.onion_keys.items()},
} }

Loading…
Cancel
Save