electrum

commit 4d41299f1ca0af2852b95692ddf0b043042881e5
parent 21be384603fa044fbf99768a60152686f23a2995
Author: ThomasV <thomasv@electrum.org>
Date:   Sat, 21 Apr 2018 14:53:25 +0200

redundant: you subscribed only to 'updated'

Diffstat:
M
lib/lnbase.py
 | 
25
+++++++++++--------------

1 file changed, 11 insertions(+), 14 deletions(-)
diff --git a/lib/lnbase.py b/lib/lnbase.py
@@ -797,20 +797,17 @@ class Peer(PrintError):
         assert success
         # wait until we see confirmations
         def on_network_update(event, *args):
-            if event == 'updated':
-                conf = wallet.get_tx_height(funding_txid)[1]
-                if conf >= funding_txn_minimum_depth:
-                    async def set_local_funding_locked_result():
-                        try:
-                            self.local_funding_locked[channel_id].set_result(1)
-                        except (asyncio.InvalidStateError, KeyError) as e:
-                            # FIXME race condition if updates come in quickly, set_result might be called multiple times
-                            # or self.local_funding_locked[channel_id] might be deleted already
-                            self.print_error('local_funding_locked.set_result error for channel {}: {}'.format(channel_id, e))
-                    asyncio.run_coroutine_threadsafe(set_local_funding_locked_result(), asyncio.get_event_loop())
-                    self.network.unregister_callback(on_network_update)
-            else:
-                self.print_error("unexpected network message:", event, args)
+            conf = wallet.get_tx_height(funding_txid)[1]
+            if conf >= funding_txn_minimum_depth:
+                async def set_local_funding_locked_result():
+                    try:
+                        self.local_funding_locked[channel_id].set_result(1)
+                    except (asyncio.InvalidStateError, KeyError) as e:
+                        # FIXME race condition if updates come in quickly, set_result might be called multiple times
+                        # or self.local_funding_locked[channel_id] might be deleted already
+                        self.print_error('local_funding_locked.set_result error for channel {}: {}'.format(channel_id, e))
+                asyncio.run_coroutine_threadsafe(set_local_funding_locked_result(), asyncio.get_event_loop())
+                self.network.unregister_callback(on_network_update)
         self.network.register_callback(on_network_update, ['updated']) # thread safe
 
         try: