Skip to content

Commit 3a9b9bb

Browse files
committed
test: ensure createmultisig and addmultisigaddress are not returning any warning for expected cases
1 parent eaf6f63 commit 3a9b9bb

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
@@ -91,15 +91,17 @@ def run_test(self):
9191
assert 'warnings' not in result
9292

9393
# 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+
9496
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)
9698
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)
98100

99101
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)
101103
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)
103105

104106
self.log.info('Testing sortedmulti descriptors with BIP 67 test vectors')
105107
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):
173175
desc = descsum_create(desc)
174176

175177
msig = node2.createmultisig(self.nsigs, self.pub, self.output_type)
178+
assert 'warnings' not in msig
176179
madd = msig["address"]
177180
mredeem = msig["redeemScript"]
178181
assert_equal(desc, msig['descriptor'])

0 commit comments

Comments
 (0)