Merge #433: move maker_timeout setting to regtest_joinmarket.cfg

489aedc move maker_timeout_setting to regtest_joinmarket.cfg (Adam Gibson)

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
 

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