GlcoinCore/joinmarket
1
0
Fork 0
mirror of https://github.com/JoinMarket-Org/joinmarket-clientserver.git synced 2026-08-14 12:43:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

move maker_timeout_setting to regtest_joinmarket.cfg

Browse source
This commit is contained in:
Adam Gibson 2019-11-04 13:04:21 +00:00
parent 6bcb864b50
commit 489aedcca2
No known key found for this signature in database
GPG key ID: 141001A1AF77F20B
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
scripts/cli_options.py
View file

@ -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

3
test/regtest_joinmarket.cfg
View file

@ -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