aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-23 00:54:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

pytest: make it work with latest bitcoind master branch.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/test_closing.py
View File

@@ -6,7 +6,7 @@ from pyln.testing.utils import SLOW_MACHINE
from utils import (
only_one, sync_blockheight, wait_for, DEVELOPER, TIMEOUT,
account_balance, first_channel_id, basic_fee, TEST_NETWORK,
EXPERIMENTAL_FEATURES, EXPERIMENTAL_DUAL_FUND,
EXPERIMENTAL_FEATURES, EXPERIMENTAL_DUAL_FUND, scriptpubkey_addr
)
import os
@@ -372,7 +372,7 @@ def test_closing_specified_destination(node_factory, bitcoind, chainparams):
output_num2 = [o for o in outputs if o['txid'] == closetx][0]['output']
output_num1 = 0 if output_num2 == 1 else 1
# Check the another address is addr
assert addr == bitcoind.rpc.gettxout(closetx, output_num1)['scriptPubKey']['addresses'][0]
assert addr == scriptpubkey_addr(bitcoind.rpc.gettxout(closetx, output_num1)['scriptPubKey'])
assert 1 == bitcoind.rpc.gettxout(closetx, output_num1)['confirmations']
@@ -2513,7 +2513,7 @@ def test_permfail(node_factory, bitcoind):
# Check that the all the addresses match what we generated ourselves:
for o in l1.rpc.listfunds()['outputs']:
txout = bitcoind.rpc.gettxout(o['txid'], o['output'])
addr = txout['scriptPubKey']['addresses'][0]
addr = scriptpubkey_addr(txout['scriptPubKey'])
assert(addr == o['address'])
addr = l1.bitcoin.getnewaddress()
@@ -2713,7 +2713,7 @@ def test_shutdown_alternate_txid(node_factory, bitcoind):
# Gotta figure out which output manually :(
tx = bitcoind.rpc.getrawtransaction(txid, 1)
for n, out in enumerate(tx['vout']):
if 'addresses' in out['scriptPubKey'] and out['scriptPubKey']['addresses'][0] == addr:
if scriptpubkey_addr(out['scriptPubKey']) == addr:
txout = n
bitcoind.generate_block(1, wait_for_mempool=1)