Skip to content

Commit 32fa522

Browse files
brunoergfanquake
authored andcommitted
test: ensure createmultisig and addmultisigaddress are not returning any warning for expected cases
Github-Pull: #25220 Rebased-From: 3a9b9bb
1 parent 7658055 commit 32fa522

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

test/functional/rpc_createmultisig.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,16 @@ def run_test(self):
8080
assert 'warnings' not in result
8181

8282
# 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+
8385
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)
8587
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)
8789

88-
result = wmulti0.addmultisigaddress(2, keys, '', addr_type)
90+
result = wmulti0.addmultisigaddress(nrequired=2, keys=keys, address_type=addr_type)
8991
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)
9193

9294
self.log.info('Testing sortedmulti descriptors with BIP 67 test vectors')
9395
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):
158160
desc = descsum_create(desc)
159161

160162
msig = node2.createmultisig(self.nsigs, self.pub, self.output_type)
163+
assert 'warnings' not in msig
161164
madd = msig["address"]
162165
mredeem = msig["redeemScript"]
163166
assert_equal(desc, msig['descriptor'])

0 commit comments

Comments
 (0)