@@ -619,7 +619,7 @@ def getnewaddress(self):
619619
620620
621621class ValidatingLightningSignerD (TailableProc ):
622- def __init__ (self , vlsd_dir , vlsd_port , node_id , network ):
622+ def __init__ (self , vlsd_dir , vlsd_port , vlsd_rpc_port , node_id , network ):
623623 TailableProc .__init__ (self , vlsd_dir , verbose = True )
624624 self .executable = env ("REMOTE_SIGNER_CMD" , 'vlsd2' )
625625 os .environ ['ALLOWLIST' ] = env (
@@ -629,6 +629,7 @@ def __init__(self, vlsd_dir, vlsd_port, node_id, network):
629629 '--network={}' .format (network ),
630630 '--datadir={}' .format (vlsd_dir ),
631631 '--connect=http://localhost:{}' .format (vlsd_port ),
632+ '--rpc-server-port={}' .format (vlsd_rpc_port ),
632633 '--integration-test' ,
633634 ]
634635 self .prefix = 'vlsd2-%d' % (node_id )
@@ -676,6 +677,7 @@ def __init__(
676677 self .use_vlsd = False
677678 self .vlsd_dir = os .path .join (lightning_dir , "vlsd" )
678679 self .vlsd_port = None
680+ self .vlsd_rpc_server_port = None
679681 self .vlsd = None
680682 self .node_id = node_id
681683
@@ -794,6 +796,7 @@ def start(self, stdin=None, wait_for_initialized=True, stderr_redir=False):
794796
795797 if self .use_vlsd :
796798 self .vlsd_port = reserve_unused_port ()
799+ self .vlsd_rpc_server_port = reserve_unused_port ()
797800 # We can't do this in the constructor because we need a new port on each restart.
798801 self .env ['VLS_PORT' ] = str (self .vlsd_port )
799802 # Kill any previous vlsd (we may have been restarted)
@@ -806,7 +809,7 @@ def start(self, stdin=None, wait_for_initialized=True, stderr_redir=False):
806809 if self .use_vlsd :
807810 # Start the remote signer first
808811 self .vlsd = ValidatingLightningSignerD (
809- self .vlsd_dir , self .vlsd_port , self .node_id , self .opts ['network' ])
812+ self .vlsd_dir , self .vlsd_port , self .vlsd_rpc_server_port , self . node_id , self .opts ['network' ])
810813 self .vlsd .start (
811814 stdin , stdout_redir = True , stderr_redir = True ,
812815 wait_for_initialized = wait_for_initialized )
0 commit comments