Skip to content

Commit

Permalink
chore: reordered imports
Browse files Browse the repository at this point in the history
  • Loading branch information
frolvanya committed Aug 21, 2024
1 parent 281ac1f commit 5ad0ca1
Show file tree
Hide file tree
Showing 11 changed files with 24 additions and 24 deletions.
9 changes: 4 additions & 5 deletions rpc-server/src/modules/blocks/methods.rs
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
use actix_web::web::Data;
use near_primitives::trie_key::TrieKey;
use near_primitives::views::StateChangeValueView;

use crate::config::ServerContext;
use crate::errors::RPCError;
use crate::modules::blocks::utils::{
fetch_block_from_cache_or_get, fetch_chunk_from_s3, is_matching_change,
};

use near_primitives::trie_key::TrieKey;
use near_primitives::views::StateChangeValueView;

use actix_web::web::Data;

/// `block` rpc method implementation
/// calls proxy_rpc_call to get `block` from near-rpc if request parameters not supported by read-rpc
/// as example: block_id by Finality::None is not supported by read-rpc
Expand Down
3 changes: 2 additions & 1 deletion rpc-server/src/modules/blocks/utils.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
use near_primitives::views::{StateChangeValueView, StateChangesRequestView};

use crate::config::ServerContext;
use crate::modules::blocks::methods::fetch_block;
use crate::modules::blocks::CacheBlock;
use near_primitives::views::{StateChangeValueView, StateChangesRequestView};

#[cfg_attr(
feature = "tracing-instrumentation",
Expand Down
4 changes: 2 additions & 2 deletions rpc-server/src/modules/clients/methods.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use actix_web::web::Data;

use crate::config::ServerContext;
use crate::errors::RPCError;

use actix_web::web::Data;

pub async fn light_client_proof(
data: Data<ServerContext>,
request_data: near_jsonrpc::primitives::types::light_client::RpcLightClientExecutionProofRequest,
Expand Down
4 changes: 2 additions & 2 deletions rpc-server/src/modules/gas/methods.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
use actix_web::web::Data;

use crate::config::ServerContext;
use crate::errors::RPCError;
use crate::modules::blocks::utils::fetch_block_from_cache_or_get;
use crate::modules::blocks::CacheBlock;

use actix_web::web::Data;

#[allow(unused_mut)]
#[cfg_attr(feature = "tracing-instrumentation", tracing::instrument(skip(data)))]
pub async fn gas_price(
Expand Down
7 changes: 3 additions & 4 deletions rpc-server/src/modules/network/methods.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
use actix_web::web::Data;
use near_primitives::epoch_manager::{AllEpochConfig, EpochConfig};

use crate::config::ServerContext;
use crate::errors::RPCError;
use crate::modules::blocks::utils::fetch_block_from_cache_or_get;

use near_primitives::epoch_manager::{AllEpochConfig, EpochConfig};

use actix_web::web::Data;

pub async fn client_config(_data: Data<ServerContext>) -> Result<(), RPCError> {
Err(RPCError::unimplemented_error("client_config"))
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
use std::collections::HashMap;

use futures::executor::block_on;

use crate::modules::queries::utils;
use crate::modules::queries::utils::get_state_key_value_from_db;
use database::ReaderDbManager;
use futures::executor::block_on;

pub type Result<T> = ::std::result::Result<T, near_vm_runner::logic::VMLogicError>;

Expand Down
1 change: 0 additions & 1 deletion rpc-server/src/modules/queries/contract_runner/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ use near_vm_runner::ContractRuntimeCache;

use crate::errors::FunctionCallError;
use crate::modules::blocks::BlocksInfoByFinality;

use code_storage::CodeStorage;

mod code_storage;
Expand Down
4 changes: 2 additions & 2 deletions rpc-server/src/modules/queries/methods.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
use actix_web::web::Data;

use crate::config::ServerContext;
use crate::errors::RPCError;
use crate::modules::blocks::utils::fetch_block_from_cache_or_get;
Expand All @@ -6,8 +8,6 @@ use crate::modules::blocks::CacheBlock;
use super::contract_runner;
use super::utils::get_state_from_db;

use actix_web::web::Data;

/// `query` rpc method implementation
/// calls proxy_rpc_call to get `query` from near-rpc if request parameters not supported by read-rpc
/// as example: BlockReference for Finality::None is not supported by read-rpc when near_state_indexer is not running
Expand Down
4 changes: 2 additions & 2 deletions rpc-server/src/modules/state/methods.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
use actix_web::web::Data;

use crate::config::ServerContext;
use crate::errors::RPCError;
use crate::modules::blocks::utils::fetch_block_from_cache_or_get;
use crate::modules::state::utils::get_state_from_db_paginated;

use actix_web::web::Data;

#[cfg_attr(feature = "tracing-instrumentation", tracing::instrument(skip(data)))]
pub async fn view_state_paginated(
data: Data<ServerContext>,
Expand Down
6 changes: 3 additions & 3 deletions rpc-server/src/modules/transactions/methods.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
use crate::config::ServerContext;
use crate::errors::RPCError;

use actix_web::web::Data;
use near_primitives::views::FinalExecutionOutcomeViewEnum::{
FinalExecutionOutcome, FinalExecutionOutcomeWithReceipt,
};

use crate::config::ServerContext;
use crate::errors::RPCError;

pub async fn send_tx(
data: Data<ServerContext>,
request_data: near_jsonrpc::primitives::types::transactions::RpcSendTransactionRequest,
Expand Down
3 changes: 2 additions & 1 deletion rpc-server/src/modules/transactions/mod.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use crate::config::ServerContext;
use actix_web::web::Data;

use crate::config::ServerContext;

pub mod methods;

pub(crate) async fn try_get_transaction_details_by_hash(
Expand Down

0 comments on commit 5ad0ca1

Please sign in to comment.