pytest: make it work with latest bitcoind master branch.

They seem to have changed the JSON output.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2021-04-18 14:08:22 +09:30
parent f97a51cc0f
commit b352df4179
5 changed files with 28 additions and 18 deletions

View File

@@ -8,6 +8,7 @@ from utils import (
expected_peer_features, expected_node_features,
expected_channel_features,
check_coin_moves, first_channel_id, account_balance, basic_fee,
scriptpubkey_addr,
EXPERIMENTAL_FEATURES, EXPERIMENTAL_DUAL_FUND
)
from pyln.testing.utils import SLOW_MACHINE, VALGRIND
@@ -1304,7 +1305,7 @@ def test_funding_close_upfront(node_factory, bitcoind):
assert r['type'] == 'mutual'
tx = bitcoind.rpc.decoderawtransaction(r['tx'])
addrs = [vout['scriptPubKey']['addresses'][0] for vout in tx['vout']]
addrs = [scriptpubkey_addr(vout['scriptPubKey']) for vout in tx['vout']]
bitcoind.generate_block(1, wait_for_mempool=[r['txid']])
sync_blockheight(bitcoind, [l1, l2])
return addrs