Skip to content

Commit fac9349

Browse files
author
MarcoFalke
committed
[qa] Remove hardcoded "4 nodes" from test_framework
1 parent 169d379 commit fac9349

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+291
-138
lines changed

‎qa/rpc-tests/abandonconflict.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
import urllib.parse
1010

1111
class AbandonConflictTest(BitcoinTestFramework):
12+
def __init__(self):
13+
super().__init__()
14+
self.num_nodes = 2
15+
self.setup_clean_chain = False
1216

1317
def setup_network(self):
1418
self.nodes = []

‎qa/rpc-tests/bip65-cltv-p2p.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,12 @@ def cltv_invalidate(tx):
3737
class BIP65Test(ComparisonTestFramework):
3838

3939
def __init__(self):
40+
super().__init__()
4041
self.num_nodes = 1
4142

4243
def setup_network(self):
4344
# Must set the blockversion for this test
44-
self.nodes = start_nodes(1, self.options.tmpdir,
45+
self.nodes = start_nodes(self.num_nodes, self.options.tmpdir,
4546
extra_args=[['-debug', '-whitelist=127.0.0.1', '-blockversion=3']],
4647
binary=[self.options.testbinary])
4748

‎qa/rpc-tests/bip65-cltv.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
from test_framework.util import *
1212

1313
class BIP65Test(BitcoinTestFramework):
14+
def __init__(self):
15+
super().__init__()
16+
self.num_nodes = 3
17+
self.setup_clean_chain = False
1418

1519
def setup_network(self):
1620
self.nodes = []

‎qa/rpc-tests/bip68-112-113-p2p.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,12 @@ def all_rlt_txs(txarray):
9494

9595
class BIP68_112_113Test(ComparisonTestFramework):
9696
def __init__(self):
97+
super().__init__()
9798
self.num_nodes = 1
9899

99100
def setup_network(self):
100101
# Must set the blockversion for this test
101-
self.nodes = start_nodes(1, self.options.tmpdir,
102+
self.nodes = start_nodes(self.num_nodes, self.options.tmpdir,
102103
extra_args=[['-debug', '-whitelist=127.0.0.1', '-blockversion=4']],
103104
binary=[self.options.testbinary])
104105

‎qa/rpc-tests/bip68-sequence.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
NOT_FINAL_ERROR = "64: non-BIP68-final"
2323

2424
class BIP68Test(BitcoinTestFramework):
25+
def __init__(self):
26+
super().__init__()
27+
self.num_nodes = 2
28+
self.setup_clean_chain = False
2529

2630
def setup_network(self):
2731
self.nodes = []

‎qa/rpc-tests/bip9-softforks.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,11 @@
3232
class BIP9SoftForksTest(ComparisonTestFramework):
3333

3434
def __init__(self):
35+
super().__init__()
3536
self.num_nodes = 1
3637

3738
def setup_network(self):
38-
self.nodes = start_nodes(1, self.options.tmpdir,
39+
self.nodes = start_nodes(self.num_nodes, self.options.tmpdir,
3940
extra_args=[['-debug', '-whitelist=127.0.0.1']],
4041
binary=[self.options.testbinary])
4142

‎qa/rpc-tests/bipdersig-p2p.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,12 @@ def unDERify(tx):
4545
class BIP66Test(ComparisonTestFramework):
4646

4747
def __init__(self):
48+
super().__init__()
4849
self.num_nodes = 1
4950

5051
def setup_network(self):
5152
# Must set the blockversion for this test
52-
self.nodes = start_nodes(1, self.options.tmpdir,
53+
self.nodes = start_nodes(self.num_nodes, self.options.tmpdir,
5354
extra_args=[['-debug', '-whitelist=127.0.0.1', '-blockversion=2']],
5455
binary=[self.options.testbinary])
5556

‎qa/rpc-tests/bipdersig.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
from test_framework.util import *
1212

1313
class BIP66Test(BitcoinTestFramework):
14+
def __init__(self):
15+
super().__init__()
16+
self.num_nodes = 3
17+
self.setup_clean_chain = False
1418

1519
def setup_network(self):
1620
self.nodes = []

‎qa/rpc-tests/blockchain.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
from test_framework.test_framework import BitcoinTestFramework
1414
from test_framework.authproxy import JSONRPCException
1515
from test_framework.util import (
16-
initialize_chain,
1716
assert_equal,
1817
assert_raises,
1918
assert_is_hex_string,
@@ -32,12 +31,13 @@ class BlockchainTest(BitcoinTestFramework):
3231
3332
"""
3433

35-
def setup_chain(self):
36-
print("Initializing test directory " + self.options.tmpdir)
37-
initialize_chain(self.options.tmpdir)
34+
def __init__(self):
35+
super().__init__()
36+
self.setup_clean_chain = False
37+
self.num_nodes = 2
3838

3939
def setup_network(self, split=False):
40-
self.nodes = start_nodes(2, self.options.tmpdir)
40+
self.nodes = start_nodes(self.num_nodes, self.options.tmpdir)
4141
connect_nodes_bi(self.nodes, 0, 1)
4242
self.is_network_split = False
4343
self.sync_all()

‎qa/rpc-tests/decodescript.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@
1111
class DecodeScriptTest(BitcoinTestFramework):
1212
"""Tests decoding scripts via RPC command "decodescript"."""
1313

14-
def setup_chain(self):
15-
print('Initializing test directory ' + self.options.tmpdir)
16-
initialize_chain_clean(self.options.tmpdir, 1)
14+
def __init__(self):
15+
super().__init__()
16+
self.setup_clean_chain = True
17+
self.num_nodes = 1
1718

1819
def setup_network(self, split=False):
19-
self.nodes = start_nodes(1, self.options.tmpdir)
20+
self.nodes = start_nodes(self.num_nodes, self.options.tmpdir)
2021
self.is_network_split = False
2122

2223
def decodescript_script_sig(self):

0 commit comments

Comments
 (0)