make check-source fixes

Author: ksedgwic

contrib/pyln-testing/pyln/testing/utils.py

@@ -83,7 +83,6 @@ def env(name, default=None):
 EXPERIMENTAL_DUAL_FUND = env("EXPERIMENTAL_DUAL_FUND", "0") == "1"
 
 
-
 def wait_for(success, timeout=TIMEOUT):
     start_time = time.time()
     interval = 0.25
@@ -514,6 +513,7 @@ def getnewaddress(self):
         info = self.rpc.getaddressinfo(addr)
         return info['unconfidential']
 
+
 class RemoteSignerD(TailableProc):
     def __init__(self, rsignerd_dir, rsignerd_port):
         TailableProc.__init__(self, rsignerd_dir)
@@ -546,6 +546,7 @@ def stop(self, timeout=10):
         logging.info("rsignerd stopped")
         return rc
 
+
 class LightningD(TailableProc):
     def __init__(self, lightning_dir, bitcoindproxy, port=9735, random_hsm=False, node_id=0):
         TailableProc.__init__(self, lightning_dir)
@@ -556,7 +557,7 @@ def __init__(self, lightning_dir, bitcoindproxy, port=9735, random_hsm=False, no
         self.disconnect_file = None
         self.lightning_dir = lightning_dir
         self.rsignerd_dir = os.path.join(lightning_dir, "remotesigner")
-                
+
         self.rpcproxy = bitcoindproxy
 
         self.opts = LIGHTNINGD_CONFIG.copy()
@@ -635,7 +636,7 @@ def start(self, stdin=None, stdout=None, stderr=None,
             if wait_for_initialized:
                 self.wait_for_log("Server started with public key")
             logging.info("LightningD started")
-        except:
+        except Exception:
             # LightningD didn't start, stop the remotesigner
             self.rsignerd.stop()
             raise

contrib/remote_hsmd/hsmd.c

@@ -42,7 +42,6 @@
 #include <hsmd/capabilities.h>
 /*~ _wiregen files are autogenerated by tools/generate-wire.py */
 #include <hsmd/hsmd_wiregen.h>
-#include <contrib/remote_hsmd/proxy.hpp>
 #include <inttypes.h>
 #include <secp256k1_ecdh.h>
 #include <sodium.h>
@@ -54,6 +53,8 @@
 #include <wire/peer_wire.h>
 #include <wire/wire_io.h>
 
+#include <contrib/remote_hsmd/proxy.hpp>
+
 /*~ Each subdaemon is started with stdin connected to lightningd (for status
  * messages), and stderr untouched (for emergency printing).  File descriptors
  * 3 and beyond are set up on other sockets: for hsmd, fd 3 is the request

tests/test_opening.py

@@ -5,6 +5,7 @@
     only_one, wait_for, sync_blockheight, first_channel_id, calc_lease_fee
 )
 
+import os
 import pytest
 import re
 import unittest
@@ -240,7 +241,6 @@ def test_v2_open_sigs_restart_while_dead(node_factory, bitcoind):
 
 @unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
 @pytest.mark.openchannel('v2')
-## @unittest.skipIf(os.getenv('SUBDAEMON') == 'hsmd:remote_hsmd', "remote_hsmd doesn't support dual-funding yet")
 def test_v2_rbf_single(node_factory, bitcoind, chainparams):
     l1, l2 = node_factory.get_nodes(2, opts={'wumbo': None})