From b791821c80df00d2d10aac2db2657ae35aa91147 Mon Sep 17 00:00:00 2001 From: Pasta Date: Thu, 4 Jul 2019 23:46:15 -0500 Subject: [PATCH] start_node -> self.start_node Signed-off-by: Pasta --- test/functional/dip3-deterministicmns.py | 4 ++-- test/functional/fundrawtransaction-hd.py | 2 +- test/functional/keypool-hd.py | 4 ++-- test/functional/llmq-chainlocks.py | 2 +- test/functional/p2p-fullblocktest.py | 2 +- test/functional/sporks.py | 4 ++-- test/functional/test_framework/test_framework.py | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/test/functional/dip3-deterministicmns.py b/test/functional/dip3-deterministicmns.py index c5d98267cb..4f980a8f67 100755 --- a/test/functional/dip3-deterministicmns.py +++ b/test/functional/dip3-deterministicmns.py @@ -38,7 +38,7 @@ class DIP3Test(BitcoinTestFramework): args = self.extra_args if extra_args is not None: args += extra_args - self.nodes[0] = start_node(0, self.options.tmpdir, extra_args=args) + self.nodes[0] = self.start_node(0, self.options.tmpdir, extra_args=args) for i in range(1, self.num_nodes): if i < len(self.nodes) and self.nodes[i] is not None: connect_nodes_bi(self.nodes, 0, i) @@ -252,7 +252,7 @@ class DIP3Test(BitcoinTestFramework): while len(self.nodes) <= mn.idx: self.nodes.append(None) extra_args = ['-masternode=1', '-masternodeblsprivkey=%s' % mn.blsMnkey] - n = start_node(mn.idx, self.options.tmpdir, self.extra_args + extra_args, stderr=sys.stdout) + n = self.start_node(mn.idx, self.options.tmpdir, self.extra_args + extra_args, stderr=sys.stdout) self.nodes[mn.idx] = n for i in range(0, self.num_nodes): if i < len(self.nodes) and self.nodes[i] is not None and i != mn.idx: diff --git a/test/functional/fundrawtransaction-hd.py b/test/functional/fundrawtransaction-hd.py index ade26fe852..4880d1c8a7 100755 --- a/test/functional/fundrawtransaction-hd.py +++ b/test/functional/fundrawtransaction-hd.py @@ -443,7 +443,7 @@ class RawTransactionsTest(BitcoinTestFramework): self.stop_node(self.nodes[1], 2) self.stop_node(self.nodes[2], 3) - self.nodes = start_nodes(4, self.options.tmpdir, [['-usehd=1']] * self.num_nodes, stderr=sys.stdout) + self.nodes = self.start_nodes(4, self.options.tmpdir, [['-usehd=1']] * self.num_nodes, stderr=sys.stdout) # This test is not meant to test fee estimation and we'd like # to be sure all txs are sent at a consistent desired feerate for node in self.nodes: diff --git a/test/functional/keypool-hd.py b/test/functional/keypool-hd.py index 51604cd4ea..7a292d76fc 100755 --- a/test/functional/keypool-hd.py +++ b/test/functional/keypool-hd.py @@ -28,7 +28,7 @@ class KeyPoolTest(BitcoinTestFramework): nodes[0].encryptwallet('test') bitcoind_processes[0].wait() # Restart node 0 - nodes[0] = start_node(0, self.options.tmpdir, ['-usehd=1'], stderr=sys.stdout) + nodes[0] = self.start_node(0, self.options.tmpdir, ['-usehd=1'], stderr=sys.stdout) # Keep creating keys addr = nodes[0].getnewaddress() addr_data = nodes[0].validateaddress(addr) @@ -104,7 +104,7 @@ class KeyPoolTest(BitcoinTestFramework): assert_equal(wi['keypoolsize'], 100) def setup_network(self): - self.nodes = start_nodes(1, self.options.tmpdir, [['-usehd=1']], stderr=sys.stdout) + self.nodes = self.start_nodes(1, self.options.tmpdir, [['-usehd=1']], stderr=sys.stdout) if __name__ == '__main__': KeyPoolTest().main() diff --git a/test/functional/llmq-chainlocks.py b/test/functional/llmq-chainlocks.py index d6feed6bcb..ab85a9d747 100755 --- a/test/functional/llmq-chainlocks.py +++ b/test/functional/llmq-chainlocks.py @@ -72,7 +72,7 @@ class LLMQChainLocksTest(DashTestFramework): good_tip = self.nodes[0].getbestblockhash() # Restart it so that it forgets all the chainlocks from the past self.stop_node(self.nodes[0], 0) - self.nodes[0] = start_node(0, self.options.tmpdir, self.extra_args) + self.nodes[0] = self.start_node(0, self.options.tmpdir, self.extra_args) connect_nodes(self.nodes[0], 1) self.nodes[0].invalidateblock(self.nodes[0].getbestblockhash()) # Now try to reorg the chain diff --git a/test/functional/p2p-fullblocktest.py b/test/functional/p2p-fullblocktest.py index f060216860..97fac35a92 100755 --- a/test/functional/p2p-fullblocktest.py +++ b/test/functional/p2p-fullblocktest.py @@ -63,7 +63,7 @@ class FullBlockTest(ComparisonTestFramework): def setup_network(self): # Must set '-dip3params=2000:2000' to create pre-dip3 blocks only - self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, + self.nodes = self.start_nodes(self.num_nodes, self.options.tmpdir, extra_args=[['-whitelist=127.0.0.1', '-dip3params=2000:2000']], binary=[self.options.testbinary]) diff --git a/test/functional/sporks.py b/test/functional/sporks.py index 56f8e8ced5..e6918f2009 100755 --- a/test/functional/sporks.py +++ b/test/functional/sporks.py @@ -59,8 +59,8 @@ class SporkTest(BitcoinTestFramework): # restart nodes to check spork persistence self.stop_node(self.nodes[0], 0) self.stop_node(self.nodes[1], 1) - self.nodes[0] = start_node(0, self.options.tmpdir) - self.nodes[1] = start_node(1, self.options.tmpdir) + self.nodes[0] = self.start_node(0, self.options.tmpdir) + self.nodes[1] = self.start_node(1, self.options.tmpdir) assert(not self.get_test_spork_state(self.nodes[0])) assert(not self.get_test_spork_state(self.nodes[1])) diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py index 2436773572..56b4471055 100755 --- a/test/functional/test_framework/test_framework.py +++ b/test/functional/test_framework/test_framework.py @@ -465,7 +465,7 @@ class DashTestFramework(BitcoinTestFramework): copy_datadir(0, idx + start_idx, self.options.tmpdir) # restart faucet node - self.nodes[0] = start_node(0, self.options.tmpdir, self.extra_args) + self.nodes[0] = self.start_node(0, self.options.tmpdir, self.extra_args) def start_masternodes(self): start_idx = len(self.nodes) @@ -477,7 +477,7 @@ class DashTestFramework(BitcoinTestFramework): def do_start(idx): args = ['-masternode=1', '-masternodeblsprivkey=%s' % self.mninfo[idx].keyOperator] + self.extra_args - node = start_node(idx + start_idx, self.options.tmpdir, args) + node = self.start_node(idx + start_idx, self.options.tmpdir, args) self.mninfo[idx].nodeIdx = idx + start_idx self.mninfo[idx].node = node self.nodes[idx + start_idx] = node