diff options
| author | John Newbery <john@johnnewbery.com> | 2017-04-03 09:34:04 -0400 |
|---|---|---|
| committer | John Newbery <john@johnnewbery.com> | 2017-05-02 13:31:54 -0400 |
| commit | c9cc76dcaad85aa9441f18d38298f27a0ffd852a (patch) | |
| tree | 7f3a0bbb5ed9d64f4fe62a7e47abd2a8595a17eb /test/functional/wallet-hd.py | |
| parent | 8f3e38477e30abd9dd0e24a4d612126117f7793c (diff) | |
| download | bitcoin-c9cc76dcaad85aa9441f18d38298f27a0ffd852a.tar.xz | |
[tests] Remove is_network_split from funtional test cases
Diffstat (limited to 'test/functional/wallet-hd.py')
| -rwxr-xr-x | test/functional/wallet-hd.py | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/test/functional/wallet-hd.py b/test/functional/wallet-hd.py index 64a6c92782..4ad458f3ef 100755 --- a/test/functional/wallet-hd.py +++ b/test/functional/wallet-hd.py @@ -22,12 +22,7 @@ class WalletHDTest(BitcoinTestFramework): super().__init__() self.setup_clean_chain = True self.num_nodes = 2 - self.node_args = [['-usehd=0'], ['-usehd=1', '-keypool=0']] - - def setup_network(self): - self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, self.node_args) - self.is_network_split = False - connect_nodes_bi(self.nodes, 0, 1) + self.extra_args = [['-usehd=0'], ['-usehd=1', '-keypool=0']] def run_test (self): tmpdir = self.options.tmpdir @@ -35,7 +30,7 @@ class WalletHDTest(BitcoinTestFramework): # Make sure can't switch off usehd after wallet creation self.stop_node(1) assert_start_raises_init_error(1, self.options.tmpdir, ['-usehd=0'], 'already existing HD wallet') - self.nodes[1] = start_node(1, self.options.tmpdir, self.node_args[1]) + self.nodes[1] = start_node(1, self.options.tmpdir, self.extra_args[1]) connect_nodes_bi(self.nodes, 0, 1) # Make sure we use hd, keep masterkeyid @@ -82,7 +77,7 @@ class WalletHDTest(BitcoinTestFramework): self.stop_node(1) os.remove(self.options.tmpdir + "/node1/regtest/wallet.dat") shutil.copyfile(tmpdir + "/hd.bak", tmpdir + "/node1/regtest/wallet.dat") - self.nodes[1] = start_node(1, self.options.tmpdir, self.node_args[1]) + self.nodes[1] = start_node(1, self.options.tmpdir, self.extra_args[1]) #connect_nodes_bi(self.nodes, 0, 1) # Assert that derivation is deterministic @@ -96,7 +91,7 @@ class WalletHDTest(BitcoinTestFramework): # Needs rescan self.stop_node(1) - self.nodes[1] = start_node(1, self.options.tmpdir, self.node_args[1] + ['-rescan']) + self.nodes[1] = start_node(1, self.options.tmpdir, self.extra_args[1] + ['-rescan']) #connect_nodes_bi(self.nodes, 0, 1) assert_equal(self.nodes[1].getbalance(), num_hd_adds + 1) |