@@ -24,65 +24,67 @@ def set_test_params(self):
2424 self .setup_clean_chain = True
2525 self .num_nodes = 1
2626 self .extra_args = [['-keypool=100' ]]
27- self .wallet_names = []
2827
2928 def skip_test_if_missing_module (self ):
3029 self .skip_if_no_wallet ()
3130 self .skip_if_no_py_sqlite3 ()
3231
3332 def run_test (self ):
33+ self .generate (self .nodes [0 ], COINBASE_MATURITY + 1 )
34+
3435 # Make a descriptor wallet
3536 self .log .info ("Making a descriptor wallet" )
3637 self .nodes [0 ].createwallet (wallet_name = "desc1" )
38+ wallet = self .nodes [0 ].get_wallet_rpc ("desc1" )
3739
3840 # A descriptor wallet should have 100 addresses * 4 types = 400 keys
3941 self .log .info ("Checking wallet info" )
40- wallet_info = self . nodes [ 0 ] .getwalletinfo ()
42+ wallet_info = wallet .getwalletinfo ()
4143 assert_equal (wallet_info ['format' ], 'sqlite' )
4244 assert_equal (wallet_info ['keypoolsize' ], 400 )
4345 assert_equal (wallet_info ['keypoolsize_hd_internal' ], 400 )
4446 assert 'keypoololdest' not in wallet_info
4547
4648 # Check that getnewaddress works
4749 self .log .info ("Test that getnewaddress and getrawchangeaddress work" )
48- addr = self . nodes [ 0 ] .getnewaddress ("" , "legacy" )
49- addr_info = self . nodes [ 0 ] .getaddressinfo (addr )
50+ addr = wallet .getnewaddress ("" , "legacy" )
51+ addr_info = wallet .getaddressinfo (addr )
5052 assert addr_info ['desc' ].startswith ('pkh(' )
5153 assert_equal (addr_info ['hdkeypath' ], 'm/44h/1h/0h/0/0' )
5254
53- addr = self . nodes [ 0 ] .getnewaddress ("" , "p2sh-segwit" )
54- addr_info = self . nodes [ 0 ] .getaddressinfo (addr )
55+ addr = wallet .getnewaddress ("" , "p2sh-segwit" )
56+ addr_info = wallet .getaddressinfo (addr )
5557 assert addr_info ['desc' ].startswith ('sh(wpkh(' )
5658 assert_equal (addr_info ['hdkeypath' ], 'm/49h/1h/0h/0/0' )
5759
58- addr = self . nodes [ 0 ] .getnewaddress ("" , "bech32" )
59- addr_info = self . nodes [ 0 ] .getaddressinfo (addr )
60+ addr = wallet .getnewaddress ("" , "bech32" )
61+ addr_info = wallet .getaddressinfo (addr )
6062 assert addr_info ['desc' ].startswith ('wpkh(' )
6163 assert_equal (addr_info ['hdkeypath' ], 'm/84h/1h/0h/0/0' )
6264
63- addr = self . nodes [ 0 ] .getnewaddress ("" , "bech32m" )
64- addr_info = self . nodes [ 0 ] .getaddressinfo (addr )
65+ addr = wallet .getnewaddress ("" , "bech32m" )
66+ addr_info = wallet .getaddressinfo (addr )
6567 assert addr_info ['desc' ].startswith ('tr(' )
6668 assert_equal (addr_info ['hdkeypath' ], 'm/86h/1h/0h/0/0' )
6769
6870 # Check that getrawchangeaddress works
69- addr = self . nodes [ 0 ] .getrawchangeaddress ("legacy" )
70- addr_info = self . nodes [ 0 ] .getaddressinfo (addr )
71+ addr = wallet .getrawchangeaddress ("legacy" )
72+ addr_info = wallet .getaddressinfo (addr )
7173 assert addr_info ['desc' ].startswith ('pkh(' )
7274 assert_equal (addr_info ['hdkeypath' ], 'm/44h/1h/0h/1/0' )
7375
74- addr = self . nodes [ 0 ] .getrawchangeaddress ("p2sh-segwit" )
75- addr_info = self . nodes [ 0 ] .getaddressinfo (addr )
76+ addr = wallet .getrawchangeaddress ("p2sh-segwit" )
77+ addr_info = wallet .getaddressinfo (addr )
7678 assert addr_info ['desc' ].startswith ('sh(wpkh(' )
7779 assert_equal (addr_info ['hdkeypath' ], 'm/49h/1h/0h/1/0' )
7880
79- addr = self . nodes [ 0 ] .getrawchangeaddress ("bech32" )
80- addr_info = self . nodes [ 0 ] .getaddressinfo (addr )
81+ addr = wallet .getrawchangeaddress ("bech32" )
82+ addr_info = wallet .getaddressinfo (addr )
8183 assert addr_info ['desc' ].startswith ('wpkh(' )
8284 assert_equal (addr_info ['hdkeypath' ], 'm/84h/1h/0h/1/0' )
8385
84- addr = self . nodes [ 0 ] .getrawchangeaddress ("bech32m" )
85- addr_info = self . nodes [ 0 ] .getaddressinfo (addr )
86+ addr = wallet .getrawchangeaddress ("bech32m" )
87+ addr_info = wallet .getaddressinfo (addr )
8688 assert addr_info ['desc' ].startswith ('tr(' )
8789 assert_equal (addr_info ['hdkeypath' ], 'm/86h/1h/0h/1/0' )
8890
0 commit comments