From 489aedcca208e7229ad0039168ab65b4f2496ac5 Mon Sep 17 00:00:00 2001 From: Adam Gibson Date: Mon, 4 Nov 2019 13:04:21 +0000 Subject: [PATCH] move maker_timeout_setting to regtest_joinmarket.cfg --- scripts/cli_options.py | 1 - test/regtest_joinmarket.cfg | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/cli_options.py b/scripts/cli_options.py index aa8b1ee..663a994 100644 --- a/scripts/cli_options.py +++ b/scripts/cli_options.py @@ -217,7 +217,6 @@ def check_regtest(blockchain_start=True): #to allow testing of confirm/unconfirm callback for multiple txs jm_single().bc_interface.tick_forward_chain_interval = 10 jm_single().bc_interface.simulating = True - jm_single().maker_timeout_sec = 15 # handles the custom regtest hrp for bech32 cryptoengine.BTC_P2WPKH.VBYTE = 100 diff --git a/test/regtest_joinmarket.cfg b/test/regtest_joinmarket.cfg index 4caf14b..543fac5 100644 --- a/test/regtest_joinmarket.cfg +++ b/test/regtest_joinmarket.cfg @@ -24,6 +24,9 @@ socks5 = false, false socks5_host = localhost, localhost socks5_port = 9150, 9150 +[TIMEOUT] +maker_timeout_sec = 15 + [POLICY] # for dust sweeping, try merge_algorithm = gradual # for more rapid dust sweeping, try merge_algorithm = greedy