diff --git a/core/src/broadcast_stage.rs b/core/src/broadcast_stage.rs index 77ed6cfa9b..a0953aee62 100644 --- a/core/src/broadcast_stage.rs +++ b/core/src/broadcast_stage.rs @@ -191,15 +191,15 @@ impl BroadcastStage { fn handle_error(r: Result<()>, name: &str) -> Option { if let Err(e) = r { match e { - Error::RecvTimeoutError(RecvTimeoutError::Disconnected) - | Error::SendError - | Error::RecvError(RecvError) - | Error::CrossbeamRecvTimeoutError(CrossbeamRecvTimeoutError::Disconnected) => { + Error::RecvTimeout(RecvTimeoutError::Disconnected) + | Error::Send + | Error::Recv(RecvError) + | Error::CrossbeamRecvTimeout(CrossbeamRecvTimeoutError::Disconnected) => { return Some(BroadcastStageReturnType::ChannelDisconnected); } - Error::RecvTimeoutError(RecvTimeoutError::Timeout) - | Error::CrossbeamRecvTimeoutError(CrossbeamRecvTimeoutError::Timeout) => (), - Error::ClusterInfoError(ClusterInfoError::NoPeers) => (), // TODO: Why are the unit-tests throwing hundreds of these? + Error::RecvTimeout(RecvTimeoutError::Timeout) + | Error::CrossbeamRecvTimeout(CrossbeamRecvTimeoutError::Timeout) => (), + Error::ClusterInfo(ClusterInfoError::NoPeers) => (), // TODO: Why are the unit-tests throwing hundreds of these? _ => { inc_new_counter_error!("streamer-broadcaster-error", 1, 1); error!("{} broadcaster error: {:?}", name, e); diff --git a/core/src/cluster_info_vote_listener.rs b/core/src/cluster_info_vote_listener.rs index 3f07732f70..b0afdd586f 100644 --- a/core/src/cluster_info_vote_listener.rs +++ b/core/src/cluster_info_vote_listener.rs @@ -394,10 +394,10 @@ impl ClusterInfoVoteListener { would_be_leader, ) { match e { - Error::CrossbeamRecvTimeoutError(RecvTimeoutError::Disconnected) => { + Error::CrossbeamRecvTimeout(RecvTimeoutError::Disconnected) => { return Ok(()); } - Error::CrossbeamRecvTimeoutError(RecvTimeoutError::Timeout) => (), + Error::CrossbeamRecvTimeout(RecvTimeoutError::Timeout) => (), _ => { error!("thread {:?} error {:?}", thread::current().name(), e); } @@ -479,8 +479,8 @@ impl ClusterInfoVoteListener { .add_new_optimistic_confirmed_slots(confirmed_slots.clone()); } Err(e) => match e { - Error::CrossbeamRecvTimeoutError(RecvTimeoutError::Timeout) - | Error::ReadyTimeoutError => (), + Error::CrossbeamRecvTimeout(RecvTimeoutError::Timeout) + | Error::ReadyTimeout => (), _ => { error!("thread {:?} error {:?}", thread::current().name(), e); } diff --git a/core/src/fetch_stage.rs b/core/src/fetch_stage.rs index 523ad2a92b..8aea7fe25c 100644 --- a/core/src/fetch_stage.rs +++ b/core/src/fetch_stage.rs @@ -85,7 +85,7 @@ impl FetchStage { inc_new_counter_debug!("fetch_stage-honor_forwards", len); for packets in batch { if sendr.send(packets).is_err() { - return Err(Error::SendError); + return Err(Error::Send); } } } else { @@ -140,10 +140,10 @@ impl FetchStage { Self::handle_forwarded_packets(&forward_receiver, &sender, &poh_recorder) { match e { - Error::RecvTimeoutError(RecvTimeoutError::Disconnected) => break, - Error::RecvTimeoutError(RecvTimeoutError::Timeout) => (), - Error::RecvError(_) => break, - Error::SendError => break, + Error::RecvTimeout(RecvTimeoutError::Disconnected) => break, + Error::RecvTimeout(RecvTimeoutError::Timeout) => (), + Error::Recv(_) => break, + Error::Send => break, _ => error!("{:?}", e), } } diff --git a/core/src/result.rs b/core/src/result.rs index 8dbce74de7..5fafca2ee1 100644 --- a/core/src/result.rs +++ b/core/src/result.rs @@ -6,18 +6,18 @@ use solana_ledger::blockstore; #[derive(Debug)] pub enum Error { Io(std::io::Error), - RecvError(std::sync::mpsc::RecvError), - CrossbeamRecvTimeoutError(crossbeam_channel::RecvTimeoutError), - ReadyTimeoutError, - RecvTimeoutError(std::sync::mpsc::RecvTimeoutError), - CrossbeamSendError, - TryCrossbeamSendError, + Recv(std::sync::mpsc::RecvError), + CrossbeamRecvTimeout(crossbeam_channel::RecvTimeoutError), + ReadyTimeout, + RecvTimeout(std::sync::mpsc::RecvTimeoutError), + CrossbeamSend, + TryCrossbeamSend, Serialize(std::boxed::Box), - ClusterInfoError(cluster_info::ClusterInfoError), - SendError, - BlockstoreError(blockstore::BlockstoreError), - WeightedIndexError(rand::distributions::weighted::WeightedError), - GossipError(GossipError), + ClusterInfo(cluster_info::ClusterInfoError), + Send, + Blockstore(blockstore::BlockstoreError), + WeightedIndex(rand::distributions::weighted::WeightedError), + Gossip(GossipError), } pub type Result = std::result::Result; @@ -32,42 +32,42 @@ impl std::error::Error for Error {} impl std::convert::From for Error { fn from(e: std::sync::mpsc::RecvError) -> Error { - Error::RecvError(e) + Error::Recv(e) } } impl std::convert::From for Error { fn from(e: crossbeam_channel::RecvTimeoutError) -> Error { - Error::CrossbeamRecvTimeoutError(e) + Error::CrossbeamRecvTimeout(e) } } impl std::convert::From for Error { fn from(_e: crossbeam_channel::ReadyTimeoutError) -> Error { - Error::ReadyTimeoutError + Error::ReadyTimeout } } impl std::convert::From for Error { fn from(e: std::sync::mpsc::RecvTimeoutError) -> Error { - Error::RecvTimeoutError(e) + Error::RecvTimeout(e) } } impl std::convert::From for Error { fn from(e: cluster_info::ClusterInfoError) -> Error { - Error::ClusterInfoError(e) + Error::ClusterInfo(e) } } impl std::convert::From> for Error { fn from(_e: crossbeam_channel::SendError) -> Error { - Error::CrossbeamSendError + Error::CrossbeamSend } } impl std::convert::From> for Error { fn from(_e: crossbeam_channel::TrySendError) -> Error { - Error::TryCrossbeamSendError + Error::TryCrossbeamSend } } impl std::convert::From> for Error { fn from(_e: std::sync::mpsc::SendError) -> Error { - Error::SendError + Error::Send } } impl std::convert::From for Error { @@ -82,17 +82,17 @@ impl std::convert::From> for Error { } impl std::convert::From for Error { fn from(e: blockstore::BlockstoreError) -> Error { - Error::BlockstoreError(e) + Error::Blockstore(e) } } impl std::convert::From for Error { fn from(e: rand::distributions::weighted::WeightedError) -> Error { - Error::WeightedIndexError(e) + Error::WeightedIndex(e) } } impl std::convert::From for Error { fn from(e: GossipError) -> Error { - Error::GossipError(e) + Error::Gossip(e) } } @@ -116,12 +116,12 @@ mod tests { #[test] fn from_test() { - assert_matches!(Error::from(RecvError {}), Error::RecvError(_)); + assert_matches!(Error::from(RecvError {}), Error::Recv(_)); assert_matches!( Error::from(RecvTimeoutError::Timeout), - Error::RecvTimeoutError(_) + Error::RecvTimeout(_) ); - assert_matches!(send_error(), Err(Error::SendError)); + assert_matches!(send_error(), Err(Error::Send)); let ioe = io::Error::new(io::ErrorKind::NotFound, "hi"); assert_matches!(Error::from(ioe), Error::Io(_)); } diff --git a/core/src/retransmit_stage.rs b/core/src/retransmit_stage.rs index b0f293f785..93f79ef0b1 100644 --- a/core/src/retransmit_stage.rs +++ b/core/src/retransmit_stage.rs @@ -563,8 +563,8 @@ pub fn retransmitter( &rpc_subscriptions, ) { match e { - Error::RecvTimeoutError(RecvTimeoutError::Disconnected) => break, - Error::RecvTimeoutError(RecvTimeoutError::Timeout) => (), + Error::RecvTimeout(RecvTimeoutError::Disconnected) => break, + Error::RecvTimeout(RecvTimeoutError::Timeout) => (), _ => { inc_new_counter_error!("streamer-retransmit-error", 1, 1); } diff --git a/core/src/serve_repair.rs b/core/src/serve_repair.rs index b6beebec98..06d70a2438 100644 --- a/core/src/serve_repair.rs +++ b/core/src/serve_repair.rs @@ -323,7 +323,7 @@ impl ServeRepair { &mut max_packets, ); match result { - Err(Error::RecvTimeoutError(_)) | Ok(_) => {} + Err(Error::RecvTimeout(_)) | Ok(_) => {} Err(err) => info!("repair listener error: {:?}", err), }; if exit.load(Ordering::Relaxed) { @@ -777,7 +777,7 @@ mod tests { &None, &mut outstanding_requests, ); - assert_matches!(rv, Err(Error::ClusterInfoError(ClusterInfoError::NoPeers))); + assert_matches!(rv, Err(Error::ClusterInfo(ClusterInfoError::NoPeers))); let serve_repair_addr = socketaddr!([127, 0, 0, 1], 1243); let nxt = ContactInfo { diff --git a/core/src/sigverify_stage.rs b/core/src/sigverify_stage.rs index ff153b0bbe..91354a843e 100644 --- a/core/src/sigverify_stage.rs +++ b/core/src/sigverify_stage.rs @@ -24,10 +24,10 @@ const RECV_BATCH_MAX_GPU: usize = 5_000; #[derive(Error, Debug)] pub enum SigVerifyServiceError { #[error("send packets batch error")] - SendError(#[from] SendError>), + Send(#[from] SendError>), #[error("streamer error")] - StreamerError(#[from] StreamerError), + Streamer(#[from] StreamerError), } type Result = std::result::Result; @@ -126,13 +126,13 @@ impl SigVerifyStage { .spawn(move || loop { if let Err(e) = Self::verifier(&packet_receiver, &verified_sender, id, &verifier) { match e { - SigVerifyServiceError::StreamerError(StreamerError::RecvTimeoutError( + SigVerifyServiceError::Streamer(StreamerError::RecvTimeout( RecvTimeoutError::Disconnected, )) => break, - SigVerifyServiceError::StreamerError(StreamerError::RecvTimeoutError( + SigVerifyServiceError::Streamer(StreamerError::RecvTimeout( RecvTimeoutError::Timeout, )) => (), - SigVerifyServiceError::SendError(_) => { + SigVerifyServiceError::Send(_) => { break; } _ => error!("{:?}", e), diff --git a/core/src/verified_vote_packets.rs b/core/src/verified_vote_packets.rs index f167ddbebe..772aac1775 100644 --- a/core/src/verified_vote_packets.rs +++ b/core/src/verified_vote_packets.rs @@ -188,7 +188,7 @@ mod tests { let before = update_version; assert_matches!( verified_vote_packets.receive_and_process_vote_packets(&r, &mut update_version, true), - Err(Error::CrossbeamRecvTimeoutError(RecvTimeoutError::Timeout)) + Err(Error::CrossbeamRecvTimeout(RecvTimeoutError::Timeout)) ); assert_eq!(before, update_version); } diff --git a/core/src/window_service.rs b/core/src/window_service.rs index 5fbe0861ef..af8178ab28 100644 --- a/core/src/window_service.rs +++ b/core/src/window_service.rs @@ -582,12 +582,12 @@ impl WindowService { H: Fn(), { match e { - Error::CrossbeamRecvTimeoutError(RecvTimeoutError::Disconnected) => true, - Error::CrossbeamRecvTimeoutError(RecvTimeoutError::Timeout) => { + Error::CrossbeamRecvTimeout(RecvTimeoutError::Disconnected) => true, + Error::CrossbeamRecvTimeout(RecvTimeoutError::Timeout) => { handle_timeout(); false } - Error::CrossbeamSendError => true, + Error::CrossbeamSend => true, _ => { handle_error(); error!("thread {:?} error {:?}", thread::current().name(), e); diff --git a/storage-bigtable/proto/google.bigtable.v2.rs b/storage-bigtable/proto/google.bigtable.v2.rs index 9936e2d1d4..607f4fa9ef 100644 --- a/storage-bigtable/proto/google.bigtable.v2.rs +++ b/storage-bigtable/proto/google.bigtable.v2.rs @@ -244,6 +244,7 @@ pub struct RowFilter { pub filter: ::core::option::Option, } /// Nested message and enum types in `RowFilter`. +#[allow(clippy::enum_variant_names)] pub mod row_filter { /// A RowFilter which sends rows through several RowFilters in sequence. #[derive(Clone, PartialEq, ::prost::Message)] diff --git a/storage-bigtable/src/bigtable.rs b/storage-bigtable/src/bigtable.rs index 383e90bc6f..e0f99ee79c 100644 --- a/storage-bigtable/src/bigtable.rs +++ b/storage-bigtable/src/bigtable.rs @@ -40,17 +40,17 @@ pub enum CellData { #[derive(Debug, Error)] pub enum Error { - #[error("AccessToken error: {0}")] - AccessTokenError(String), + #[error("AccessToken: {0}")] + AccessToken(String), - #[error("Certificate error: {0}")] - CertificateError(String), + #[error("Certificate: {0}")] + Certificate(String), - #[error("I/O Error: {0}")] - IoError(std::io::Error), + #[error("I/O: {0}")] + Io(std::io::Error), - #[error("Transport error: {0}")] - TransportError(tonic::transport::Error), + #[error("Transport: {0}")] + Transport(tonic::transport::Error), #[error("Invalid URI {0}: {1}")] InvalidUri(String, String), @@ -67,28 +67,28 @@ pub enum Error { #[error("Object is corrupt: {0}")] ObjectCorrupt(String), - #[error("RPC error: {0}")] - RpcError(tonic::Status), + #[error("RPC: {0}")] + Rpc(tonic::Status), - #[error("Timeout error")] - TimeoutError, + #[error("Timeout")] + Timeout, } impl std::convert::From for Error { fn from(err: std::io::Error) -> Self { - Self::IoError(err) + Self::Io(err) } } impl std::convert::From for Error { fn from(err: tonic::transport::Error) -> Self { - Self::TransportError(err) + Self::Transport(err) } } impl std::convert::From for Error { fn from(err: tonic::Status) -> Self { - Self::RpcError(err) + Self::Rpc(err) } } @@ -137,7 +137,7 @@ impl BigTableConnection { Scope::BigTableData }) .await - .map_err(Error::AccessTokenError)?; + .map_err(Error::AccessToken)?; let table_prefix = format!( "projects/{}/instances/{}/tables/", @@ -151,7 +151,7 @@ impl BigTableConnection { .tls_config( ClientTlsConfig::new() .ca_certificate( - root_ca_certificate::load().map_err(Error::CertificateError)?, + root_ca_certificate::load().map_err(Error::Certificate)?, ) .domain_name("bigtable.googleapis.com"), )?; @@ -265,7 +265,7 @@ impl BigTable { while let Some(res) = rrr.message().await? { if let Some(timeout) = self.timeout { if Instant::now().duration_since(started) > timeout { - return Err(Error::TimeoutError); + return Err(Error::Timeout); } } for (i, mut chunk) in res.chunks.into_iter().enumerate() { diff --git a/streamer/src/streamer.rs b/streamer/src/streamer.rs index 4cccbdc9e4..f17f678ea4 100644 --- a/streamer/src/streamer.rs +++ b/streamer/src/streamer.rs @@ -21,10 +21,10 @@ pub enum StreamerError { Io(#[from] std::io::Error), #[error("receive timeout error")] - RecvTimeoutError(#[from] RecvTimeoutError), + RecvTimeout(#[from] RecvTimeoutError), #[error("send packets error")] - SendError(#[from] SendError), + Send(#[from] SendError), } pub type Result = std::result::Result; @@ -148,8 +148,8 @@ pub fn responder(name: &'static str, sock: Arc, r: PacketReceiver) -> loop { if let Err(e) = recv_send(&sock, &r) { match e { - StreamerError::RecvTimeoutError(RecvTimeoutError::Disconnected) => break, - StreamerError::RecvTimeoutError(RecvTimeoutError::Timeout) => (), + StreamerError::RecvTimeout(RecvTimeoutError::Disconnected) => break, + StreamerError::RecvTimeout(RecvTimeoutError::Timeout) => (), _ => { errors += 1; last_error = Some(e);