style: Migrate to stable-only rustfmt configuration
- Remove nightly-only features from .rustfmt.toml and vendor/ss58-registry/rustfmt.toml - Removed features: imports_granularity, wrap_comments, comment_width, reorder_impl_items, spaces_around_ranges, binop_separator, match_arm_blocks, trailing_semicolon, trailing_comma - Format all 898 affected files with stable rustfmt - Ensures long-term reliability without nightly toolchain dependency
This commit is contained in:
@@ -165,10 +165,12 @@ impl NetworkMessage {
|
||||
/// Returns the size of the encoded message or request
|
||||
pub fn size(&self) -> usize {
|
||||
match &self {
|
||||
NetworkMessage::MessageFromPeer(_, ValidationProtocols::V3(message)) =>
|
||||
message.encoded_size(),
|
||||
NetworkMessage::MessageFromNode(_peer_id, ValidationProtocols::V3(message)) =>
|
||||
message.encoded_size(),
|
||||
NetworkMessage::MessageFromPeer(_, ValidationProtocols::V3(message)) => {
|
||||
message.encoded_size()
|
||||
},
|
||||
NetworkMessage::MessageFromNode(_peer_id, ValidationProtocols::V3(message)) => {
|
||||
message.encoded_size()
|
||||
},
|
||||
NetworkMessage::RequestFromNode(_peer_id, incoming) => incoming.size(),
|
||||
NetworkMessage::RequestFromPeer(request) => request.payload.encoded_size(),
|
||||
}
|
||||
@@ -177,8 +179,8 @@ impl NetworkMessage {
|
||||
/// Returns the destination peer from the message or `None` if it originates from a peer.
|
||||
pub fn peer(&self) -> Option<&AuthorityDiscoveryId> {
|
||||
match &self {
|
||||
NetworkMessage::MessageFromNode(peer_id, _) |
|
||||
NetworkMessage::RequestFromNode(peer_id, _) => Some(peer_id),
|
||||
NetworkMessage::MessageFromNode(peer_id, _)
|
||||
| NetworkMessage::RequestFromNode(peer_id, _) => Some(peer_id),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
@@ -345,8 +347,9 @@ impl NetworkInterface {
|
||||
task_tx_limiter.lock().await.reap(size).await;
|
||||
|
||||
match peer_message {
|
||||
NetworkMessage::MessageFromNode(peer, message) =>
|
||||
tx_network.send_message_to_peer(&peer, message),
|
||||
NetworkMessage::MessageFromNode(peer, message) => {
|
||||
tx_network.send_message_to_peer(&peer, message)
|
||||
},
|
||||
NetworkMessage::RequestFromNode(peer, request) => {
|
||||
// Send request through a proxy so we can account and limit bandwidth
|
||||
// usage for the node.
|
||||
@@ -1057,8 +1060,9 @@ impl RequestExt for Requests {
|
||||
fn into_response_sender(self) -> ResponseSender {
|
||||
match self {
|
||||
Requests::ChunkFetching(outgoing_request) => outgoing_request.pending_response,
|
||||
Requests::AvailableDataFetchingV1(outgoing_request) =>
|
||||
outgoing_request.pending_response,
|
||||
Requests::AvailableDataFetchingV1(outgoing_request) => {
|
||||
outgoing_request.pending_response
|
||||
},
|
||||
Requests::DisputeSendingV1(outgoing_request) => outgoing_request.pending_response,
|
||||
_ => unimplemented!("unsupported request type"),
|
||||
}
|
||||
@@ -1067,14 +1071,18 @@ impl RequestExt for Requests {
|
||||
/// Swaps the `ResponseSender` and returns the previous value.
|
||||
fn swap_response_sender(&mut self, new_sender: ResponseSender) -> ResponseSender {
|
||||
match self {
|
||||
Requests::ChunkFetching(outgoing_request) =>
|
||||
std::mem::replace(&mut outgoing_request.pending_response, new_sender),
|
||||
Requests::AvailableDataFetchingV1(outgoing_request) =>
|
||||
std::mem::replace(&mut outgoing_request.pending_response, new_sender),
|
||||
Requests::AttestedCandidateV2(outgoing_request) =>
|
||||
std::mem::replace(&mut outgoing_request.pending_response, new_sender),
|
||||
Requests::DisputeSendingV1(outgoing_request) =>
|
||||
std::mem::replace(&mut outgoing_request.pending_response, new_sender),
|
||||
Requests::ChunkFetching(outgoing_request) => {
|
||||
std::mem::replace(&mut outgoing_request.pending_response, new_sender)
|
||||
},
|
||||
Requests::AvailableDataFetchingV1(outgoing_request) => {
|
||||
std::mem::replace(&mut outgoing_request.pending_response, new_sender)
|
||||
},
|
||||
Requests::AttestedCandidateV2(outgoing_request) => {
|
||||
std::mem::replace(&mut outgoing_request.pending_response, new_sender)
|
||||
},
|
||||
Requests::DisputeSendingV1(outgoing_request) => {
|
||||
std::mem::replace(&mut outgoing_request.pending_response, new_sender)
|
||||
},
|
||||
_ => unimplemented!("unsupported request type"),
|
||||
}
|
||||
}
|
||||
@@ -1083,10 +1091,12 @@ impl RequestExt for Requests {
|
||||
fn size(&self) -> usize {
|
||||
match self {
|
||||
Requests::ChunkFetching(outgoing_request) => outgoing_request.payload.encoded_size(),
|
||||
Requests::AvailableDataFetchingV1(outgoing_request) =>
|
||||
outgoing_request.payload.encoded_size(),
|
||||
Requests::AttestedCandidateV2(outgoing_request) =>
|
||||
outgoing_request.payload.encoded_size(),
|
||||
Requests::AvailableDataFetchingV1(outgoing_request) => {
|
||||
outgoing_request.payload.encoded_size()
|
||||
},
|
||||
Requests::AttestedCandidateV2(outgoing_request) => {
|
||||
outgoing_request.payload.encoded_size()
|
||||
},
|
||||
Requests::DisputeSendingV1(outgoing_request) => outgoing_request.payload.encoded_size(),
|
||||
_ => unimplemented!("received an unexpected request"),
|
||||
}
|
||||
@@ -1122,8 +1132,8 @@ mod tests {
|
||||
|
||||
// Allow up to `budget/max_refill` error tolerance
|
||||
let lower_bound = budget as u128 * ((end - start).as_millis() / 1000u128);
|
||||
let upper_bound = budget as u128 *
|
||||
((end - start).as_millis() / 1000u128 + rate_limiter.max_refill as u128);
|
||||
let upper_bound = budget as u128
|
||||
* ((end - start).as_millis() / 1000u128 + rate_limiter.max_refill as u128);
|
||||
assert!(total_sent as u128 >= lower_bound);
|
||||
assert!(total_sent as u128 <= upper_bound);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user