diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-09-08 02:28:05 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-09-08 02:28:12 +0200 |
| commit | c22a53cd6351b3f0e96de971b001ad712b83fc47 (patch) | |
| tree | 281d711f699f1ed5e04e6880ba456068957a1871 /test/functional | |
| parent | 791a0e6ddade27d1b69f4861a6640de60b9553cf (diff) | |
| parent | 713a92073b3b391f48d4fa146bd334893ec94b8f (diff) | |
| download | bitcoin-c22a53cd6351b3f0e96de971b001ad712b83fc47.tar.xz | |
Merge #11250: Bump wallet version to 159900 and remove the `usehd` option
713a92073 Remove usehd option and warn when it is used (Andrew Chow)
d4c18f733 Bump wallet version number to 159900 (Andrew Chow)
Pull request description:
Bump the wallet version number to 159900 so that new wallets made without a default key will no longer work on previous versions at all. Also remove the `usehd` option to avoid weird interaction with wallet version numbers and HD-ness of wallets.
Tree-SHA512: dd7965505bfad6a926c79afd423236f509229a398a8398076f8d57d90a5974243f9459a61225c4daee560c796f427445c9e55a3ad528a3a97a9123ca6a1269ab
Diffstat (limited to 'test/functional')
| -rwxr-xr-x | test/functional/keypool-topup.py | 2 | ||||
| -rwxr-xr-x | test/functional/wallet-hd.py | 8 | ||||
| -rwxr-xr-x | test/functional/wallet.py | 3 |
3 files changed, 3 insertions, 10 deletions
diff --git a/test/functional/keypool-topup.py b/test/functional/keypool-topup.py index b87433a9c5..160a0f7ae5 100755 --- a/test/functional/keypool-topup.py +++ b/test/functional/keypool-topup.py @@ -23,7 +23,7 @@ class KeypoolRestoreTest(BitcoinTestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 2 - self.extra_args = [['-usehd=0'], ['-usehd=1', '-keypool=100', '-keypoolmin=20']] + self.extra_args = [[], ['-keypool=100', '-keypoolmin=20']] def run_test(self): self.tmpdir = self.options.tmpdir diff --git a/test/functional/wallet-hd.py b/test/functional/wallet-hd.py index a6b96b7455..3af04c2279 100755 --- a/test/functional/wallet-hd.py +++ b/test/functional/wallet-hd.py @@ -15,17 +15,11 @@ class WalletHDTest(BitcoinTestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 2 - self.extra_args = [['-usehd=0'], ['-usehd=1', '-keypool=0']] + self.extra_args = [[], ['-keypool=0']] def run_test (self): tmpdir = self.options.tmpdir - # Make sure can't switch off usehd after wallet creation - self.stop_node(1) - self.assert_start_raises_init_error(1, ['-usehd=0'], 'already existing HD wallet') - self.start_node(1) - connect_nodes_bi(self.nodes, 0, 1) - # Make sure we use hd, keep masterkeyid masterkeyid = self.nodes[1].getwalletinfo()['hdmasterkeyid'] assert_equal(len(masterkeyid), 40) diff --git a/test/functional/wallet.py b/test/functional/wallet.py index 27089e8845..a643684c7f 100755 --- a/test/functional/wallet.py +++ b/test/functional/wallet.py @@ -10,10 +10,9 @@ class WalletTest(BitcoinTestFramework): def set_test_params(self): self.num_nodes = 4 self.setup_clean_chain = True - self.extra_args = [['-usehd={:d}'.format(i%2==0)] for i in range(4)] def setup_network(self): - self.add_nodes(4, self.extra_args) + self.add_nodes(4) self.start_node(0) self.start_node(1) self.start_node(2) |