electrum

commit 87fb0da5e1b907f1e593a0dc10c20e30900a5353
parent 9362130fba5001021c2061150e1e28c33883f7bf
Author: ThomasV <thomasv@electrum.org>
Date:   Sat, 13 Oct 2018 14:35:56 +0200

minor fix

Diffstat:
M
electrum/lnchan.py
 | 
6
++++--
M
electrum/lnwatcher.py
 | 
2
--

2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/electrum/lnchan.py b/electrum/lnchan.py
@@ -343,7 +343,8 @@ class Channel(PrintError):
         else:
             their_cur_pcp = self.config[REMOTE].next_per_commitment_point
             encumbered_sweeptx = maybe_create_sweeptx_for_their_ctx_to_remote(self, ctx, their_cur_pcp, self.sweep_address)
-        self.lnwatcher.add_sweep_tx(outpoint, ctx.txid(), encumbered_sweeptx.to_json())
+        if encumbered_sweeptx:
+            self.lnwatcher.add_sweep_tx(outpoint, ctx.txid(), encumbered_sweeptx.to_json())
 
     def process_new_revocation_secret(self, per_commitment_secret: bytes):
         if not self.lnwatcher:
@@ -351,7 +352,8 @@ class Channel(PrintError):
         outpoint = self.funding_outpoint.to_str()
         ctx = self.remote_commitment_to_be_revoked
         encumbered_sweeptx = maybe_create_sweeptx_for_their_ctx_to_local(self, ctx, per_commitment_secret, self.sweep_address)
-        self.lnwatcher.add_sweep_tx(outpoint, ctx.txid(), encumbered_sweeptx.to_json())
+        if encumbered_sweeptx:
+            self.lnwatcher.add_sweep_tx(outpoint, ctx.txid(), encumbered_sweeptx.to_json())
 
     def receive_revocation(self, revocation):
         """
diff --git a/electrum/lnwatcher.py b/electrum/lnwatcher.py
@@ -185,8 +185,6 @@ class LNWatcher(PrintError):
     @with_watchtower
     def add_sweep_tx(self, funding_outpoint: str, ctx_txid: str, sweeptx):
         encumbered_sweeptx = EncumberedTransaction.from_json(sweeptx)
-        if encumbered_sweeptx is None:
-            return
         with self.lock:
             self.sweepstore[funding_outpoint][ctx_txid].add(encumbered_sweeptx)
         self.write_to_disk()