Skip to content

Commit fa71b38

Browse files
author
MarcoFalke
committed
scripted-diff: Rename rpc_timewait to rpc_timeout
-BEGIN VERIFY SCRIPT- sed -i -e 's/self.rpc_timewait/self.rpc_timeout/g' $(git grep -l self.rpc_timewait) -END VERIFY SCRIPT-
1 parent fa3e578 commit fa71b38

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

test/functional/feature_dbcrash.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def set_test_params(self):
4646
self.num_nodes = 4
4747
self.setup_clean_chain = False
4848
# Need a bit of extra time for the nodes to start up for this test
49-
self.rpc_timewait = 90
49+
self.rpc_timeout = 90
5050

5151
# Set -maxmempool=0 to turn off mempool memory sharing with dbcache
5252
# Set -rpcservertimeout=900 to reduce socket disconnects in this

test/functional/feature_pruning.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class PruneTest(BitcoinTestFramework):
2929
def set_test_params(self):
3030
self.setup_clean_chain = True
3131
self.num_nodes = 6
32-
self.rpc_timewait = 900
32+
self.rpc_timeout = 900
3333

3434
# Create nodes 0 and 1 to mine.
3535
# Create node 2 to test pruning.

test/functional/test_framework/test_framework.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def __init__(self):
9595
self.nodes = []
9696
self.network_thread = None
9797
self.mocktime = 0
98-
self.rpc_timewait = 60 # Wait for up to 60 seconds for the RPC server to respond
98+
self.rpc_timeout = 60 # Wait for up to 60 seconds for the RPC server to respond
9999
self.supports_cli = False
100100
self.bind_to_localhost_only = True
101101
self.set_test_params()
@@ -301,7 +301,7 @@ def add_nodes(self, num_nodes, extra_args=None, *, rpchost=None, binary=None):
301301
i,
302302
get_datadir_path(self.options.tmpdir, i),
303303
rpchost=rpchost,
304-
timewait=self.rpc_timewait,
304+
timewait=self.rpc_timeout,
305305
bitcoind=binary[i],
306306
bitcoin_cli=self.options.bitcoincli,
307307
mocktime=self.mocktime,
@@ -460,7 +460,7 @@ def _initialize_chain(self):
460460
args = [self.options.bitcoind, "-datadir=" + datadir, '-disablewallet']
461461
if i > 0:
462462
args.append("-connect=127.0.0.1:" + str(p2p_port(0)))
463-
self.nodes.append(TestNode(i, get_datadir_path(self.options.cachedir, i), extra_conf=["bind=127.0.0.1"], extra_args=[], rpchost=None, timewait=self.rpc_timewait, bitcoind=self.options.bitcoind, bitcoin_cli=self.options.bitcoincli, mocktime=self.mocktime, coverage_dir=None))
463+
self.nodes.append(TestNode(i, get_datadir_path(self.options.cachedir, i), extra_conf=["bind=127.0.0.1"], extra_args=[], rpchost=None, timewait=self.rpc_timeout, bitcoind=self.options.bitcoind, bitcoin_cli=self.options.bitcoincli, mocktime=self.mocktime, coverage_dir=None))
464464
self.nodes[i].args = args
465465
self.start_node(i)
466466

test/functional/wallet_groups.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def set_test_params(self):
2121
self.setup_clean_chain = True
2222
self.num_nodes = 3
2323
self.extra_args = [[], [], ['-avoidpartialspends']]
24-
self.rpc_timewait = 120
24+
self.rpc_timeout = 120
2525

2626
def skip_test_if_missing_module(self):
2727
self.skip_if_no_wallet()

0 commit comments

Comments
 (0)