chore: sort imports

blockscout · Dec 20, 2023 · 970ba2e · 970ba2e
1 parent 05be7fd
commit 970ba2e
Show file tree

Hide file tree

Showing 16 changed files with 34 additions and 62 deletions.
diff --git a/user-ops-indexer/user-ops-indexer-logic/src/indexer/v06/indexer.rs b/user-ops-indexer/user-ops-indexer-logic/src/indexer/v06/indexer.rs
@@ -1,5 +1,12 @@
-use std::{future, ops::Div, time::Duration};
-
+use crate::{
+    indexer::v06::constants::{
+        matches_entrypoint_event, parse_event, BeforeExecutionFilter, DepositedFilter,
+        HandleAggregatedOpsCall, HandleOpsCall, IEntrypointV06Calls, UserOperation,
+        UserOperationEventFilter, UserOperationRevertReasonFilter, ENTRYPOINT_V06,
+    },
+    repository,
+    types::user_op::{SponsorType, UserOp},
+};
 use anyhow::{anyhow, bail};
 use ethers::prelude::{BigEndianHash, EthEvent, Middleware, Provider, PubsubClient};
 use ethers_core::{
@@ -9,18 +16,9 @@ use ethers_core::{
 use futures::{stream, stream::BoxStream, StreamExt};
 use keccak_hash::H256;
 use sea_orm::DatabaseConnection;
+use std::{future, ops::Div, time::Duration};
 use tokio::time::sleep;
 
-use crate::{
-    indexer::v06::constants::{
-        matches_entrypoint_event, parse_event, BeforeExecutionFilter, DepositedFilter,
-        HandleAggregatedOpsCall, HandleOpsCall, IEntrypointV06Calls, UserOperation,
-        UserOperationEventFilter, UserOperationRevertReasonFilter, ENTRYPOINT_V06,
-    },
-    repository,
-    types::user_op::{SponsorType, UserOp},
-};
-
 pub struct RawUserOperation {
     pub user_op: UserOperation,
 

diff --git a/user-ops-indexer/user-ops-indexer-logic/src/repository/account.rs b/user-ops-indexer/user-ops-indexer-logic/src/repository/account.rs
@@ -1,8 +1,7 @@
+use crate::types::account::Account;
 use ethers::prelude::Address;
 use sea_orm::{prelude::DateTime, ConnectionTrait, DatabaseConnection, FromQueryResult, Statement};
 
-use crate::types::account::Account;
-
 #[derive(FromQueryResult)]
 pub struct AccountDB {
     pub address: Vec<u8>,

diff --git a/user-ops-indexer/user-ops-indexer-logic/src/repository/bundle.rs b/user-ops-indexer/user-ops-indexer-logic/src/repository/bundle.rs
@@ -1,8 +1,7 @@
+use crate::types::bundle::Bundle;
 use ethers::prelude::{Address, H256};
 use sea_orm::{prelude::DateTime, ConnectionTrait, DatabaseConnection, FromQueryResult, Statement};
 
-use crate::types::bundle::Bundle;
-
 #[derive(FromQueryResult)]
 pub struct BundleDB {
     pub transaction_hash: Vec<u8>,

diff --git a/user-ops-indexer/user-ops-indexer-logic/src/repository/bundler.rs b/user-ops-indexer/user-ops-indexer-logic/src/repository/bundler.rs
@@ -1,8 +1,7 @@
+use crate::types::bundler::Bundler;
 use ethers::prelude::Address;
 use sea_orm::{ConnectionTrait, DatabaseConnection, FromQueryResult, Statement};
 
-use crate::types::bundler::Bundler;
-
 #[derive(FromQueryResult, Clone)]
 pub struct BundlerDB {
     pub bundler: Vec<u8>,

diff --git a/user-ops-indexer/user-ops-indexer-logic/src/repository/factory.rs b/user-ops-indexer/user-ops-indexer-logic/src/repository/factory.rs
@@ -1,13 +1,11 @@
+use crate::{repository::user_op::user_ops_blocks_rel, types::factory::Factory};
+use entity::user_operations::{Column, Entity};
 use ethers::prelude::Address;
 use sea_orm::{
     prelude::Expr, sea_query::IntoCondition, ColumnTrait, DatabaseConnection, EntityTrait,
     FromQueryResult, IntoSimpleExpr, JoinType, QueryFilter, QueryOrder, QuerySelect,
 };
 
-use entity::user_operations::{Column, Entity};
-
-use crate::{repository::user_op::user_ops_blocks_rel, types::factory::Factory};
-
 #[derive(FromQueryResult, Clone)]
 pub struct FactoryDB {
     pub factory: Vec<u8>,

diff --git a/user-ops-indexer/user-ops-indexer-logic/src/repository/paymaster.rs b/user-ops-indexer/user-ops-indexer-logic/src/repository/paymaster.rs
@@ -1,13 +1,11 @@
+use crate::{repository::user_op::user_ops_blocks_rel, types::paymaster::Paymaster};
+use entity::user_operations::{Column, Entity};
 use ethers::prelude::Address;
 use sea_orm::{
     prelude::Expr, sea_query::IntoCondition, ColumnTrait, DatabaseConnection, EntityTrait,
     FromQueryResult, IntoSimpleExpr, JoinType, QueryFilter, QueryOrder, QuerySelect,
 };
 
-use entity::user_operations::{Column, Entity};
-
-use crate::{repository::user_op::user_ops_blocks_rel, types::paymaster::Paymaster};
-
 #[derive(FromQueryResult, Clone)]
 pub struct PaymasterDB {
     pub paymaster: Vec<u8>,

diff --git a/user-ops-indexer/user-ops-indexer-logic/src/repository/user_op.rs b/user-ops-indexer/user-ops-indexer-logic/src/repository/user_op.rs
@@ -1,4 +1,6 @@
+use crate::types::user_op::{ListUserOp, UserOp};
 use blockscout_db::entity::blocks;
+use entity::user_operations::{ActiveModel, Column, Entity, Model};
 use ethers::prelude::{Address, H256};
 use sea_orm::{
     prelude::DateTime,
@@ -8,10 +10,6 @@ use sea_orm::{
     QueryTrait, RelationDef, Statement,
 };
 
-use entity::user_operations::{ActiveModel, Column, Entity, Model};
-
-use crate::types::user_op::{ListUserOp, UserOp};
-
 #[derive(FromQueryResult)]
 struct TxHash {
     transaction_hash: Vec<u8>,

diff --git a/user-ops-indexer/user-ops-indexer-logic/src/types/account.rs b/user-ops-indexer/user-ops-indexer-logic/src/types/account.rs
@@ -1,10 +1,8 @@
+use crate::repository::account::AccountDB;
+pub use entity::sea_orm_active_enums::SponsorType;
 use ethers::prelude::{Address, H256};
 use ethers_core::{abi::AbiEncode, utils::to_checksum};
 
-pub use entity::sea_orm_active_enums::SponsorType;
-
-use crate::repository::account::AccountDB;
-
 #[derive(Clone, Debug, PartialEq)]
 pub struct Account {
     pub address: Address,

diff --git a/user-ops-indexer/user-ops-indexer-logic/src/types/bundle.rs b/user-ops-indexer/user-ops-indexer-logic/src/types/bundle.rs
@@ -1,10 +1,8 @@
+use crate::repository::bundle::BundleDB;
+pub use entity::sea_orm_active_enums::SponsorType;
 use ethers::prelude::{Address, H256};
 use ethers_core::{abi::AbiEncode, utils::to_checksum};
 
-pub use entity::sea_orm_active_enums::SponsorType;
-
-use crate::repository::bundle::BundleDB;
-
 #[derive(Clone, Debug, PartialEq)]
 pub struct Bundle {
     pub transaction_hash: H256,

diff --git a/user-ops-indexer/user-ops-indexer-logic/src/types/bundler.rs b/user-ops-indexer/user-ops-indexer-logic/src/types/bundler.rs
@@ -1,10 +1,8 @@
+use crate::repository::bundler::BundlerDB;
+pub use entity::sea_orm_active_enums::SponsorType;
 use ethers::prelude::Address;
 use ethers_core::utils::to_checksum;
 
-pub use entity::sea_orm_active_enums::SponsorType;
-
-use crate::repository::bundler::BundlerDB;
-
 #[derive(Clone, Debug, PartialEq)]
 pub struct Bundler {
     pub bundler: Address,

diff --git a/user-ops-indexer/user-ops-indexer-logic/src/types/factory.rs b/user-ops-indexer/user-ops-indexer-logic/src/types/factory.rs
@@ -1,10 +1,8 @@
+use crate::repository::factory::FactoryDB;
+pub use entity::sea_orm_active_enums::SponsorType;
 use ethers::prelude::Address;
 use ethers_core::utils::to_checksum;
 
-pub use entity::sea_orm_active_enums::SponsorType;
-
-use crate::repository::factory::FactoryDB;
-
 #[derive(Clone, Debug, PartialEq)]
 pub struct Factory {
     pub factory: Address,

diff --git a/user-ops-indexer/user-ops-indexer-logic/src/types/paymaster.rs b/user-ops-indexer/user-ops-indexer-logic/src/types/paymaster.rs
@@ -1,10 +1,8 @@
+use crate::repository::paymaster::PaymasterDB;
+pub use entity::sea_orm_active_enums::SponsorType;
 use ethers::prelude::Address;
 use ethers_core::utils::to_checksum;
 
-pub use entity::sea_orm_active_enums::SponsorType;
-
-use crate::repository::paymaster::PaymasterDB;
-
 #[derive(Clone, Debug, PartialEq)]
 pub struct Paymaster {
     pub paymaster: Address,

diff --git a/user-ops-indexer/user-ops-indexer-logic/src/types/user_op.rs b/user-ops-indexer/user-ops-indexer-logic/src/types/user_op.rs
@@ -1,13 +1,11 @@
+use crate::{repository::user_op::ListUserOpDB, types::common::u256_to_decimal};
+pub use entity::sea_orm_active_enums::SponsorType;
+use entity::user_operations::Model;
 use ethers::prelude::{Address, Bytes, H256, U256};
 use ethers_core::{abi::AbiEncode, utils::to_checksum};
 use num_traits::cast::ToPrimitive;
 use sea_orm::{prelude::BigDecimal, ActiveEnum};
 
-pub use entity::sea_orm_active_enums::SponsorType;
-use entity::user_operations::Model;
-
-use crate::{repository::user_op::ListUserOpDB, types::common::u256_to_decimal};
-
 #[derive(Clone, Debug, PartialEq)]
 pub struct UserOp {
     pub hash: H256,

diff --git a/user-ops-indexer/user-ops-indexer-server/src/indexer.rs b/user-ops-indexer/user-ops-indexer-server/src/indexer.rs
@@ -1,5 +1,4 @@
 use crate::settings::Settings;
-
 use ethers::prelude::{Provider, Ws};
 use sea_orm::DatabaseConnection;
 

diff --git a/user-ops-indexer/user-ops-indexer-server/src/server.rs b/user-ops-indexer/user-ops-indexer-server/src/server.rs
@@ -8,7 +8,6 @@ use crate::{
     settings::Settings,
 };
 use blockscout_service_launcher::{launcher, launcher::LaunchSettings};
-
 use sea_orm::DatabaseConnection;
 use std::sync::Arc;
 

diff --git a/user-ops-indexer/user-ops-indexer-server/src/services/user_ops.rs b/user-ops-indexer/user-ops-indexer-server/src/services/user_ops.rs
@@ -1,13 +1,12 @@
-use std::str::FromStr;
-
+use crate::{proto::user_ops_service_server::UserOpsService as UserOps, settings::ApiSettings};
 use ethers::{
     abi::{AbiEncode, Address},
     prelude::H256,
     utils::to_checksum,
 };
 use sea_orm::DatabaseConnection;
+use std::str::FromStr;
 use tonic::{Request, Response, Status};
-
 use user_ops_indexer_logic::repository;
 use user_ops_indexer_proto::blockscout::user_ops_indexer::v1::{
     Account, Bundler, Factory, GetAccountRequest, GetBundlerRequest, GetFactoryRequest,
@@ -17,8 +16,6 @@ use user_ops_indexer_proto::blockscout::user_ops_indexer::v1::{
     ListUserOpsRequest, ListUserOpsResponse, Paymaster, UserOp,
 };
 
-use crate::{proto::user_ops_service_server::UserOpsService as UserOps, settings::ApiSettings};
-
 const DEFAULT_PAGE_SIZE: u32 = 10;
 
 pub struct UserOpsService {