@@ -80,14 +80,16 @@ def run_test(self):
80
80
assert 'warnings' not in result
81
81
82
82
# Generate addresses with the segwit types. These should all make legacy addresses
83
+ err_msg = ["Unable to make chosen address type, please ensure no uncompressed public keys are present." ]
84
+
83
85
for addr_type in ['bech32' , 'p2sh-segwit' ]:
84
- result = wmulti0 .createmultisig (2 , keys , addr_type )
86
+ result = wmulti0 .createmultisig (nrequired = 2 , keys = keys , address_type = addr_type )
85
87
assert_equal (legacy_addr , result ['address' ])
86
- assert_equal (result ['warnings' ], [ "Unable to make chosen address type, please ensure no uncompressed public keys are present." ] )
88
+ assert_equal (result ['warnings' ], err_msg )
87
89
88
- result = wmulti0 .addmultisigaddress (2 , keys , '' , addr_type )
90
+ result = wmulti0 .addmultisigaddress (nrequired = 2 , keys = keys , address_type = addr_type )
89
91
assert_equal (legacy_addr , result ['address' ])
90
- assert_equal (result ['warnings' ], [ "Unable to make chosen address type, please ensure no uncompressed public keys are present." ] )
92
+ assert_equal (result ['warnings' ], err_msg )
91
93
92
94
self .log .info ('Testing sortedmulti descriptors with BIP 67 test vectors' )
93
95
with open (os .path .join (os .path .dirname (os .path .realpath (__file__ )), 'data/rpc_bip67.json' ), encoding = 'utf-8' ) as f :
@@ -158,6 +160,7 @@ def do_multisig(self):
158
160
desc = descsum_create (desc )
159
161
160
162
msig = node2 .createmultisig (self .nsigs , self .pub , self .output_type )
163
+ assert 'warnings' not in msig
161
164
madd = msig ["address" ]
162
165
mredeem = msig ["redeemScript" ]
163
166
assert_equal (desc , msig ['descriptor' ])
0 commit comments