Skip to content
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

More flake fixes #6813

Merged
merged 2 commits into from
Oct 25, 2023
+3 −3
Merged

More flake fixes #6813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3a2663
pytest: fix flake in test_remote_addr_port
rustyrussell Oct 25, 2023
67bf098
lightningd: fix crash when blocks come it fast.
rustyrussell Oct 25, 2023
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
2 changes: 1 addition & 1 deletion lightningd/chaintopology.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ static void rebroadcast_txs(struct chain_topology *topo)
tal_free(cleanup_ctx);

/* Free explicitly in case we were called because a block came in. */
tal_free(topo->rebroadcast_timer);
topo->rebroadcast_timer = tal_free(topo->rebroadcast_timer);

/* Nothing to broadcast? Reset timer immediately */
if (*num_rebroadcast_remaining == 0)
Expand Down
4 changes: 2 additions & 2 deletions tests/test_connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,11 +236,11 @@ def test_remote_addr_port(node_factory, bitcoind):
l2.daemon.wait_for_log("Already have funding locked in")
l3.restart()
l2.rpc.connect(l3.info['id'], 'localhost', l3.port)
l2.daemon.wait_for_log("Already have funding locked in")

# if ip discovery would have been enabled, we would have send an updated
# node_annoucement by now. Check we didn't...
assert l2.daemon.wait_for_log("Update our node_announcement for discovered address")
l2.daemon.wait_for_logs(["Already have funding locked in",
"Update our node_announcement for discovered address"])
info = l2.rpc.getinfo()
assert len(info['address']) == 1
assert info['address'][0]['type'] == 'ipv4'
Expand Down
Loading