Merge pull request #3293 from Pana/bump/mio2

prepare for upgrading mio to 1.0

Author: Pana

Cargo.lock

@@ -323,6 +323,7 @@ async-trait = "0.1"
 tower = "0.4"
 pin-project = "1.0"
 mio = "0.6"
+mio-extras = "2.0.6"
 reqwest = "0.12"
 
 # crypto & hash
@@ -356,6 +357,7 @@ log4rs = "1.3.0"
 env_logger = "0.11"
 lazy_static = "1.4"
 itertools = "0.14"
+lazycell = "1.3"
 once_cell = "1.21"
 byteorder = "1.5"
 strum = "0.26"

Cargo.toml

@@ -29,7 +29,6 @@ futures = { workspace = true, features = ["compat"] }
 hashbrown = { workspace = true }
 hibitset = { workspace = true }
 itertools = { workspace = true }
-io = { workspace = true }
 jsonrpc-core = { workspace = true }
 keccak-hash = { workspace = true }
 kvdb = { workspace = true }

crates/cfxcore/core/Cargo.toml

@@ -36,7 +36,6 @@ use cfx_parameters::light::{
 };
 use cfx_types::H256;
 use diem_types::validator_config::{ConsensusPublicKey, ConsensusVRFPublicKey};
-use io::TimerToken;
 use network::{
     node_table::NodeId, service::ProtocolVersion, NetworkContext,
     NetworkProtocolHandler,
@@ -57,6 +56,8 @@ use sync::{
 };
 use throttling::token_bucket::TokenBucketManager;
 
+type TimerToken = usize;
+
 const SYNC_TIMER: TimerToken = 0;
 const REQUEST_CLEANUP_TIMER: TimerToken = 1;
 const LOG_STATISTICS_TIMER: TimerToken = 2;

crates/cfxcore/core/src/light_protocol/handler/mod.rs

@@ -46,7 +46,6 @@ use cfx_parameters::light::{
 };
 use cfx_types::H256;
 use diem_types::validator_config::{ConsensusPublicKey, ConsensusVRFPublicKey};
-use io::TimerToken;
 use malloc_size_of_derive::MallocSizeOf as DeriveMallocSizeOf;
 use network::{
     node_table::NodeId, service::ProtocolVersion,
@@ -65,6 +64,8 @@ use std::{
 };
 use throttling::token_bucket::{ThrottleResult, TokenBucketManager};
 
+type TimerToken = usize;
+
 const CHECK_PEER_HEARTBEAT_TIMER: TimerToken = 0;
 
 #[derive(DeriveMallocSizeOf)]

crates/cfxcore/core/src/light_protocol/provider.rs

@@ -18,7 +18,6 @@ use diem_types::{
     epoch_change::EpochChangeProof,
     validator_config::{ConsensusPublicKey, ConsensusVRFPublicKey},
 };
-use io::TimerToken;
 use network::{
     node_table::NodeId, service::ProtocolVersion, NetworkContext,
     NetworkProtocolHandler, NetworkService, UpdateNodeOperation,
@@ -47,6 +46,8 @@ use crate::{
 
 use super::{HSB_PROTOCOL_ID, HSB_PROTOCOL_VERSION};
 
+type TimerToken = usize;
+
 #[derive(Default)]
 pub struct PeerState {
     id: NodeId,

crates/cfxcore/core/src/pos/protocol/sync_protocol.rs

@@ -30,7 +30,6 @@ use cfx_internal_common::ChainIdParamsDeprecated;
 use cfx_parameters::{block::MAX_BLOCK_SIZE_IN_BYTES, sync::*};
 use cfx_types::H256;
 use diem_types::validator_config::{ConsensusPublicKey, ConsensusVRFPublicKey};
-use io::TimerToken;
 use malloc_size_of::{new_malloc_size_ops, MallocSizeOf};
 use malloc_size_of_derive::MallocSizeOf as DeriveMallocSizeOf;
 use metrics::{register_meter_with_group, Meter, MeterTimer};
@@ -64,6 +63,8 @@ lazy_static! {
         register_meter_with_group("timer", "sync:propagate_tx_timer");
 }
 
+type TimerToken = usize;
+
 const TX_TIMER: TimerToken = 0;
 const CHECK_REQUEST_TIMER: TimerToken = 1;
 const BLOCK_CACHE_GC_TIMER: TimerToken = 2;

crates/cfxcore/core/src/sync/synchronization_protocol_handler.rs

@@ -13,7 +13,7 @@ use log::{debug, trace};
 use metrics::{
     register_meter_with_group, Gauge, GaugeUsize, Histogram, Meter, Sample,
 };
-use mio::{tcp::*, *};
+use mio::{tcp::TcpStream, Poll, PollOpt, Ready, Token};
 use priority_send_queue::{PrioritySendQueue, SendQueuePriority};
 use serde::Deserialize;
 use serde_derive::Serialize;
@@ -590,7 +590,7 @@ impl PacketAssembler for PacketWithLenAssembler {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::iolib::*;
+    use crate::iolib::IoChannel;
     use mio::Ready;
     use std::{
         cmp,

crates/network/src/connection.rs

@@ -6,7 +6,7 @@ use crate::{ip_utils::*, AllowIP, Error, IpFilter};
 use cfx_types::H512;
 use cfx_util_macros::bail;
 use enum_map::{Enum, EnumMap};
-use io::*;
+use io::StreamToken;
 use log::{debug, warn};
 use rand::{self, prelude::SliceRandom, Rng};
 use rlp::{Decodable, DecoderError, Encodable, Rlp, RlpStream};

crates/network/src/node_table.rs

@@ -16,7 +16,11 @@ use std::{
 };
 
 use keccak_hash::keccak;
-use mio::{tcp::*, udp::*, *};
+use mio::{
+    tcp::{TcpListener, TcpStream},
+    udp::UdpSocket,
+    Poll, PollOpt, Ready, Token,
+};
 use parity_path::restrict_permissions_owner;
 use parking_lot::{Mutex, RwLock};
 use rlp::{Decodable, DecoderError, Encodable, Rlp, RlpStream};
@@ -41,7 +45,7 @@ use serde::{Deserialize, Serialize};
 use crate::{
     discovery::Discovery,
     handshake::BYPASS_CRYPTOGRAPHY,
-    iolib::*,
+    iolib::{IoContext, IoHandler, IoService, StreamToken, TimerToken},
     ip_utils::{map_external_address, select_public_address},
     node_database::NodeDatabase,
     node_table::*,