Skip to content

GH-818 Second Review #729

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
Parent: GH-818 Chunked Responses Review 1
wants to merge 5 commits into
base: GH-818-StreamKey
Choose a base branch
from
Open

GH-818 Second Review #729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e019807
Review issues
dnwiebe Oct 14, 2025
c5ba669
Test is passing now, and code is cleaner
dnwiebe Oct 16, 2025
05adecf
Cleaned up some code
dnwiebe Oct 16, 2025
723c8b0
More review issues
dnwiebe Oct 21, 2025
91193af
Formatting
dnwiebe Oct 21, 2025
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
12 changes: 6 additions & 6 deletions node/src/dispatcher.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ mod tests {
timestamp: SystemTime::now(),
client_addr,
reception_port_opt,
sequence_number: Some(0),
sequence_number_opt: Some(0),
last_data: false,
is_clandestine: false,
data: data.clone(),
Expand Down Expand Up @@ -318,7 +318,7 @@ mod tests {
reception_port_opt,
last_data: false,
is_clandestine: true,
sequence_number: None,
sequence_number_opt: None,
data: data.clone(),
};
let mut peer_actors = peer_actors_builder().hopper(hopper).build();
Expand Down Expand Up @@ -358,7 +358,7 @@ mod tests {
reception_port_opt,
last_data: false,
is_clandestine: false,
sequence_number: Some(0),
sequence_number_opt: Some(0),
data: data.clone(),
};

Expand All @@ -384,7 +384,7 @@ mod tests {
reception_port_opt,
last_data: false,
is_clandestine: true,
sequence_number: None,
sequence_number_opt: None,
data: data.clone(),
};

Expand All @@ -406,7 +406,7 @@ mod tests {
let obcd = TransmitDataMsg {
endpoint: Endpoint::Socket(socket_addr),
last_data: false,
sequence_number: Some(0),
sequence_number_opt: Some(0),
data: data.clone(),
};

Expand All @@ -430,7 +430,7 @@ mod tests {
let obcd = TransmitDataMsg {
endpoint: Endpoint::Socket(socket_addr),
last_data: false,
sequence_number: None,
sequence_number_opt: None,
data: data.clone(),
};
let mut peer_actors = peer_actors_builder().build();
Expand Down
10 changes: 5 additions & 5 deletions node/src/hopper/consuming_service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ impl ConsumingService {
reception_port_opt: None,
last_data: false,
is_clandestine: true,
sequence_number: None,
sequence_number_opt: None,
data: encrypted_package.into(),
};
debug!(
Expand All @@ -119,7 +119,7 @@ impl ConsumingService {
endpoint: next_stop,
last_data: false, // Hopper-to-Hopper clandestine streams are never remotely killed
data: encrypted_package.into(),
sequence_number: None,
sequence_number_opt: None,
};

debug!(
Expand Down Expand Up @@ -193,7 +193,7 @@ mod tests {
&TransmitDataMsg {
endpoint: Endpoint::Socket(SocketAddr::from_str("1.2.1.2:1212").unwrap()),
last_data: false,
sequence_number: None,
sequence_number_opt: None,
data: encodex(CRYPTDE_PAIR.main.as_ref(), &target_key, &lcp)
.unwrap()
.into(),
Expand Down Expand Up @@ -267,7 +267,7 @@ mod tests {
TransmitDataMsg {
endpoint: Endpoint::Key(destination_key.clone()),
last_data: false,
sequence_number: None,
sequence_number_opt: None,
data: expected_lcp_enc.into(),
},
*record,
Expand Down Expand Up @@ -321,7 +321,7 @@ mod tests {
reception_port_opt: None,
last_data: false,
is_clandestine: true,
sequence_number: None,
sequence_number_opt: None,
data: expected_lcp_enc.into(),
},
);
Expand Down
2 changes: 1 addition & 1 deletion node/src/hopper/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ mod tests {
reception_port_opt: None,
last_data: false,
is_clandestine: false,
sequence_number: None,
sequence_number_opt: None,
data: encrypted_package,
};
let system = System::new("panics_if_routing_service_is_unbound");
Expand Down
44 changes: 22 additions & 22 deletions node/src/hopper/routing_service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ impl RoutingService {
reception_port_opt: ibcd_but_data.reception_port_opt,
last_data: ibcd_but_data.last_data,
is_clandestine: ibcd_but_data.is_clandestine,
sequence_number: ibcd_but_data.sequence_number,
sequence_number_opt: ibcd_but_data.sequence_number_opt,
data: payload.into(),
};
self.routing_service_subs
Expand Down Expand Up @@ -495,7 +495,7 @@ impl RoutingService {
endpoint: Endpoint::Key(next_hop.public_key),
last_data,
data: next_live_package_enc.into(),
sequence_number: None,
sequence_number_opt: None,
})
}
}
Expand Down Expand Up @@ -571,7 +571,7 @@ mod tests {
timestamp: SystemTime::now(),
client_addr: SocketAddr::from_str("1.2.3.4:5678").unwrap(),
reception_port_opt: None,
sequence_number: None,
sequence_number_opt: None,
last_data: false,
is_clandestine: false,
data: data_enc.into(),
Expand Down Expand Up @@ -632,7 +632,7 @@ mod tests {
timestamp: SystemTime::now(),
client_addr: SocketAddr::from_str("1.2.3.4:5678").unwrap(),
reception_port_opt: None,
sequence_number: None,
sequence_number_opt: None,
last_data: false,
is_clandestine: false,
data: data_enc.into(),
Expand Down Expand Up @@ -675,7 +675,7 @@ mod tests {
timestamp: SystemTime::now(),
client_addr: SocketAddr::from_str("1.2.3.4:5678").unwrap(),
reception_port_opt: None,
sequence_number: None,
sequence_number_opt: None,
last_data: false,
is_clandestine: false,
data: data_enc.into(),
Expand Down Expand Up @@ -727,7 +727,7 @@ mod tests {
timestamp: SystemTime::now(),
client_addr: SocketAddr::from_str("1.2.3.4:5678").unwrap(),
reception_port_opt: None,
sequence_number: None,
sequence_number_opt: None,
last_data: false,
is_clandestine: false,
data: data_enc.into(),
Expand Down Expand Up @@ -777,7 +777,7 @@ mod tests {
timestamp: SystemTime::now(),
client_addr: SocketAddr::from_str("1.2.3.4:5678").unwrap(),
reception_port_opt: None,
sequence_number: None,
sequence_number_opt: None,
last_data: true,
is_clandestine: false,
data: data_enc.into(),
Expand Down Expand Up @@ -846,7 +846,7 @@ mod tests {
timestamp: SystemTime::now(),
client_addr: SocketAddr::from_str("1.2.3.4:5678").unwrap(),
reception_port_opt: None,
sequence_number: None,
sequence_number_opt: None,
last_data: true,
is_clandestine: false,
data: data_enc.into(),
Expand Down Expand Up @@ -904,7 +904,7 @@ mod tests {
reception_port_opt: None,
last_data: false,
is_clandestine: true,
sequence_number: None,
sequence_number_opt: None,
data: lcp_enc.into(),
};

Expand Down Expand Up @@ -981,7 +981,7 @@ mod tests {
reception_port_opt: None,
last_data: false,
is_clandestine: true,
sequence_number: None,
sequence_number_opt: None,
data: data_enc.into(),
};

Expand Down Expand Up @@ -1054,7 +1054,7 @@ mod tests {
reception_port_opt: None,
last_data: false,
is_clandestine: true,
sequence_number: None,
sequence_number_opt: None,
data: data_enc.into(),
};

Expand Down Expand Up @@ -1130,7 +1130,7 @@ mod tests {
reception_port_opt: None,
last_data: true,
is_clandestine: true,
sequence_number: None,
sequence_number_opt: None,
data: data_enc.into(),
};

Expand Down Expand Up @@ -1170,7 +1170,7 @@ mod tests {
TransmitDataMsg {
endpoint: Endpoint::Key(next_key.clone()),
last_data: true,
sequence_number: None,
sequence_number_opt: None,
data: expected_lcp_enc.into(),
}
);
Expand Down Expand Up @@ -1222,7 +1222,7 @@ mod tests {
reception_port_opt: None,
last_data: true,
is_clandestine: true,
sequence_number: None,
sequence_number_opt: None,
data: data_enc.into(),
};

Expand Down Expand Up @@ -1265,7 +1265,7 @@ mod tests {
reception_port_opt: None,
last_data: true,
is_clandestine: true,
sequence_number: None,
sequence_number_opt: None,
data: expected_lcp_enc.into()
}
);
Expand Down Expand Up @@ -1304,7 +1304,7 @@ mod tests {
reception_port_opt: None,
last_data: true,
is_clandestine: true,
sequence_number: None,
sequence_number_opt: None,
data: data_enc.into(),
};
let system = System::new(
Expand Down Expand Up @@ -1401,7 +1401,7 @@ mod tests {
reception_port_opt: None,
last_data: true,
is_clandestine: true,
sequence_number: None,
sequence_number_opt: None,
data: data_enc.into(),
};
let system = System::new(
Expand Down Expand Up @@ -1577,7 +1577,7 @@ mod tests {
reception_port_opt: None,
last_data: true,
is_clandestine: true,
sequence_number: None,
sequence_number_opt: None,
data: data_enc.into(),
};
let system = System::new("test");
Expand Down Expand Up @@ -1647,7 +1647,7 @@ mod tests {
reception_port_opt: None,
last_data: true,
is_clandestine: true,
sequence_number: None,
sequence_number_opt: None,
data: data_enc.into(),
};
let system = System::new("test");
Expand Down Expand Up @@ -1691,7 +1691,7 @@ mod tests {
reception_port_opt: None,
last_data: true,
is_clandestine: true,
sequence_number: None,
sequence_number_opt: None,
data: vec![],
};
let system = System::new("consume_logs_error_when_given_bad_input_data");
Expand Down Expand Up @@ -1748,7 +1748,7 @@ mod tests {
reception_port_opt: None,
last_data: true,
is_clandestine: true,
sequence_number: None,
sequence_number_opt: None,
data: data_enc.into(),
};
let system = System::new("consume_logs_error_when_given_bad_input_data");
Expand Down Expand Up @@ -1815,7 +1815,7 @@ mod tests {
reception_port_opt: None,
last_data: true,
is_clandestine: true,
sequence_number: None,
sequence_number_opt: None,
data: vec![],
};

Expand Down
Loading
Loading