From 16e4ccca13418a2936917fd6d8b81050a6e30584 Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Fri, 26 Mar 2021 20:26:06 -0700 Subject: [PATCH] Switch to a single `use` --- client/src/blockhash_query.rs | 21 ++++---- client/src/client_error.rs | 12 +++-- client/src/http_sender.rs | 20 ++++---- client/src/mock_sender.rs | 34 ++++++------ client/src/nonce_utils.rs | 22 ++++---- client/src/perf_utils.rs | 18 ++++--- client/src/pubsub_client.rs | 48 +++++++++-------- client/src/rpc_cache.rs | 10 ++-- client/src/rpc_client.rs | 94 +++++++++++++++++----------------- client/src/rpc_config.rs | 14 ++--- client/src/rpc_custom_error.rs | 8 +-- client/src/rpc_request.rs | 12 +++-- client/src/rpc_response.rs | 20 ++++---- client/src/thin_client.rs | 60 +++++++++++----------- 14 files changed, 212 insertions(+), 181 deletions(-) diff --git a/client/src/blockhash_query.rs b/client/src/blockhash_query.rs index 1cf40056a2..1a33a79ff4 100644 --- a/client/src/blockhash_query.rs +++ b/client/src/blockhash_query.rs @@ -1,12 +1,15 @@ -use crate::{nonce_utils, rpc_client::RpcClient}; -use clap::ArgMatches; -use solana_clap_utils::{ - input_parsers::{pubkey_of, value_of}, - nonce::*, - offline::*, -}; -use solana_sdk::{ - commitment_config::CommitmentConfig, fee_calculator::FeeCalculator, hash::Hash, pubkey::Pubkey, +use { + crate::{nonce_utils, rpc_client::RpcClient}, + clap::ArgMatches, + solana_clap_utils::{ + input_parsers::{pubkey_of, value_of}, + nonce::*, + offline::*, + }, + solana_sdk::{ + commitment_config::CommitmentConfig, fee_calculator::FeeCalculator, hash::Hash, + pubkey::Pubkey, + }, }; #[derive(Debug, PartialEq)] diff --git a/client/src/client_error.rs b/client/src/client_error.rs index 96f6660262..67aa5717d4 100644 --- a/client/src/client_error.rs +++ b/client/src/client_error.rs @@ -1,9 +1,11 @@ -use crate::rpc_request; -use solana_sdk::{ - signature::SignerError, transaction::TransactionError, transport::TransportError, +use { + crate::rpc_request, + solana_sdk::{ + signature::SignerError, transaction::TransactionError, transport::TransportError, + }, + std::io, + thiserror::Error, }; -use std::io; -use thiserror::Error; pub use reqwest; // export `reqwest` for clients diff --git a/client/src/http_sender.rs b/client/src/http_sender.rs index e450225ca6..a6f967a660 100644 --- a/client/src/http_sender.rs +++ b/client/src/http_sender.rs @@ -1,13 +1,15 @@ -use crate::{ - client_error::Result, - rpc_custom_error, - rpc_request::{RpcError, RpcRequest, RpcResponseErrorData}, - rpc_response::RpcSimulateTransactionResult, - rpc_sender::RpcSender, +use { + crate::{ + client_error::Result, + rpc_custom_error, + rpc_request::{RpcError, RpcRequest, RpcResponseErrorData}, + rpc_response::RpcSimulateTransactionResult, + rpc_sender::RpcSender, + }, + log::*, + reqwest::{self, header::CONTENT_TYPE, StatusCode}, + std::{thread::sleep, time::Duration}, }; -use log::*; -use reqwest::{self, header::CONTENT_TYPE, StatusCode}; -use std::{thread::sleep, time::Duration}; pub struct HttpSender { client: reqwest::blocking::Client, diff --git a/client/src/mock_sender.rs b/client/src/mock_sender.rs index da84ec88c3..f478d76d6d 100644 --- a/client/src/mock_sender.rs +++ b/client/src/mock_sender.rs @@ -1,20 +1,22 @@ -use crate::{ - client_error::Result, - rpc_request::RpcRequest, - rpc_response::{Response, RpcResponseContext, RpcVersionInfo}, - rpc_sender::RpcSender, +use { + crate::{ + client_error::Result, + rpc_request::RpcRequest, + rpc_response::{Response, RpcResponseContext, RpcVersionInfo}, + rpc_sender::RpcSender, + }, + serde_json::{json, Number, Value}, + solana_sdk::{ + epoch_info::EpochInfo, + fee_calculator::{FeeCalculator, FeeRateGovernor}, + instruction::InstructionError, + signature::Signature, + transaction::{self, Transaction, TransactionError}, + }, + solana_transaction_status::{TransactionConfirmationStatus, TransactionStatus}, + solana_version::Version, + std::{collections::HashMap, sync::RwLock}, }; -use serde_json::{json, Number, Value}; -use solana_sdk::{ - epoch_info::EpochInfo, - fee_calculator::{FeeCalculator, FeeRateGovernor}, - instruction::InstructionError, - signature::Signature, - transaction::{self, Transaction, TransactionError}, -}; -use solana_transaction_status::{TransactionConfirmationStatus, TransactionStatus}; -use solana_version::Version; -use std::{collections::HashMap, sync::RwLock}; pub const PUBKEY: &str = "7RoSF9fUmdphVCpabEoefH81WwrW7orsWonXWqTXkKV8"; pub const SIGNATURE: &str = diff --git a/client/src/nonce_utils.rs b/client/src/nonce_utils.rs index 3422cc08b3..09d679bbe9 100644 --- a/client/src/nonce_utils.rs +++ b/client/src/nonce_utils.rs @@ -1,14 +1,16 @@ -use crate::rpc_client::RpcClient; -use solana_sdk::{ - account::{Account, ReadableAccount}, - account_utils::StateMut, - commitment_config::CommitmentConfig, - nonce::{ - state::{Data, Versions}, - State, +use { + crate::rpc_client::RpcClient, + solana_sdk::{ + account::{Account, ReadableAccount}, + account_utils::StateMut, + commitment_config::CommitmentConfig, + nonce::{ + state::{Data, Versions}, + State, + }, + pubkey::Pubkey, + system_program, }, - pubkey::Pubkey, - system_program, }; #[derive(Debug, thiserror::Error, PartialEq)] diff --git a/client/src/perf_utils.rs b/client/src/perf_utils.rs index 2ec7dd4b21..a22451b4b7 100644 --- a/client/src/perf_utils.rs +++ b/client/src/perf_utils.rs @@ -1,12 +1,14 @@ -use log::*; -use solana_sdk::{client::Client, commitment_config::CommitmentConfig, timing::duration_as_s}; -use std::{ - sync::{ - atomic::{AtomicBool, Ordering}, - Arc, RwLock, +use { + log::*, + solana_sdk::{client::Client, commitment_config::CommitmentConfig, timing::duration_as_s}, + std::{ + sync::{ + atomic::{AtomicBool, Ordering}, + Arc, RwLock, + }, + thread::sleep, + time::{Duration, Instant}, }, - thread::sleep, - time::{Duration, Instant}, }; #[derive(Default)] diff --git a/client/src/pubsub_client.rs b/client/src/pubsub_client.rs index fada6e6591..66c64e2c04 100644 --- a/client/src/pubsub_client.rs +++ b/client/src/pubsub_client.rs @@ -1,27 +1,31 @@ -use crate::{ - rpc_config::{RpcSignatureSubscribeConfig, RpcTransactionLogsConfig, RpcTransactionLogsFilter}, - rpc_response::{Response as RpcResponse, RpcLogsResponse, RpcSignatureResult, SlotInfo}, -}; -use log::*; -use serde::de::DeserializeOwned; -use serde_json::{ - json, - value::Value::{Number, Object}, - Map, Value, -}; -use solana_sdk::signature::Signature; -use std::{ - marker::PhantomData, - sync::{ - atomic::{AtomicBool, Ordering}, - mpsc::{channel, Receiver}, - Arc, RwLock, +use { + crate::{ + rpc_config::{ + RpcSignatureSubscribeConfig, RpcTransactionLogsConfig, RpcTransactionLogsFilter, + }, + rpc_response::{Response as RpcResponse, RpcLogsResponse, RpcSignatureResult, SlotInfo}, }, - thread::JoinHandle, + log::*, + serde::de::DeserializeOwned, + serde_json::{ + json, + value::Value::{Number, Object}, + Map, Value, + }, + solana_sdk::signature::Signature, + std::{ + marker::PhantomData, + sync::{ + atomic::{AtomicBool, Ordering}, + mpsc::{channel, Receiver}, + Arc, RwLock, + }, + thread::JoinHandle, + }, + thiserror::Error, + tungstenite::{client::AutoStream, connect, Message, WebSocket}, + url::{ParseError, Url}, }; -use thiserror::Error; -use tungstenite::{client::AutoStream, connect, Message, WebSocket}; -use url::{ParseError, Url}; #[derive(Debug, Error)] pub enum PubsubClientError { diff --git a/client/src/rpc_cache.rs b/client/src/rpc_cache.rs index 2e2a1a12d6..38dbba5825 100644 --- a/client/src/rpc_cache.rs +++ b/client/src/rpc_cache.rs @@ -1,7 +1,9 @@ -use crate::{rpc_config::RpcLargestAccountsFilter, rpc_response::RpcAccountBalance}; -use std::{ - collections::HashMap, - time::{Duration, SystemTime}, +use { + crate::{rpc_config::RpcLargestAccountsFilter, rpc_response::RpcAccountBalance}, + std::{ + collections::HashMap, + time::{Duration, SystemTime}, + }, }; #[derive(Debug, Clone)] diff --git a/client/src/rpc_client.rs b/client/src/rpc_client.rs index c45727323d..23416d3137 100644 --- a/client/src/rpc_client.rs +++ b/client/src/rpc_client.rs @@ -1,50 +1,52 @@ -use crate::{ - client_error::{ClientError, ClientErrorKind, Result as ClientResult}, - http_sender::HttpSender, - mock_sender::{MockSender, Mocks}, - rpc_config::RpcAccountInfoConfig, - rpc_config::{ - RpcConfirmedBlockConfig, RpcConfirmedTransactionConfig, - RpcGetConfirmedSignaturesForAddress2Config, RpcLargestAccountsConfig, - RpcProgramAccountsConfig, RpcSendTransactionConfig, RpcSimulateTransactionConfig, - RpcStakeConfig, RpcTokenAccountsFilter, +use { + crate::{ + client_error::{ClientError, ClientErrorKind, Result as ClientResult}, + http_sender::HttpSender, + mock_sender::{MockSender, Mocks}, + rpc_config::RpcAccountInfoConfig, + rpc_config::{ + RpcConfirmedBlockConfig, RpcConfirmedTransactionConfig, + RpcGetConfirmedSignaturesForAddress2Config, RpcLargestAccountsConfig, + RpcProgramAccountsConfig, RpcSendTransactionConfig, RpcSimulateTransactionConfig, + RpcStakeConfig, RpcTokenAccountsFilter, + }, + rpc_request::{RpcError, RpcRequest, RpcResponseErrorData, TokenAccountsFilter}, + rpc_response::*, + rpc_sender::RpcSender, + }, + bincode::serialize, + indicatif::{ProgressBar, ProgressStyle}, + log::*, + serde_json::{json, Value}, + solana_account_decoder::{ + parse_token::{TokenAccountType, UiTokenAccount, UiTokenAmount}, + UiAccount, UiAccountData, UiAccountEncoding, + }, + solana_sdk::{ + account::Account, + clock::{Epoch, Slot, UnixTimestamp, DEFAULT_MS_PER_SLOT, MAX_HASH_AGE_IN_SECONDS}, + commitment_config::{CommitmentConfig, CommitmentLevel}, + epoch_info::EpochInfo, + epoch_schedule::EpochSchedule, + fee_calculator::{FeeCalculator, FeeRateGovernor}, + hash::Hash, + pubkey::Pubkey, + signature::Signature, + transaction::{self, uses_durable_nonce, Transaction}, + }, + solana_transaction_status::{ + EncodedConfirmedBlock, EncodedConfirmedTransaction, TransactionStatus, UiConfirmedBlock, + UiTransactionEncoding, + }, + solana_vote_program::vote_state::MAX_LOCKOUT_HISTORY, + std::{ + cmp::min, + net::SocketAddr, + str::FromStr, + sync::RwLock, + thread::sleep, + time::{Duration, Instant}, }, - rpc_request::{RpcError, RpcRequest, RpcResponseErrorData, TokenAccountsFilter}, - rpc_response::*, - rpc_sender::RpcSender, -}; -use bincode::serialize; -use indicatif::{ProgressBar, ProgressStyle}; -use log::*; -use serde_json::{json, Value}; -use solana_account_decoder::{ - parse_token::{TokenAccountType, UiTokenAccount, UiTokenAmount}, - UiAccount, UiAccountData, UiAccountEncoding, -}; -use solana_sdk::{ - account::Account, - clock::{Epoch, Slot, UnixTimestamp, DEFAULT_MS_PER_SLOT, MAX_HASH_AGE_IN_SECONDS}, - commitment_config::{CommitmentConfig, CommitmentLevel}, - epoch_info::EpochInfo, - epoch_schedule::EpochSchedule, - fee_calculator::{FeeCalculator, FeeRateGovernor}, - hash::Hash, - pubkey::Pubkey, - signature::Signature, - transaction::{self, uses_durable_nonce, Transaction}, -}; -use solana_transaction_status::{ - EncodedConfirmedBlock, EncodedConfirmedTransaction, TransactionStatus, UiConfirmedBlock, - UiTransactionEncoding, -}; -use solana_vote_program::vote_state::MAX_LOCKOUT_HISTORY; -use std::{ - cmp::min, - net::SocketAddr, - str::FromStr, - sync::RwLock, - thread::sleep, - time::{Duration, Instant}, }; pub struct RpcClient { diff --git a/client/src/rpc_config.rs b/client/src/rpc_config.rs index a90603de13..b336b1a848 100644 --- a/client/src/rpc_config.rs +++ b/client/src/rpc_config.rs @@ -1,10 +1,12 @@ -use crate::rpc_filter::RpcFilterType; -use solana_account_decoder::{UiAccountEncoding, UiDataSliceConfig}; -use solana_sdk::{ - clock::Epoch, - commitment_config::{CommitmentConfig, CommitmentLevel}, +use { + crate::rpc_filter::RpcFilterType, + solana_account_decoder::{UiAccountEncoding, UiDataSliceConfig}, + solana_sdk::{ + clock::Epoch, + commitment_config::{CommitmentConfig, CommitmentLevel}, + }, + solana_transaction_status::{TransactionDetails, UiTransactionEncoding}, }; -use solana_transaction_status::{TransactionDetails, UiTransactionEncoding}; #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] #[serde(rename_all = "camelCase")] diff --git a/client/src/rpc_custom_error.rs b/client/src/rpc_custom_error.rs index e6191bf680..5288515d76 100644 --- a/client/src/rpc_custom_error.rs +++ b/client/src/rpc_custom_error.rs @@ -1,8 +1,10 @@ //! Implementation defined RPC server errors -use crate::rpc_response::RpcSimulateTransactionResult; -use jsonrpc_core::{Error, ErrorCode}; -use solana_sdk::clock::Slot; +use { + crate::rpc_response::RpcSimulateTransactionResult, + jsonrpc_core::{Error, ErrorCode}, + solana_sdk::clock::Slot, +}; pub const JSON_RPC_SERVER_ERROR_BLOCK_CLEANED_UP: i64 = -32001; pub const JSON_RPC_SERVER_ERROR_SEND_TRANSACTION_PREFLIGHT_FAILURE: i64 = -32002; diff --git a/client/src/rpc_request.rs b/client/src/rpc_request.rs index 25f518edfe..002833afe1 100644 --- a/client/src/rpc_request.rs +++ b/client/src/rpc_request.rs @@ -1,8 +1,10 @@ -use crate::rpc_response::RpcSimulateTransactionResult; -use serde_json::{json, Value}; -use solana_sdk::{clock::Slot, pubkey::Pubkey}; -use std::fmt; -use thiserror::Error; +use { + crate::rpc_response::RpcSimulateTransactionResult, + serde_json::{json, Value}, + solana_sdk::{clock::Slot, pubkey::Pubkey}, + std::fmt, + thiserror::Error, +}; #[derive(Debug, PartialEq, Eq, Hash, Clone, Copy)] pub enum RpcRequest { diff --git a/client/src/rpc_response.rs b/client/src/rpc_response.rs index a6d14e6b33..644cdee09d 100644 --- a/client/src/rpc_response.rs +++ b/client/src/rpc_response.rs @@ -1,13 +1,15 @@ -use crate::client_error; -use solana_account_decoder::{parse_token::UiTokenAmount, UiAccount}; -use solana_sdk::{ - clock::{Epoch, Slot, UnixTimestamp}, - fee_calculator::{FeeCalculator, FeeRateGovernor}, - inflation::Inflation, - transaction::{Result, TransactionError}, +use { + crate::client_error, + solana_account_decoder::{parse_token::UiTokenAmount, UiAccount}, + solana_sdk::{ + clock::{Epoch, Slot, UnixTimestamp}, + fee_calculator::{FeeCalculator, FeeRateGovernor}, + inflation::Inflation, + transaction::{Result, TransactionError}, + }, + solana_transaction_status::ConfirmedTransactionStatusWithSignature, + std::{collections::HashMap, fmt, net::SocketAddr}, }; -use solana_transaction_status::ConfirmedTransactionStatusWithSignature; -use std::{collections::HashMap, fmt, net::SocketAddr}; pub type RpcResult = client_error::Result>; diff --git a/client/src/thin_client.rs b/client/src/thin_client.rs index 17b1236500..8789984969 100644 --- a/client/src/thin_client.rs +++ b/client/src/thin_client.rs @@ -3,36 +3,38 @@ //! messages to the network directly. The binary encoding of its messages are //! unstable and may change in future releases. -use crate::{rpc_client::RpcClient, rpc_config::RpcProgramAccountsConfig, rpc_response::Response}; -use bincode::{serialize_into, serialized_size}; -use log::*; -use solana_sdk::{ - account::Account, - client::{AsyncClient, Client, SyncClient}, - clock::{Slot, MAX_PROCESSING_AGE}, - commitment_config::CommitmentConfig, - epoch_info::EpochInfo, - fee_calculator::{FeeCalculator, FeeRateGovernor}, - hash::Hash, - instruction::Instruction, - message::Message, - packet::PACKET_DATA_SIZE, - pubkey::Pubkey, - signature::{Keypair, Signature, Signer}, - signers::Signers, - system_instruction, - timing::duration_as_ms, - transaction::{self, Transaction}, - transport::Result as TransportResult, -}; -use std::{ - io, - net::{IpAddr, Ipv4Addr, SocketAddr, UdpSocket}, - sync::{ - atomic::{AtomicBool, AtomicUsize, Ordering}, - RwLock, +use { + crate::{rpc_client::RpcClient, rpc_config::RpcProgramAccountsConfig, rpc_response::Response}, + bincode::{serialize_into, serialized_size}, + log::*, + solana_sdk::{ + account::Account, + client::{AsyncClient, Client, SyncClient}, + clock::{Slot, MAX_PROCESSING_AGE}, + commitment_config::CommitmentConfig, + epoch_info::EpochInfo, + fee_calculator::{FeeCalculator, FeeRateGovernor}, + hash::Hash, + instruction::Instruction, + message::Message, + packet::PACKET_DATA_SIZE, + pubkey::Pubkey, + signature::{Keypair, Signature, Signer}, + signers::Signers, + system_instruction, + timing::duration_as_ms, + transaction::{self, Transaction}, + transport::Result as TransportResult, + }, + std::{ + io, + net::{IpAddr, Ipv4Addr, SocketAddr, UdpSocket}, + sync::{ + atomic::{AtomicBool, AtomicUsize, Ordering}, + RwLock, + }, + time::{Duration, Instant}, }, - time::{Duration, Instant}, }; struct ClientOptimizer {