Skip to content

merge queue: embarking unstable (cee30d8) and #7912 together #7918

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

Closed
mergify wants to merge 2 commits into from
Closed

merge queue: embarking unstable (cee30d8) and #7912 together #7918

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
b34e64c
Prioritise `StatusV2` over `StatusV1`
jimmygchen Aug 21, 2025
ac00dd9
Merge of #7912
mergify[bot] Aug 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
2 changes: 1 addition & 1 deletion beacon_node/lighthouse_network/src/rpc/protocol.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,8 +825,8 @@ impl<E: EthSpec> RequestType<E> {
match self {
// add more protocols when versions/encodings are supported
RequestType::Status(_) => vec![
ProtocolId::new(SupportedProtocol::StatusV1, Encoding::SSZSnappy),
ProtocolId::new(SupportedProtocol::StatusV2, Encoding::SSZSnappy),
ProtocolId::new(SupportedProtocol::StatusV1, Encoding::SSZSnappy),
],
RequestType::Goodbye(_) => vec![ProtocolId::new(
SupportedProtocol::GoodbyeV1,
Expand Down
18 changes: 12 additions & 6 deletions beacon_node/lighthouse_network/tests/rpc_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,21 +76,23 @@ fn test_tcp_status_rpc() {
.await;

// Dummy STATUS RPC message
let rpc_request = RequestType::Status(StatusMessage::V1(StatusMessageV1 {
let rpc_request = RequestType::Status(StatusMessage::V2(StatusMessageV2 {
fork_digest: [0; 4],
finalized_root: Hash256::zero(),
finalized_epoch: Epoch::new(1),
head_root: Hash256::zero(),
head_slot: Slot::new(1),
earliest_available_slot: Slot::new(0),
}));

// Dummy STATUS RPC message
let rpc_response = Response::Status(StatusMessage::V1(StatusMessageV1 {
let rpc_response = Response::Status(StatusMessage::V2(StatusMessageV2 {
fork_digest: [0; 4],
finalized_root: Hash256::zero(),
finalized_epoch: Epoch::new(1),
head_root: Hash256::zero(),
head_slot: Slot::new(1),
earliest_available_slot: Slot::new(0),
}));

// build the sender future
Expand Down Expand Up @@ -1205,21 +1207,23 @@ fn test_delayed_rpc_response() {
.await;

// Dummy STATUS RPC message
let rpc_request = RequestType::Status(StatusMessage::V1(StatusMessageV1 {
let rpc_request = RequestType::Status(StatusMessage::V2(StatusMessageV2 {
fork_digest: [0; 4],
finalized_root: Hash256::from_low_u64_be(0),
finalized_epoch: Epoch::new(1),
head_root: Hash256::from_low_u64_be(0),
head_slot: Slot::new(1),
earliest_available_slot: Slot::new(0),
}));

// Dummy STATUS RPC message
let rpc_response = Response::Status(StatusMessage::V1(StatusMessageV1 {
let rpc_response = Response::Status(StatusMessage::V2(StatusMessageV2 {
fork_digest: [0; 4],
finalized_root: Hash256::from_low_u64_be(0),
finalized_epoch: Epoch::new(1),
head_root: Hash256::from_low_u64_be(0),
head_slot: Slot::new(1),
earliest_available_slot: Slot::new(0),
}));

// build the sender future
Expand Down Expand Up @@ -1335,21 +1339,23 @@ fn test_active_requests() {
.await;

// Dummy STATUS RPC request.
let rpc_request = RequestType::Status(StatusMessage::V1(StatusMessageV1 {
let rpc_request = RequestType::Status(StatusMessage::V2(StatusMessageV2 {
fork_digest: [0; 4],
finalized_root: Hash256::from_low_u64_be(0),
finalized_epoch: Epoch::new(1),
head_root: Hash256::from_low_u64_be(0),
head_slot: Slot::new(1),
earliest_available_slot: Slot::new(0),
}));

// Dummy STATUS RPC response.
let rpc_response = Response::Status(StatusMessage::V1(StatusMessageV1 {
let rpc_response = Response::Status(StatusMessage::V2(StatusMessageV2 {
fork_digest: [0; 4],
finalized_root: Hash256::zero(),
finalized_epoch: Epoch::new(1),
head_root: Hash256::zero(),
head_slot: Slot::new(1),
earliest_available_slot: Slot::new(0),
}));

// Number of requests.
Expand Down
Loading