Skip to content

refactor(node): reduce announce sender complexity #953

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
leumor merged 1 commit into from
Feb 1, 2026
Merged

refactor(node): reduce announce sender complexity #953

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
77 changes: 50 additions & 27 deletions src/main/java/network/crypta/node/AnnounceSender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,41 +140,64 @@ public void run() {
}

private void realRun() {
if (!initialHandshakeAndMaybeTransfer()) return;
if (!initialHandshakeAndMaybeTransfer()) {
return;
}

HashSet<PeerNode> nodesRoutedTo = new HashSet<>();
PeerNode last = null;
boolean hasForwarded = false;
RoutingState state = new RoutingState();
boolean keepRunning = true;
while (keepRunning) {
keepRunning = processNextHop(state);
}
}

while (true) {
if (LOG.isDebugEnabled()) LOG.debug("htl={}", htl);
private static final class RoutingState {
private final Set<PeerNode> nodesRoutedTo = new HashSet<>();
private PeerNode last;
private boolean hasForwarded;
}

updateHtl(hasForwarded, last);
private boolean processNextHop(RoutingState state) {
if (LOG.isDebugEnabled()) LOG.debug("htl={}", htl);

if (shouldCompleteNow()) {
complete();
return;
}
updateHtl(state.hasForwarded, state.last);

PeerNode next = chooseNextNode(nodesRoutedTo);
if (next == null) {
if (onlyNode == null) rnf(null);
return; // rnf() may already have been sent when appropriate
}
if (shouldCompleteNow()) {
complete();
return false;
}

NodeProcessResult result = routeOnce(nodesRoutedTo, next);
if (result == NodeProcessResult.TERMINATE) {
return;
}
if (result == NodeProcessResult.CONTINUE_FORWARDED) {
hasForwarded = true;
last = next;
} else if (result == NodeProcessResult.CONTINUE_NO_FORWARD) {
PeerNode next = chooseNextNode(state.nodesRoutedTo);
if (next == null) {
handleNoNextNode();
return false;
}

NodeProcessResult result = routeOnce(state.nodesRoutedTo, next);
return applyRouteResult(state, next, result);
}

private void handleNoNextNode() {
if (onlyNode == null) {
rnf(null);
}
}

private boolean applyRouteResult(RoutingState state, PeerNode next, NodeProcessResult result) {
switch (result) {
case TERMINATE:
return false;
case CONTINUE_FORWARDED:
state.hasForwarded = true;
state.last = next;
return true;
case CONTINUE_NO_FORWARD:
// Track the attempted peer even if we failed to send/forward.
// This keeps HTL decrement attribution consistent with the peer we just tried.
last = next;
}
// else: no forward this iteration, keep the previous 'last' and hasForwarded
state.last = next;
return true;
default:
return true;
}
}

Expand Down
Loading