Automatically group imports

Author: alcuadrado

crates/edr/src/config.rs

@@ -132,10 +132,10 @@ impl TryFrom<AccountConfig> for ServerAccountConfig {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-
     use toml;
 
+    use super::*;
+
     #[test]
     fn test_config_file_serde() {
         let config_file = ConfigFile::default();

crates/edr/src/lib.rs

@@ -7,9 +7,8 @@ use std::{
 
 use anyhow::anyhow;
 use clap::{Args, Parser, Subcommand};
-use tracing::{event, Level};
-
 use edr_eth::Address;
+use tracing::{event, Level};
 
 pub mod config;
 

crates/edr/tests/cli.rs

@@ -4,8 +4,6 @@ use assert_cmd::{
     assert::Assert,
     cargo::CommandCargoExt, // for process::Command::cargo_bin
 };
-use predicates::str::contains;
-
 use edr_eth::{
     remote::{
         client::Request as RpcRequest,
@@ -17,6 +15,7 @@ use edr_eth::{
     Bytes, U256, U64,
 };
 use edr_rpc_server::{HardhatMethodInvocation, MethodInvocation};
+use predicates::str::contains;
 
 #[tokio::test]
 async fn node() -> Result<(), Box<dyn std::error::Error>> {

crates/edr_eth/src/account.rs

@@ -6,12 +6,11 @@
 
 //! Ethereum account types
 
+pub use revm_primitives::KECCAK_EMPTY;
 use revm_primitives::{ruint, AccountInfo};
 
 use crate::{trie::KECCAK_NULL_RLP, B256, U256};
 
-pub use revm_primitives::KECCAK_EMPTY;
-
 /// Basic account type.
 #[derive(Debug, Clone, PartialEq, Eq)]
 #[cfg_attr(

crates/edr_eth/src/block.rs

@@ -17,13 +17,6 @@ use revm_primitives::{
 };
 use rlp::Decodable;
 
-use crate::{
-    transaction::SignedTransaction,
-    trie::{self, KECCAK_NULL_RLP},
-    withdrawal::Withdrawal,
-    Address, Bloom, Bytes, B256, B64, U256,
-};
-
 use self::difficulty::calculate_ethash_canonical_difficulty;
 pub use self::{
     options::BlockOptions,
@@ -32,6 +25,12 @@ pub use self::{
         IsSafeBlockNumberArgs, LargestSafeBlockNumberArgs,
     },
 };
+use crate::{
+    transaction::SignedTransaction,
+    trie::{self, KECCAK_NULL_RLP},
+    withdrawal::Withdrawal,
+    Address, Bloom, Bytes, B256, B64, U256,
+};
 
 /// Ethereum block
 #[derive(Clone, Debug, Eq)]
@@ -494,9 +493,8 @@ mod tests {
 
     use revm_primitives::ruint::aliases::U64;
 
-    use crate::trie::KECCAK_RLP_EMPTY_ARRAY;
-
     use super::*;
+    use crate::trie::KECCAK_RLP_EMPTY_ARRAY;
 
     #[test]
     fn header_rlp_roundtrip() {

crates/edr_eth/src/log/block.rs

@@ -65,9 +65,8 @@ mod tests {
 
     use revm_primitives::{Address, Bytes};
 
-    use crate::log::Log;
-
     use super::*;
+    use crate::log::Log;
 
     #[test]
     fn test_block_log_full_serde() {

crates/edr_eth/src/log/filter.rs

@@ -27,9 +27,8 @@ mod tests {
 
     use revm_primitives::{Address, Bytes, B256};
 
-    use crate::log::{FullBlockLog, Log, ReceiptLog};
-
     use super::*;
+    use crate::log::{FullBlockLog, Log, ReceiptLog};
 
     #[test]
     fn test_filter_log_serde() {

crates/edr_eth/src/log/receipt.rs

@@ -36,9 +36,8 @@ mod tests {
 
     use revm_primitives::{Address, Bytes};
 
-    use crate::log::Log;
-
     use super::*;
+    use crate::log::Log;
 
     #[test]
     fn test_receipt_log_serde() {

crates/edr_eth/src/receipt.rs

@@ -352,9 +352,8 @@ where
 mod tests {
     use revm_primitives::{Address, Bytes};
 
-    use crate::log::Log;
-
     use super::*;
+    use crate::log::Log;
 
     fn dummy_receipts() -> Vec<TypedReceipt<Log>> {
         [

crates/edr_eth/src/receipt/block.rs

@@ -2,9 +2,8 @@ use std::ops::Deref;
 
 use revm_primitives::B256;
 
-use crate::log::FullBlockLog;
-
 use super::TransactionReceipt;
+use crate::log::FullBlockLog;
 
 /// Type for a receipt that's included in a block.
 #[derive(Clone, Debug, PartialEq, Eq)]
@@ -40,9 +39,8 @@ mod test {
     use ethbloom::Bloom;
     use revm_primitives::{Address, U256};
 
-    use crate::receipt::{TypedReceipt, TypedReceiptData};
-
     use super::*;
+    use crate::receipt::{TypedReceipt, TypedReceiptData};
 
     #[test]
     fn test_block_receipt_serde() {

crates/edr_eth/src/receipt/transaction.rs

@@ -84,9 +84,8 @@ where
 
 #[cfg(test)]
 mod test {
-    use crate::receipt::TypedReceiptData;
-
     use super::*;
+    use crate::receipt::TypedReceiptData;
 
     #[test]
     fn test_transaction_receipt_serde() {

crates/edr_eth/src/remote.rs

@@ -20,10 +20,10 @@ pub mod methods;
 
 mod cacheable_method_invocation;
 
-use crate::B256;
-
 pub use client::{RpcClient, RpcClientError};
 
+use crate::B256;
+
 /// for representing block specifications per EIP-1898
 #[derive(Clone, Debug, PartialEq, serde::Deserialize, serde::Serialize)]
 #[serde(untagged)]

crates/edr_eth/src/remote/cacheable_method_invocation.rs

@@ -1,8 +1,8 @@
-use crate::block::{is_safe_block_number, IsSafeBlockNumberArgs};
 use revm_primitives::{Address, B256};
 use sha3::{digest::FixedOutput, Digest, Sha3_256};
 
 use crate::{
+    block::{is_safe_block_number, IsSafeBlockNumberArgs},
     remote::{
         methods::{GetLogsInput, MethodInvocation},
         BlockSpec, BlockTag, Eip1898BlockSpec,

crates/edr_eth/src/remote/client.rs

@@ -20,6 +20,11 @@ use sha3::{digest::FixedOutput, Digest, Sha3_256};
 use tokio::sync::{OnceCell, RwLock};
 use uuid::Uuid;
 
+use super::{
+    eth, jsonrpc,
+    methods::{GetLogsInput, MethodInvocation},
+    BlockSpec,
+};
 use crate::{
     block::{block_time, is_safe_block_number, IsSafeBlockNumberArgs},
     log::FilterLog,
@@ -34,12 +39,6 @@ use crate::{
     serde::ZeroXPrefixedBytes,
 };
 
-use super::{
-    eth, jsonrpc,
-    methods::{GetLogsInput, MethodInvocation},
-    BlockSpec,
-};
-
 const RPC_CACHE_DIR: &str = "rpc_cache";
 const TMP_DIR: &str = "tmp";
 // Retry parameters for rate limited requests.
@@ -1065,16 +1064,14 @@ mod tests {
 
     #[cfg(feature = "test-remote")]
     mod alchemy {
-        use futures::future::join_all;
         use std::fs::File;
 
-        use crate::Bytes;
-
         use edr_test_utils::env::{get_alchemy_url, get_infura_url};
+        use futures::future::join_all;
+        use walkdir::WalkDir;
 
         use super::*;
-
-        use walkdir::WalkDir;
+        use crate::Bytes;
 
         // The maximum block number that Alchemy allows
         const MAX_BLOCK_NUMBER: u64 = u64::MAX >> 1;

crates/edr_eth/src/serde.rs

@@ -249,9 +249,10 @@ pub mod u8 {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use serde_json::json;
 
+    use super::*;
+
     #[derive(Debug, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
     struct TestStructSerde {
         #[serde(with = "u8")]

crates/edr_eth/src/signature.rs

@@ -371,9 +371,10 @@ impl From<B256> for RecoveryMessage {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use std::str::FromStr;
 
+    use super::*;
+
     #[test]
     fn recover_web3_signature() {
         // test vector taken from:

crates/edr_eth/src/state.rs

@@ -34,9 +34,8 @@ where
 mod tests {
     use std::str::FromStr;
 
-    use crate::trie::KECCAK_NULL_RLP;
-
     use super::*;
+    use crate::trie::KECCAK_NULL_RLP;
 
     #[test]
     fn empty_state_root() {

crates/edr_eth/src/transaction.rs

@@ -9,9 +9,8 @@ mod kind;
 mod request;
 mod signed;
 
-use crate::{access_list::AccessListItem, Address, Bytes, U256};
-
 pub use self::{detailed::DetailedTransaction, kind::TransactionKind, request::*, signed::*};
+use crate::{access_list::AccessListItem, Address, Bytes, U256};
 
 /// Represents _all_ transaction requests received from RPC
 #[derive(Clone, Debug, PartialEq, Eq, Default)]

crates/edr_eth/src/transaction/signed.rs

@@ -6,19 +6,17 @@ mod legacy;
 
 use revm_primitives::{Address, Bytes, B256, U256};
 
-use crate::{
-    access_list::AccessList,
-    signature::{Signature, SignatureError},
-    utils::enveloped,
-};
-
-use super::kind::TransactionKind;
-
 pub use self::{
     eip155::EIP155SignedTransaction, eip1559::Eip1559SignedTransaction,
     eip2930::Eip2930SignedTransaction, eip4844::Eip4844SignedTransaction,
     legacy::LegacySignedTransaction,
 };
+use super::kind::TransactionKind;
+use crate::{
+    access_list::AccessList,
+    signature::{Signature, SignatureError},
+    utils::enveloped,
+};
 
 #[derive(Clone, Debug, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]

crates/edr_eth/src/transaction/signed/eip1559.rs

@@ -125,13 +125,12 @@ mod tests {
     use k256::SecretKey;
     use revm_primitives::Address;
 
+    use super::*;
     use crate::{
         access_list::AccessListItem,
         signature::{secret_key_from_str, secret_key_to_address},
     };
 
-    use super::*;
-
     const DUMMY_SECRET_KEY: &str =
         "e331b6d69882b4cb4ea581d88e0b604039a3de5967688d3dcffdd2270c0fd109";
 

crates/edr_eth/src/transaction/signed/eip2930.rs

@@ -121,9 +121,8 @@ mod tests {
     use k256::SecretKey;
     use revm_primitives::Address;
 
-    use crate::{access_list::AccessListItem, signature::secret_key_from_str};
-
     use super::*;
+    use crate::{access_list::AccessListItem, signature::secret_key_from_str};
 
     fn dummy_request() -> EIP2930TransactionRequest {
         let to = Address::from_str("0xc014ba5ec014ba5ec014ba5ec014ba5ec014ba5e").unwrap();

crates/edr_eth/src/transaction/signed/legacy.rs

@@ -93,9 +93,9 @@ impl rlp::Decodable for LegacySignedTransaction {
 
 #[cfg(test)]
 mod tests {
-    use k256::SecretKey;
     use std::str::FromStr;
 
+    use k256::SecretKey;
     use revm_primitives::Address;
 
     use super::*;

crates/edr_eth/src/utils.rs

@@ -10,10 +10,11 @@
 // - https://github.com/gakonst/ethers-rs/blob/cba6f071aedafb766e82e4c2f469ed5e4638337d/LICENSE-MIT
 // For the original context see: https://github.com/gakonst/ethers-rs/blob/cba6f071aedafb766e82e4c2f469ed5e4638337d/ethers-core/src/utils/hash.rs
 
-use crate::B256;
 use revm_primitives::keccak256;
 use rlp::Encodable;
 
+use crate::B256;
+
 /// RLP-encodes the provided value, prepends it with the provided ID, and
 /// appends it to the provided [`rlp::RlpStream`].
 pub fn enveloped<T: Encodable>(id: u8, v: &T, s: &mut rlp::RlpStream) {

crates/edr_evm/benches/state/database_commit.rs

@@ -1,16 +1,14 @@
 use criterion::{criterion_group, criterion_main, Criterion};
+use edr_eth::{Address, Bytes, U256};
 use edr_evm::{AccountStatus, HashMap};
 use revm::primitives::Bytecode;
 
-use edr_eth::{Address, Bytes, U256};
-
 mod util;
 use util::{bench_sync_state_method, state_prep_no_op};
 
 fn bench_database_commit(c: &mut Criterion) {
-    use revm::primitives::KECCAK_EMPTY;
-
     use edr_evm::{Account, AccountInfo, StorageSlot};
+    use revm::primitives::KECCAK_EMPTY;
 
     #[derive(Debug, serde::Deserialize)]
     #[serde(rename_all = "camelCase")]

crates/edr_evm/benches/state/state_debug.rs

@@ -1,12 +1,11 @@
 use criterion::{criterion_group, criterion_main, Criterion};
+use edr_eth::{Address, Bytes, U256};
+use edr_evm::state::AccountModifierFn;
 use revm::{
     db::StateRef,
     primitives::{AccountInfo, Bytecode},
 };
 
-use edr_eth::{Address, Bytes, U256};
-use edr_evm::state::AccountModifierFn;
-
 mod util;
 use util::{account_has_code, bench_sync_state_method, permutations, state_prep_no_op};