tests: Deduplicate setup code.

tests/basicswap/common_xmr.py

@@ -25,18 +25,22 @@ from tests.basicswap.mnemonics import mnemonics
 from tests.basicswap.common import (
     waitForServer,
 )
+from basicswap.contrib.rpcauth import generate_salt, password_to_hmac
 
 import basicswap.config as cfg
 import bin.basicswap_prepare as prepareSystem
 import bin.basicswap_run as runSystem
 
-test_path = os.path.expanduser(os.getenv('TEST_RELOAD_PATH', '~/test_basicswap1'))
+TEST_PATH = os.path.expanduser(os.getenv('TEST_PATH', '~/test_basicswap1'))
 PARTICL_PORT_BASE = int(os.getenv('PARTICL_PORT_BASE', '11938'))
+BITCOIN_PORT_BASE = int(os.getenv('BITCOIN_PORT_BASE', '10938'))
 
 XMR_BASE_P2P_PORT = 17792
 XMR_BASE_RPC_PORT = 29798
 XMR_BASE_WALLET_RPC_PORT = 29998
 
+EXTRA_CONFIG_JSON = json.loads(os.getenv('EXTRA_CONFIG_JSON', '{}'))
+
 
 def waitForBidState(delay_event, port, bid_id, state_str, wait_for=60):
     for i in range(wait_for):
@@ -58,16 +62,27 @@ def updateThread(xmr_addr, delay_event):
         delay_event.wait(2)
 
 
-def run_prepare(port_offset, datadir_path, bins_path, mnemonic_in=None, num_nodes=3):
+def recursive_update_dict(base, new_vals):
+    for key, value in new_vals.items():
+        if key in base and isinstance(value, dict):
+            recursive_update_dict(base[key], value)
+        else:
+            base[key] = value
+
+
+def run_prepare(node_id, datadir_path, bins_path, with_coins, mnemonic_in=None, num_nodes=3, use_rpcauth=False, extra_settings={}, port_ofs=0):
     config_path = os.path.join(datadir_path, cfg.CONFIG_FILENAME)
 
+    os.environ['PART_RPC_PORT'] = str(PARTICL_PORT_BASE)
+    os.environ['BTC_RPC_PORT'] = str(BITCOIN_PORT_BASE)
+
     testargs = [
         'basicswap-prepare',
         f'-datadir="{datadir_path}"',
         f'-bindir="{bins_path}"',
-        f'-portoffset={port_offset}',
+        f'-portoffset={(node_id + port_ofs)}',
         '-regtest',
-        '-withcoin=monero',
+        f'-withcoins={with_coins}',
         '-noextractover',
         '-xmrrestoreheight=0']
     if mnemonic_in:
