@@ -192,9 +192,9 @@ class WalletTaprootTest(BitcoinTestFramework):
192
192
"""Test generation and spending of P2TR address outputs."""
193
193
194
194
def set_test_params (self ):
195
- self .num_nodes = 3
195
+ self .num_nodes = 2
196
196
self .setup_clean_chain = True
197
- self .extra_args = [['-keypool=100' ], ['-keypool=100' ], [ "-vbparams=taproot:1:1" ] ]
197
+ self .extra_args = [['-keypool=100' ], ['-keypool=100' ]]
198
198
self .supports_cli = False
199
199
200
200
def skip_test_if_missing_module (self ):
@@ -243,15 +243,11 @@ def do_test_addr(self, comment, pattern, privmap, treefn, keys):
243
243
assert_equal (len (rederive ), 1 )
244
244
assert_equal (rederive [0 ], addr_g )
245
245
246
- # tr descriptors can be imported regardless of Taproot status
246
+ # tr descriptors can be imported
247
247
result = self .privs_tr_enabled .importdescriptors ([{"desc" : desc , "timestamp" : "now" }])
248
248
assert (result [0 ]["success" ])
249
249
result = self .pubs_tr_enabled .importdescriptors ([{"desc" : desc_pub , "timestamp" : "now" }])
250
250
assert (result [0 ]["success" ])
251
- result = self .privs_tr_disabled .importdescriptors ([{"desc" : desc , "timestamp" : "now" }])
252
- assert result [0 ]["success" ]
253
- result = self .pubs_tr_disabled .importdescriptors ([{"desc" : desc_pub , "timestamp" : "now" }])
254
- assert result [0 ]["success" ]
255
251
256
252
def do_test_sendtoaddress (self , comment , pattern , privmap , treefn , keys_pay , keys_change ):
257
253
self .log .info ("Testing %s through sendtoaddress" % comment )
@@ -328,12 +324,8 @@ def run_test(self):
328
324
self .log .info ("Creating wallets..." )
329
325
self .nodes [0 ].createwallet (wallet_name = "privs_tr_enabled" , descriptors = True , blank = True )
330
326
self .privs_tr_enabled = self .nodes [0 ].get_wallet_rpc ("privs_tr_enabled" )
331
- self .nodes [2 ].createwallet (wallet_name = "privs_tr_disabled" , descriptors = True , blank = True )
332
- self .privs_tr_disabled = self .nodes [2 ].get_wallet_rpc ("privs_tr_disabled" )
333
327
self .nodes [0 ].createwallet (wallet_name = "pubs_tr_enabled" , descriptors = True , blank = True , disable_private_keys = True )
334
328
self .pubs_tr_enabled = self .nodes [0 ].get_wallet_rpc ("pubs_tr_enabled" )
335
- self .nodes [2 ].createwallet (wallet_name = "pubs_tr_disabled" , descriptors = True , blank = True , disable_private_keys = True )
336
- self .pubs_tr_disabled = self .nodes [2 ].get_wallet_rpc ("pubs_tr_disabled" )
337
329
self .nodes [0 ].createwallet (wallet_name = "boring" )
338
330
self .nodes [0 ].createwallet (wallet_name = "addr_gen" , descriptors = True , disable_private_keys = True , blank = True )
339
331
self .nodes [0 ].createwallet (wallet_name = "rpc_online" , descriptors = True , blank = True )
0 commit comments