aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoão Barbosa <joao.paulo.barbosa@gmail.com>2018-01-17 23:30:56 +0000
committerJoão Barbosa <joao.paulo.barbosa@gmail.com>2018-01-24 16:23:55 +0000
commitf523c6bec005b2c999651787d029dee0fe719eb1 (patch)
treee04c89530caa88387c78521ec8cf2a4b956f4fe2
parent886a92f25f2e47a7ec9097d7c5a8d8a6173ef998 (diff)
[qa] Use address type in addmultisigaddress to avoid addwitnessaddress
-rwxr-xr-xtest/functional/nulldummy.py2
-rwxr-xr-xtest/functional/segwit.py5
2 files changed, 3 insertions, 4 deletions
diff --git a/test/functional/nulldummy.py b/test/functional/nulldummy.py
index fac620bc8d..e4f413cc2a 100755
--- a/test/functional/nulldummy.py
+++ b/test/functional/nulldummy.py
@@ -48,7 +48,7 @@ class NULLDUMMYTest(BitcoinTestFramework):
self.address = self.nodes[0].getnewaddress()
self.ms_address = self.nodes[0].addmultisigaddress(1,[self.address])['address']
self.wit_address = self.nodes[0].addwitnessaddress(self.address)
- self.wit_ms_address = self.nodes[0].addwitnessaddress(self.ms_address)
+ self.wit_ms_address = self.nodes[0].addmultisigaddress(1, [self.address], '', 'p2sh-segwit')['address']
network_thread_start()
self.coinbase_blocks = self.nodes[0].generate(2) # Block 2
diff --git a/test/functional/segwit.py b/test/functional/segwit.py
index 931ebdea39..ba6373fa33 100755
--- a/test/functional/segwit.py
+++ b/test/functional/segwit.py
@@ -95,12 +95,11 @@ class SegWitTest(BitcoinTestFramework):
for i in range(3):
newaddress = self.nodes[i].getnewaddress()
self.pubkey.append(self.nodes[i].validateaddress(newaddress)["pubkey"])
- multiaddress = self.nodes[i].addmultisigaddress(1, [self.pubkey[-1]])['address']
multiscript = CScript([OP_1, hex_str_to_bytes(self.pubkey[-1]), OP_1, OP_CHECKMULTISIG])
p2sh_addr = self.nodes[i].addwitnessaddress(newaddress)
bip173_addr = self.nodes[i].addwitnessaddress(newaddress, False)
- p2sh_ms_addr = self.nodes[i].addwitnessaddress(multiaddress)
- bip173_ms_addr = self.nodes[i].addwitnessaddress(multiaddress, False)
+ p2sh_ms_addr = self.nodes[i].addmultisigaddress(1, [self.pubkey[-1]], '', 'p2sh-segwit')['address']
+ bip173_ms_addr = self.nodes[i].addmultisigaddress(1, [self.pubkey[-1]], '', 'bech32')['address']
assert_equal(p2sh_addr, key_to_p2sh_p2wpkh(self.pubkey[-1]))
assert_equal(bip173_addr, key_to_p2wpkh(self.pubkey[-1]))
assert_equal(p2sh_ms_addr, script_to_p2sh_p2wsh(multiscript))