Skip to content

pytest: fix flake in test_closing_anchorspend_htlc_tx_rbf #9027

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rustyrussell wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −4
Open

pytest: fix flake in test_closing_anchorspend_htlc_tx_rbf #9027

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions tests/test_closing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
scriptpubkey_addr, calc_lease_fee,
check_utxos_channel, check_coin_moves,
mine_funding_to_announce, check_inspect_channel,
first_scid, check_feerate
first_scid, check_feerate, did_short_sig
)

from typing import List, Optional
Expand Down Expand Up @@ -3787,7 +3787,8 @@ def test_closing_anchorspend_htlc_tx_rbf(node_factory, bitcoind):
# We want an outstanding HTLC for l1, so it uses anchor to push.
# Set feerates to lowball for now.
l1, l2 = node_factory.line_graph(2, opts=[{'feerates': (1000,) * 4,
'min-emergency-msat': 546000},
'min-emergency-msat': 546000,
'broken_log': 'overgrind: short signature length'},
{'feerates': (1000,) * 4,
'disconnect': ['-WIRE_UPDATE_FAIL_HTLC']}])
assert 'anchors/even' in only_one(l1.rpc.listpeerchannels()['channels'])['channel_type']['names']
Expand Down Expand Up @@ -3835,7 +3836,7 @@ def test_closing_anchorspend_htlc_tx_rbf(node_factory, bitcoind):
total_weight = sum([d['weight'] for d in details])
total_fees = sum([float(d['fees']['base']) * 100_000_000 for d in details])
total_feerate_perkw = total_fees / total_weight * 1000
assert 2000 - 1 < total_feerate_perkw < 2000 + 1
assert did_short_sig(l1) or 2000 - 1 < total_feerate_perkw < 2000 + 1

# But we don't mine it! And fees go up again!
l1.set_feerates((3000, 3000, 3000, 3000))
Expand All @@ -3850,7 +3851,7 @@ def test_closing_anchorspend_htlc_tx_rbf(node_factory, bitcoind):
total_weight = sum([d['weight'] for d in details])
total_fees = sum([float(d['fees']['base']) * 100_000_000 for d in details])
total_feerate_perkw = total_fees / total_weight * 1000
assert 3000 - 1 < total_feerate_perkw < 3000 + 1
assert did_short_sig(l1) or 3000 - 1 < total_feerate_perkw < 3000 + 1

# And now we'll get it in (there's some rounding, so feerate a bit lower!)
bitcoind.generate_block(1, needfeerate=2990)
Expand Down
Loading