electrum

commit 805c5a2120bdc9861cf2cb8d4fee47e1dc31f1dc
parent bd178fbed5b4e532cc097b0e4ecfd8f546bb2707
Author: ThomasV <thomasv@electrum.org>
Date:   Mon, 11 Jan 2021 12:30:49 +0100

upfront_shutdown_script: rm dead code, fix test

Diffstat:
M
electrum/lnchannel.py
 | 
3
---
M
electrum/tests/test_lnpeer.py
 | 
2
+-

2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/electrum/lnchannel.py b/electrum/lnchannel.py
@@ -649,9 +649,6 @@ class Channel(AbstractChannel):
     def is_static_remotekey_enabled(self) -> bool:
         return bool(self.storage.get('static_remotekey_enabled'))
 
-    def is_upfront_shutdown_script_enabled(self) -> bool:
-        return bool(self.storage.get('upfront_shutdown_script_enabled'))
-
     def get_wallet_addresses_channel_might_want_reserved(self) -> Sequence[str]:
         ret = []
         if self.is_static_remotekey_enabled():
diff --git a/electrum/tests/test_lnpeer.py b/electrum/tests/test_lnpeer.py
@@ -674,7 +674,7 @@ class TestPeer(ElectrumTestCase):
             coros = [close(), main_loop(p1), main_loop(p2)]
             gath = asyncio.gather(*coros)
             await gath
-        with self.assertRaises(asyncio.CancelledError):
+        with self.assertRaises(concurrent.futures.CancelledError):
             run(test())
 
     def test_channel_usage_after_closing(self):