@@ -91,15 +91,17 @@ def run_test(self):
91
91
assert 'warnings' not in result
92
92
93
93
# Generate addresses with the segwit types. These should all make legacy addresses
94
+ err_msg = ["Unable to make chosen address type, please ensure no uncompressed public keys are present." ]
95
+
94
96
for addr_type in ['bech32' , 'p2sh-segwit' ]:
95
- result = self .nodes [0 ].createmultisig (2 , keys , addr_type )
97
+ result = self .nodes [0 ].createmultisig (nrequired = 2 , keys = keys , address_type = addr_type )
96
98
assert_equal (legacy_addr , result ['address' ])
97
- assert_equal (result ['warnings' ], [ "Unable to make chosen address type, please ensure no uncompressed public keys are present." ] )
99
+ assert_equal (result ['warnings' ], err_msg )
98
100
99
101
if self .is_bdb_compiled ():
100
- result = wmulti0 .addmultisigaddress (2 , keys , '' , addr_type )
102
+ result = wmulti0 .addmultisigaddress (nrequired = 2 , keys = keys , address_type = addr_type )
101
103
assert_equal (legacy_addr , result ['address' ])
102
- assert_equal (result ['warnings' ], [ "Unable to make chosen address type, please ensure no uncompressed public keys are present." ] )
104
+ assert_equal (result ['warnings' ], err_msg )
103
105
104
106
self .log .info ('Testing sortedmulti descriptors with BIP 67 test vectors' )
105
107
with open (os .path .join (os .path .dirname (os .path .realpath (__file__ )), 'data/rpc_bip67.json' ), encoding = 'utf-8' ) as f :
@@ -173,6 +175,7 @@ def do_multisig(self):
173
175
desc = descsum_create (desc )
174
176
175
177
msig = node2 .createmultisig (self .nsigs , self .pub , self .output_type )
178
+ assert 'warnings' not in msig
176
179
madd = msig ["address" ]
177
180
mredeem = msig ["redeemScript" ]
178
181
assert_equal (desc , msig ['descriptor' ])
0 commit comments