upfront_shutdown_script: rm dead code, fix test

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():

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):