Skip to content

Find shorter route assertion #3519

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

Merged
merged 2 commits into from
Feb 14, 2020
Merged

Find shorter route assertion #3519

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
5b1e041
CHANGELOG.md: fix extra 'v' in version.
rustyrussell Feb 14, 2020
992dce8
gossipd: remove assert which can trigger.
rustyrussell Feb 14, 2020
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 CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [v0.8.1-rc2] - 2020-02-12: "Channel to the Moon"
## [0.8.1-rc2] - 2020-02-12: "Channel to the Moon"

This release named by Vasil Dimov @vasild.

Expand Down
13 changes: 11 additions & 2 deletions gossipd/routing.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1217,10 +1217,19 @@ find_shorter_route(const tal_t *ctx, struct routing_state *rstate,
unvisited, shortest_cost_function);
dijkstra_cleanup(unvisited);

/* This must succeed, since we found a route before */
/* This will usually succeed, since we found a route before; however
* it's possible that it fails in corner cases. Consider that the reduced
* riskfactor may make us select a more fee-expensive route, which then
* makes us unable to complete the route due to htlc_max restrictions. */
short_route = build_route(ctx, rstate, dst, src, me, riskfactor, 1,
fuzz, base_seed, fee);
assert(short_route);
if (!short_route) {
status_info("Could't find short enough route %s->%s",
type_to_string(tmpctx, struct node_id, &dst->id),
type_to_string(tmpctx, struct node_id, &src->id));
goto out;
}

if (!amount_msat_sub(&short_cost,
dst->dijkstra.total, src->dijkstra.total))
goto bad_total;
Expand Down