@@ -77,13 +92,16 @@ def run_prepare(port_offset, datadir_path, bins_path, mnemonic_in=None, num_node
         lines = mocked_stdout.getvalue().split('\n')
         mnemonic_out = lines[-4]
 
+    with open(config_path) as fs:
+        settings = json.load(fs)
+
     with open(os.path.join(datadir_path, 'particl', 'particl.conf'), 'r') as fp:
         lines = fp.readlines()
     with open(os.path.join(datadir_path, 'particl', 'particl.conf'), 'w') as fp:
         for line in lines:
             if not line.startswith('staking'):
                 fp.write(line)
-        fp.write('port={}\n'.format(PARTICL_PORT_BASE + port_offset))
+        fp.write('port={}\n'.format(PARTICL_PORT_BASE + node_id + port_ofs))
         fp.write('bind=127.0.0.1\n')
         fp.write('dnsseed=0\n')
         fp.write('discover=0\n')
@@ -91,16 +109,55 @@ def run_prepare(port_offset, datadir_path, bins_path, mnemonic_in=None, num_node
         fp.write('upnp=0\n')
         fp.write('minstakeinterval=5\n')
         fp.write('smsgsregtestadjust=0\n')
+        if use_rpcauth:
+            salt = generate_salt(16)
+            rpc_user = 'test_part_' + str(node_id)
+            rpc_pass = 'test_part_pwd_' + str(node_id)
+            fp.write('rpcauth={}:{}${}\n'.format(rpc_user, salt, password_to_hmac(salt, rpc_pass)))
+            settings['chainclients']['particl']['rpcuser'] = rpc_user
+            settings['chainclients']['particl']['rpcpassword'] = rpc_pass
         for ip in range(num_nodes):
-            if ip != port_offset:
+            if ip != node_id:
                 fp.write('connect=127.0.0.1:{}\n'.format(PARTICL_PORT_BASE + ip))
+        for opt in EXTRA_CONFIG_JSON.get('part{}'.format(node_id), []):
+            fp.write(opt + '\n')
 
-    with open(os.path.join(datadir_path, 'monero', 'monerod.conf'), 'a') as fp:
+    coins_array = with_coins.split(',')
-        fp.write('p2p-bind-ip=127.0.0.1\n')
+
-        fp.write('p2p-bind-port={}\n'.format(XMR_BASE_P2P_PORT + port_offset))
+    if 'bitcoin' in coins_array:
-        for ip in range(num_nodes):
+        # Pruned nodes don't provide blocks
-            if ip != port_offset:
+        with open(os.path.join(datadir_path, 'bitcoin', 'bitcoin.conf'), 'r') as fp:
-                fp.write('add-exclusive-node=127.0.0.1:{}\n'.format(XMR_BASE_P2P_PORT + ip))
+            lines = fp.readlines()
+        with open(os.path.join(datadir_path, 'bitcoin', 'bitcoin.conf'), 'w') as fp:
+            for line in lines:
+                if not line.startswith('prune'):
+                    fp.write(line)
+            fp.write('port={}\n'.format(BITCOIN_PORT_BASE + node_id + port_ofs))
+            fp.write('bind=127.0.0.1\n')
+            fp.write('dnsseed=0\n')
+            fp.write('discover=0\n')
+            fp.write('listenonion=0\n')
+            fp.write('upnp=0\n')
+            if use_rpcauth:
+                salt = generate_salt(16)
+                rpc_user = 'test_btc_' + str(node_id)
+                rpc_pass = 'test_btc_pwd_' + str(node_id)
+                fp.write('rpcauth={}:{}${}\n'.format(rpc_user, salt, password_to_hmac(salt, rpc_pass)))
+                settings['chainclients']['bitcoin']['rpcuser'] = rpc_user
+                settings['chainclients']['bitcoin']['rpcpassword'] = rpc_pass
+            for ip in range(num_nodes):
+                if ip != node_id:
+                    fp.write('connect=127.0.0.1:{}\n'.format(BITCOIN_PORT_BASE + ip))
+            for opt in EXTRA_CONFIG_JSON.get('btc{}'.format(node_id), []):
+                fp.write(opt + '\n')
+
+    if 'monero' in coins_array:
+        with open(os.path.join(datadir_path, 'monero', 'monerod.conf'), 'a') as fp:
+            fp.write('p2p-bind-ip=127.0.0.1\n')
+            fp.write('p2p-bind-port={}\n'.format(XMR_BASE_P2P_PORT + node_id + port_ofs))
+            for ip in range(num_nodes):
+                if ip != node_id:
+                    fp.write('add-exclusive-node=127.0.0.1:{}\n'.format(XMR_BASE_P2P_PORT + ip))
 
     with open(config_path) as fs:
         settings = json.load(fs)
@@ -118,12 +175,31 @@ def run_prepare(port_offset, datadir_path, bins_path, mnemonic_in=None, num_node
     settings['check_events_seconds'] = 5
     settings['check_xmr_swaps_seconds'] = 5
 
+    recursive_update_dict(settings, extra_settings)
+
+    extra_config = EXTRA_CONFIG_JSON.get('sc{}'.format(node_id), {})
+    recursive_update_dict(settings, extra_config)
+
     with open(config_path, 'w') as fp:
         json.dump(settings, fp, indent=4)
 
     return mnemonic_out
 
 
+def prepare_nodes(num_nodes, extra_coins, use_rpcauth=False, extra_settings={}, port_ofs=0):
+    bins_path = os.path.join(TEST_PATH, 'bin')
+    for i in range(num_nodes):
+        logging.info('Preparing node: %d.', i)
+        client_path = os.path.join(TEST_PATH, 'client{}'.format(i))
+        try:
+            shutil.rmtree(client_path)
+        except Exception as ex:
+            logging.warning('setUpClass %s', str(ex))
+
+        run_prepare(i, client_path, bins_path, extra_coins, mnemonics[i] if i < len(mnemonics) else None,
+                    num_nodes=num_nodes, use_rpcauth=use_rpcauth, extra_settings=extra_settings, port_ofs=port_ofs)
+
+
 class XmrTestBase(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
@@ -133,15 +209,7 @@ class XmrTestBase(unittest.TestCase):
         cls.update_thread = None
         cls.processes = []
 
-        bins_path = os.path.join(test_path, 'bin')
+        prepare_nodes(3, 'monero')
-        for i in range(3):
-            client_path = os.path.join(test_path, 'client{}'.format(i))
-            try:
-                shutil.rmtree(client_path)
-            except Exception as ex:
-                logging.warning('setUpClass %s', str(ex))
-
-            run_prepare(i, client_path, bins_path, mnemonics[i])
 
         signal.signal(signal.SIGINT, lambda signal, frame: cls.signal_handler(cls, signal, frame))
 
@@ -150,7 +218,7 @@ class XmrTestBase(unittest.TestCase):
         self.delay_event.set()
 
     def run_thread(self, client_id):
-        client_path = os.path.join(test_path, 'client{}'.format(client_id))
+        client_path = os.path.join(TEST_PATH, 'client{}'.format(client_id))
         testargs = ['basicswap-run', '-datadir=' + client_path, '-regtest']
         with patch.object(sys, 'argv', testargs):
             runSystem.main()

tests/basicswap/extended/test_wallet_init.py

@@ -7,10 +7,8 @@
 
 """
 export TEST_PATH=/tmp/test_basicswap_wallet_init
-mkdir -p ${TEST_PATH}/bin/{particl,monero,bitcoin}
+mkdir -p ${TEST_PATH}/bin
-cp ~/tmp/particl-0.21.2.9-x86_64-linux-gnu.tar.gz ${TEST_PATH}/bin/particl
+cp -r ~/tmp/basicswap_bin/* ${TEST_PATH}/bin
-cp ~/tmp/monero-linux-x64-v0.17.3.2.tar.bz2 ${TEST_PATH}/bin/monero/monero-0.17.3.2-x86_64-linux-gnu.tar.bz2
-cp ~/tmp/bitcoin-0.21.1-x86_64-linux-gnu.tar.gz ${TEST_PATH}/bin/bitcoin
 export PYTHONPATH=$(pwd)
 python tests/basicswap/extended/test_wallet_init.py
 
@@ -28,21 +26,16 @@ import multiprocessing
 from unittest.mock import patch
 
 from tests.basicswap.mnemonics import mnemonics
-
-import basicswap.config as cfg
 from tests.basicswap.common import (
     read_json_api,
+    waitForServer,
+)
+from tests.basicswap.common_xmr import (
+    run_prepare,
 )
-import bin.basicswap_prepare as prepareSystem
 import bin.basicswap_run as runSystem
 
-test_path = os.path.expanduser(os.getenv('TEST_PATH', '~/test_basicswap1'))
+TEST_PATH = os.path.expanduser(os.getenv('TEST_PATH', '~/test_basicswap1'))
-PARTICL_PORT_BASE = int(os.getenv('PARTICL_PORT_BASE', '11938'))
-BITCOIN_PORT_BASE = int(os.getenv('BITCOIN_PORT_BASE', '10938'))
-XMR_BASE_P2P_PORT = 17792
-XMR_BASE_RPC_PORT = 21792
-XMR_BASE_ZMQ_PORT = 22792
-XMR_BASE_WALLET_RPC_PORT = 23792
 
 stop_test = False
 
@@ -52,87 +45,25 @@ if not len(logger.handlers):
     logger.addHandler(logging.StreamHandler(sys.stdout))
 
 
-def waitForServer(port):
-    for i in range(20):
-        try:
-            time.sleep(1)
-            summary = read_json_api(port)
-            break
-        except Exception as e:
-            print('waitForServer, error:', str(e))
-
-
 class Test(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         super(Test, cls).setUpClass()
 
-        for i in range(2):
+    # Load both wallets from the same mnemonic
-            client_path = os.path.join(test_path, 'client{}'.format(i))
+    bins_path = os.path.join(TEST_PATH, 'bin')
-            config_path = os.path.join(client_path, cfg.CONFIG_FILENAME)
+    for i in range(2):
-            try:
+        logging.info('Preparing node: %d.', i)
-                shutil.rmtree(client_path)
+        client_path = os.path.join(TEST_PATH, 'client{}'.format(i))
-            except Exception as ex:
+        try:
-                logger.warning('setUpClass %s', str(ex))
+            shutil.rmtree(client_path)
-            testargs = [
+        except Exception as ex:
-                'basicswap-prepare',
+            logging.warning('setUpClass %s', str(ex))
-                '-datadir="{}"'.format(client_path),
-                '-bindir="{}"'.format(os.path.join(test_path, 'bin')),
-                '-portoffset={}'.format(i),
-                '-particl_mnemonic="{}"'.format(mnemonics[0]),
-                '-regtest',
-                '-withcoin=monero,bitcoin',
-                '-noextractover',
-                '-xmrrestoreheight=0']
-            with patch.object(sys, 'argv', testargs):
-                prepareSystem.main()
 
-            with open(os.path.join(client_path, 'particl', 'particl.conf'), 'r') as fp:
+        run_prepare(i, client_path, bins_path, 'monero,bitcoin', mnemonics[0])
-                lines = fp.readlines()
-            with open(os.path.join(client_path, 'particl', 'particl.conf'), 'w') as fp:
-                for line in lines:
-                    if not line.startswith('staking'):
-                        fp.write(line)
-                fp.write('port={}\n'.format(PARTICL_PORT_BASE + i))
-                fp.write('bind=127.0.0.1\n')
-                fp.write('dnsseed=0\n')
-                fp.write('discover=0\n')
-                fp.write('listenonion=0\n')
-                fp.write('upnp=0\n')
-                fp.write('minstakeinterval=5\n')
-                fp.write('smsgsregtestadjust=0\n')
-                for ip in range(3):
-                    if ip != i:
-                        fp.write('connect=127.0.0.1:{}\n'.format(PARTICL_PORT_BASE + ip))
-
-            # Pruned nodes don't provide blocks
-            with open(os.path.join(client_path, 'bitcoin', 'bitcoin.conf'), 'r') as fp:
-                lines = fp.readlines()
-            with open(os.path.join(client_path, 'bitcoin', 'bitcoin.conf'), 'w') as fp:
-                for line in lines:
-                    if not line.startswith('prune'):
-                        fp.write(line)
-                fp.write('port={}\n'.format(BITCOIN_PORT_BASE + i))
-                fp.write('bind=127.0.0.1\n')
-                fp.write('dnsseed=0\n')
-                fp.write('discover=0\n')
-                fp.write('listenonion=0\n')
-                fp.write('upnp=0\n')
-                for ip in range(3):
-                    if ip != i:
-                        fp.write('connect=127.0.0.1:{}\n'.format(BITCOIN_PORT_BASE + ip))
-
-            with open(os.path.join(client_path, 'monero', 'monerod.conf'), 'a') as fp:
-                fp.write('p2p-bind-ip=127.0.0.1\n')
-                fp.write('p2p-bind-port={}\n'.format(XMR_BASE_P2P_PORT + i))
-                for ip in range(3):
-                    if ip != i:
-                        fp.write('add-exclusive-node=127.0.0.1:{}\n'.format(XMR_BASE_P2P_PORT + ip))
-
-            assert(os.path.exists(config_path))
 
     def run_thread(self, client_id):
-        client_path = os.path.join(test_path, 'client{}'.format(client_id))
+        client_path = os.path.join(TEST_PATH, 'client{}'.format(client_id))
         testargs = ['basicswap-run', '-datadir=' + client_path, '-regtest']
         with patch.object(sys, 'argv', testargs):
             runSystem.main()

tests/basicswap/extended/test_xmr_persistent.py

@@ -8,10 +8,8 @@
 """
 export RESET_TEST=true
 export TEST_PATH=/tmp/test_persistent
-mkdir -p ${TEST_PATH}/bin/{particl,monero,bitcoin}
+mkdir -p ${TEST_PATH}/bin
-cp ~/tmp/particl-0.21.2.9-x86_64-linux-gnu_nousb.tar.gz ${TEST_PATH}/bin/particl
+cp -r ~/tmp/basicswap_bin/* ${TEST_PATH}/bin
-cp ~/tmp/bitcoin-22.0-x86_64-linux-gnu.tar.gz ${TEST_PATH}/bin/bitcoin
-XMR_VERSION=0.17.3.2 cp ~/tmp/monero-linux-x64-v${XMR_VERSION}.tar.bz2 ${TEST_RELOAD_PATH}/bin/monero/monero-${XMR_VERSION}-x86_64-linux-gnu.tar.bz2
 export PYTHONPATH=$(pwd)
 python tests/basicswap/extended/test_xmr_persistent.py
 
@@ -23,7 +21,6 @@ import sys
 import json
 import time
 import random
-import shutil
 import signal
 import logging
 import unittest
@@ -37,15 +34,13 @@ from basicswap.rpc_xmr import (
 from basicswap.rpc import (
     callrpc,
 )
-from tests.basicswap.mnemonics import mnemonics as test_mnemonics
 from tests.basicswap.common import (
     read_json_api,
     waitForServer,
 )
-from basicswap.contrib.rpcauth import generate_salt, password_to_hmac
+from tests.basicswap.common_xmr import (
-
+    prepare_nodes,
-import basicswap.config as cfg
+)
-import bin.basicswap_prepare as prepareSystem
 import bin.basicswap_run as runSystem
 
 
@@ -54,8 +49,6 @@ def make_boolean(s):
 
 
 test_path = os.path.expanduser(os.getenv('TEST_PATH', '/tmp/test_persistent'))
-PARTICL_PORT_BASE = int(os.getenv('PARTICL_PORT_BASE', '11938'))
-BITCOIN_PORT_BASE = int(os.getenv('BITCOIN_PORT_BASE', '10938'))
 RESET_TEST = make_boolean(os.getenv('RESET_TEST', 'false'))
 
 XMR_BASE_P2P_PORT = 17792
@@ -71,21 +64,12 @@ BASE_BTC_RPC_PORT = 19796
 NUM_NODES = int(os.getenv('NUM_NODES', 3))
 EXTRA_CONFIG_JSON = json.loads(os.getenv('EXTRA_CONFIG_JSON', '{}'))
 
-
 logger = logging.getLogger()
 logger.level = logging.DEBUG
 if not len(logger.handlers):
     logger.addHandler(logging.StreamHandler(sys.stdout))
 
 
-def recursive_update_dict(base, new_vals):
-    for key, value in new_vals.items():
-        if key in base and isinstance(value, dict):
-            recursive_update_dict(base[key], value)
-        else:
-            base[key] = value
-
-
 def callpartrpc(node_id, method, params=[], wallet=None, base_rpc_port=BASE_PART_RPC_PORT + PORT_OFS):
     auth = 'test_part_{0}:test_part_pwd_{0}'.format(node_id)
     return callrpc(base_rpc_port + node_id, auth, method, params, wallet)
@@ -136,115 +120,10 @@ class Test(unittest.TestCase):
 
         random.seed(time.time())
 
+        os.environ['PARTICL_PORT_BASE'] = str(BASE_PART_RPC_PORT)
+        os.environ['BITCOIN_PORT_BASE'] = str(BASE_BTC_RPC_PORT)
         logging.info('Preparing %d nodes.', NUM_NODES)
-        for i in range(NUM_NODES):
+        prepare_nodes(NUM_NODES, 'bitcoin,monero', True, {'min_sequence_lock_seconds': 60}, PORT_OFS)
-            logging.info('Preparing node: %d.', i)
-            client_path = os.path.join(test_path, 'client{}'.format(i))
-            config_path = os.path.join(client_path, cfg.CONFIG_FILENAME)
-            if RESET_TEST:
-                try:
-                    logging.info('Removing dir %s', client_path)
-                    shutil.rmtree(client_path)
-                except Exception as ex:
-                    logging.warning('setUpClass %s', str(ex))
-
-            if not os.path.exists(config_path):
-
-                os.environ['PART_RPC_PORT'] = str(BASE_PART_RPC_PORT)
-                os.environ['BTC_RPC_PORT'] = str(BASE_BTC_RPC_PORT)
-
-                testargs = [
-                    'basicswap-prepare',
-                    '-datadir="{}"'.format(client_path),
-                    '-bindir="{}"'.format(os.path.join(test_path, 'bin')),
-                    '-portoffset={}'.format(i + PORT_OFS),
-                    '-regtest',
-                    '-withcoins=monero,bitcoin',
-                    '-noextractover',
-                    '-xmrrestoreheight=0']
-                if i < len(test_mnemonics):
-                    testargs.append('-particl_mnemonic="{}"'.format(test_mnemonics[i]))
-                with patch.object(sys, 'argv', testargs):
-                    prepareSystem.main()
-
-                with open(os.path.join(client_path, 'particl', 'particl.conf'), 'r') as fp:
-                    lines = fp.readlines()
-                with open(os.path.join(client_path, 'particl', 'particl.conf'), 'w') as fp:
-                    for line in lines:
-                        if not line.startswith('staking'):
-                            fp.write(line)
-                    fp.write('port={}\n'.format(PARTICL_PORT_BASE + i + PORT_OFS))
-                    fp.write('bind=127.0.0.1\n')
-                    fp.write('dnsseed=0\n')
-                    fp.write('discover=0\n')
-                    fp.write('listenonion=0\n')
-                    fp.write('upnp=0\n')
-                    fp.write('minstakeinterval=5\n')
-                    fp.write('smsgsregtestadjust=0\n')
-                    salt = generate_salt(16)
-                    fp.write('rpcauth={}:{}${}\n'.format('test_part_' + str(i), salt, password_to_hmac(salt, 'test_part_pwd_' + str(i))))
-                    for ip in range(NUM_NODES):
-                        if ip != i:
-                            fp.write('connect=127.0.0.1:{}\n'.format(PARTICL_PORT_BASE + ip + PORT_OFS))
-                    for opt in EXTRA_CONFIG_JSON.get('part{}'.format(i), []):
-                        fp.write(opt + '\n')
-
-                # Pruned nodes don't provide blocks
-                with open(os.path.join(client_path, 'bitcoin', 'bitcoin.conf'), 'r') as fp:
-                    lines = fp.readlines()
-                with open(os.path.join(client_path, 'bitcoin', 'bitcoin.conf'), 'w') as fp:
-                    for line in lines:
-                        if not line.startswith('prune'):
-                            fp.write(line)
-                    fp.write('port={}\n'.format(BITCOIN_PORT_BASE + i + PORT_OFS))
-                    fp.write('bind=127.0.0.1\n')
-                    fp.write('dnsseed=0\n')
-                    fp.write('discover=0\n')
-                    fp.write('listenonion=0\n')
-                    fp.write('upnp=0\n')
-                    salt = generate_salt(16)
-                    fp.write('rpcauth={}:{}${}\n'.format('test_btc_' + str(i), salt, password_to_hmac(salt, 'test_btc_pwd_' + str(i))))
-                    for ip in range(NUM_NODES):
-                        if ip != i:
-                            fp.write('connect=127.0.0.1:{}\n'.format(BITCOIN_PORT_BASE + ip + PORT_OFS))
-                    for opt in EXTRA_CONFIG_JSON.get('btc{}'.format(i), []):
-                        fp.write(opt + '\n')
-
-                with open(os.path.join(client_path, 'monero', 'monerod.conf'), 'a') as fp:
-                    fp.write('p2p-bind-ip=127.0.0.1\n')
-                    fp.write('p2p-bind-port={}\n'.format(XMR_BASE_P2P_PORT + i + PORT_OFS))
-                    for ip in range(NUM_NODES):
-                        if ip != i:
-                            fp.write('add-exclusive-node=127.0.0.1:{}\n'.format(XMR_BASE_P2P_PORT + ip + PORT_OFS))
-
-                with open(config_path) as fs:
-                    settings = json.load(fs)
-
-                settings['min_delay_event'] = 1
-                settings['max_delay_event'] = 4
-                settings['min_delay_event_short'] = 1
-                settings['max_delay_event_short'] = 4
-                settings['min_delay_retry'] = 15
-                settings['max_delay_retry'] = 30
-                settings['min_sequence_lock_seconds'] = 60
-
-                settings['check_progress_seconds'] = 5
-                settings['check_watched_seconds'] = 5
-                settings['check_expired_seconds'] = 60
-                settings['check_events_seconds'] = 5
-                settings['check_xmr_swaps_seconds'] = 5
-
-                settings['chainclients']['particl']['rpcuser'] = 'test_part_' + str(i)
-                settings['chainclients']['particl']['rpcpassword'] = 'test_part_pwd_' + str(i)
-
-                settings['chainclients']['bitcoin']['rpcuser'] = 'test_btc_' + str(i)
-                settings['chainclients']['bitcoin']['rpcpassword'] = 'test_btc_pwd_' + str(i)
-
-                extra_config = EXTRA_CONFIG_JSON.get('sc{}'.format(i), {})
-                recursive_update_dict(settings, extra_config)
-
-                with open(config_path, 'w') as fp:
-                    json.dump(settings, fp, indent=4)
 
         signal.signal(signal.SIGINT, lambda signal, frame: cls.signal_handler(cls, signal, frame))
 

tests/basicswap/test_reload.py

@@ -1,15 +1,14 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2019-2021 tecnovert
+# Copyright (c) 2019-2022 tecnovert
 # Distributed under the MIT software license, see the accompanying
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.
 
 """
-export TEST_RELOAD_PATH=/tmp/test_basicswap
+export TEST_PATH=/tmp/test_basicswap
-mkdir -p ${TEST_RELOAD_PATH}/bin/{particl,bitcoin}
+mkdir -p ${TEST_PATH}/bin
-cp ~/tmp/particl-0.21.2.9-x86_64-linux-gnu.tar.gz ${TEST_RELOAD_PATH}/bin/particl
+cp -r ~/tmp/basicswap_bin/* ${TEST_PATH}/bin
-cp ~/tmp/bitcoin-0.21.1-x86_64-linux-gnu.tar.gz ${TEST_RELOAD_PATH}/bin/bitcoin
 export PYTHONPATH=$(pwd)
 python tests/basicswap/test_reload.py
 
@@ -18,7 +17,6 @@ python tests/basicswap/test_reload.py
 import os
 import sys
 import json
-import shutil
 import logging
 import unittest
 import traceback
@@ -31,7 +29,6 @@ from unittest.mock import patch
 from basicswap.rpc import (
     callrpc_cli,
 )
-from tests.basicswap.mnemonics import mnemonics
 from tests.basicswap.common import (
     read_json_api,
     waitForServer,
@@ -39,12 +36,12 @@ from tests.basicswap.common import (
     waitForNumBids,
     waitForNumSwapping,
 )
-
+from tests.basicswap.common_xmr import (
-import basicswap.config as cfg
+    prepare_nodes,
-import bin.basicswap_prepare as prepareSystem
+)
 import bin.basicswap_run as runSystem
 
-test_path = os.path.expanduser(os.getenv('TEST_RELOAD_PATH', '~/test_basicswap1'))
+TEST_PATH = os.path.expanduser(os.getenv('TEST_PATH', '~/test_basicswap1'))
 PARTICL_PORT_BASE = int(os.getenv('PARTICL_PORT_BASE', '11938'))
 BITCOIN_PORT_BASE = int(os.getenv('BITCOIN_PORT_BASE', '10938'))
 delay_event = threading.Event()
@@ -56,8 +53,8 @@ if not len(logger.handlers):
 
 
 def btcRpc(client_no, cmd):
-    bin_path = os.path.join(test_path, 'bin', 'bitcoin')
+    bin_path = os.path.join(TEST_PATH, 'bin', 'bitcoin')
-    data_path = os.path.join(test_path, 'client{}'.format(client_no), 'bitcoin')
+    data_path = os.path.join(TEST_PATH, 'client{}'.format(client_no), 'bitcoin')
     return callrpc_cli(bin_path, data_path, 'regtest', cmd, 'bitcoin-cli')
 
 
@@ -74,62 +71,10 @@ class Test(unittest.TestCase):
     def setUpClass(cls):
         super(Test, cls).setUpClass()
 
-        for i in range(3):
+        prepare_nodes(3, 'bitcoin')
-            client_path = os.path.join(test_path, 'client{}'.format(i))
-            config_path = os.path.join(client_path, cfg.CONFIG_FILENAME)
-            try:
-                shutil.rmtree(client_path)
-            except Exception as ex:
-                logger.warning('setUpClass %s', str(ex))
-            testargs = [
-                'basicswap-prepare',
-                '-datadir="{}"'.format(client_path),
-                '-bindir="{}"'.format(os.path.join(test_path, 'bin')),
-                '-portoffset={}'.format(i),
-                '-particl_mnemonic="{}"'.format(mnemonics[i]),
-                '-regtest', '-withoutcoin=litecoin', '-withcoin=bitcoin']
-            with patch.object(sys, 'argv', testargs):
-                prepareSystem.main()
-
-            with open(os.path.join(client_path, 'particl', 'particl.conf'), 'r') as fp:
-                lines = fp.readlines()
-            with open(os.path.join(client_path, 'particl', 'particl.conf'), 'w') as fp:
-                for line in lines:
-                    if not line.startswith('staking'):
-                        fp.write(line)
-                fp.write('port={}\n'.format(PARTICL_PORT_BASE + i))
-                fp.write('bind=127.0.0.1\n')
-                fp.write('dnsseed=0\n')
-                fp.write('discover=0\n')
-                fp.write('listenonion=0\n')
-                fp.write('upnp=0\n')
-                fp.write('minstakeinterval=5\n')
-                fp.write('smsgsregtestadjust=0\n')
-                for ip in range(3):
-                    if ip != i:
-                        fp.write('connect=127.0.0.1:{}\n'.format(PARTICL_PORT_BASE + ip))
-
-            # Pruned nodes don't provide blocks
-            with open(os.path.join(client_path, 'bitcoin', 'bitcoin.conf'), 'r') as fp:
-                lines = fp.readlines()
-            with open(os.path.join(client_path, 'bitcoin', 'bitcoin.conf'), 'w') as fp:
-                for line in lines:
-                    if not line.startswith('prune'):
-                        fp.write(line)
-                fp.write('port={}\n'.format(BITCOIN_PORT_BASE + i))
-                fp.write('bind=127.0.0.1\n')
-                fp.write('dnsseed=0\n')
-                fp.write('discover=0\n')
-                fp.write('listenonion=0\n')
-                fp.write('upnp=0\n')
-                for ip in range(3):
-                    if ip != i:
-                        fp.write('connect=127.0.0.1:{}\n'.format(BITCOIN_PORT_BASE + ip))
-
-            assert(os.path.exists(config_path))
 
     def run_thread(self, client_id):
-        client_path = os.path.join(test_path, 'client{}'.format(client_id))
+        client_path = os.path.join(TEST_PATH, 'client{}'.format(client_id))
         testargs = ['basicswap-run', '-datadir=' + client_path, '-regtest']
         with patch.object(sys, 'argv', testargs):
             runSystem.main()

tests/basicswap/test_xmr_bids_offline.py

@@ -6,10 +6,9 @@
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.
 
 """
-export TEST_RELOAD_PATH=/tmp/test_basicswap
+export TEST_PATH=/tmp/test_basicswap
-mkdir -p ${TEST_RELOAD_PATH}/bin/{particl,monero}
+mkdir -p ${TEST_PATH}/bin
-cp ~/tmp/particl-0.21.2.9-x86_64-linux-gnu.tar.gz ${TEST_RELOAD_PATH}/bin/particl
+cp -r ~/tmp/basicswap_bin/* ${TEST_PATH}/bin
-XMR_VERSION=0.17.3.2 cp ~/tmp/monero-linux-x64-v${XMR_VERSION}.tar.bz2 ${TEST_RELOAD_PATH}/bin/monero/monero-${XMR_VERSION}-x86_64-linux-gnu.tar.bz2
 export PYTHONPATH=$(pwd)
 python tests/basicswap/test_xmr_bids_offline.py
 

tests/basicswap/test_xmr_reload.py

@@ -6,10 +6,9 @@
 # file LICENSE or http://www.opensource.org/licenses/mit-license.php.
 
 """
-export TEST_RELOAD_PATH=/tmp/test_basicswap
+export TEST_PATH=/tmp/test_basicswap
-mkdir -p ${TEST_RELOAD_PATH}/bin/{particl,monero}
+mkdir -p ${TEST_PATH}/bin
-cp ~/tmp/particl-0.21.2.9-x86_64-linux-gnu.tar.gz ${TEST_RELOAD_PATH}/bin/particl
+cp -r ~/tmp/basicswap_bin/* ${TEST_PATH}/bin
-XMR_VERSION=0.17.3.2 cp ~/tmp/monero-linux-x64-v${XMR_VERSION}.tar.bz2 ${TEST_RELOAD_PATH}/bin/monero/monero-${XMR_VERSION}-x86_64-linux-gnu.tar.bz2
 export PYTHONPATH=$(pwd)
 python tests/basicswap/test_xmr_reload.py