lint fixups

Author: Markuze

network/Cargo.toml

@@ -36,7 +36,7 @@ async-trait = { workspace = true }
 axum = { workspace = true }
 bcs = { workspace = true }
 bytes = { workspace = true }
-dashmap = {worksapce = true }
+dashmap = { worksapce = true }
 futures = { workspace = true }
 futures-util = { workspace = true }
 hex = { workspace = true }

network/builder/src/builder.rs

@@ -23,10 +23,11 @@ use aptos_event_notifications::{EventSubscriptionService, ReconfigNotificationLi
 use aptos_infallible::RwLock;
 use aptos_logger::prelude::*;
 use aptos_netcore::transport::tcp::TCPBufferCfg;
-use aptos_network::application::netperf::builder::NetPerfBuilder;
 use aptos_network::{
-    application::netperf::NetPerf,
-    application::storage::PeerMetadataStorage,
+    application::{
+        netperf::{builder::NetPerfBuilder, NetPerf},
+        storage::PeerMetadataStorage,
+    },
     connectivity_manager::{builder::ConnectivityManagerBuilder, ConnectivityRequest},
     constants::MAX_MESSAGE_SIZE,
     logging::NetworkSchema,
@@ -446,7 +447,8 @@ impl NetworkBuilder {
 
     /// Add a Aptos NetPerf to the network.
     fn add_network_perf(&mut self, netperf_port: u16) -> &mut Self {
-        let (netperf_tx, netperf_rx) = self.add_client_and_service(&NetPerf::network_endpoint_config());
+        let (netperf_tx, netperf_rx) =
+            self.add_client_and_service(&NetPerf::network_endpoint_config());
         self.netperf_builder = Some(NetPerfBuilder::new(
             self.network_context(),
             self.peer_metadata_storage.clone(),

network/src/application/netperf/builder.rs

@@ -1,12 +1,12 @@
 // Copyright (c) Aptos
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::{
-    application::netperf::{
+use crate::application::{
+    netperf::{
         interface::{NetPerfNetworkEvents, NetPerfNetworkSender},
         NetPerf,
     },
-    application::storage::PeerMetadataStorage,
+    storage::PeerMetadataStorage,
 };
 use aptos_config::network_id::NetworkContext;
 use aptos_logger::prelude::*;

network/src/application/netperf/interface.rs

@@ -10,10 +10,11 @@ pub struct NetPerfPayload {
 }
 
 impl NetPerfPayload {
-    pub fn new(len: usize) -> Self {
+    pub fn new(mut len: usize) -> Self {
         let mut v = Vec::with_capacity(len);
-        unsafe {
-            v.set_len(len);
+        while len > 0 {
+            v.push(0);
+            len -= 1;
         }
         NetPerfPayload { byte: v }
     }

network/src/application/netperf/mod.rs

@@ -7,16 +7,18 @@
 //! and simplify network-related performance profiling and debugging
 //!
 
-use crate::application::netperf::interface::NetPerfMsg;
-use crate::application::storage::PeerMetadataStorage;
-use crate::protocols::network::NetworkApplicationConfig;
-use crate::transport::ConnectionMetadata;
 use crate::{
-    application::netperf::interface::{NetPerfNetworkEvents, NetPerfNetworkSender, NetPerfPayload},
+    application::{
+        netperf::interface::{
+            NetPerfMsg, NetPerfNetworkEvents, NetPerfNetworkSender, NetPerfPayload,
+        },
+        storage::PeerMetadataStorage,
+    },
     constants::NETWORK_CHANNEL_SIZE,
     counters,
     logging::NetworkSchema,
-    protocols::network::Event,
+    protocols::network::{Event, NetworkApplicationConfig},
+    transport::ConnectionMetadata,
     ProtocolId,
 };
 use aptos_channels::{aptos_channel, message_queues::QueueStyle};
@@ -34,9 +36,11 @@ use dashmap::DashMap;
 use futures::StreamExt;
 use futures_util::stream::FuturesUnordered;
 use serde::Serialize;
-use std::fs::OpenOptions;
-use std::sync::atomic::AtomicBool;
-use std::{sync::Arc, time::Duration};
+use std::{
+    fs::OpenOptions,
+    sync::{atomic::AtomicBool, Arc},
+    time::Duration,
+};
 use tokio::sync::mpsc::{Receiver, Sender};
 
 pub mod builder;

network/src/counters.rs

@@ -156,11 +156,13 @@ pub static APTOS_NETWORK_DISCOVERY_NOTES: Lazy<IntGaugeVec> = Lazy::new(|| {
 });
 
 pub static APTOS_NETWORK_RPC_MESSAGES: Lazy<IntCounterVec> = Lazy::new(|| {
-    register_int_counter_vec!(
-        "aptos_network_rpc_messages",
-        "Number of RPC messages",
-        &["role_type", "network_id", "peer_id", "type", "state"]
-    )
+    register_int_counter_vec!("aptos_network_rpc_messages", "Number of RPC messages", &[
+        "role_type",
+        "network_id",
+        "peer_id",
+        "type",
+        "state"
+    ])
     .unwrap()
 });