Move SendTransactionService to solana_runtime (#10972)

This commit is contained in:
Greg Fitzgerald 2020-07-09 12:28:26 -06:00 committed by GitHub
parent 4ef8f893c7
commit 16eeea4f82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 7 deletions

View File

@ -54,7 +54,6 @@ pub mod rpc_pubsub;
pub mod rpc_pubsub_service; pub mod rpc_pubsub_service;
pub mod rpc_service; pub mod rpc_service;
pub mod rpc_subscriptions; pub mod rpc_subscriptions;
pub mod send_transaction_service;
pub mod serve_repair; pub mod serve_repair;
pub mod serve_repair_service; pub mod serve_repair_service;
pub mod sigverify; pub mod sigverify;

View File

@ -3,7 +3,7 @@
use crate::{ use crate::{
cluster_info::ClusterInfo, contact_info::ContactInfo, cluster_info::ClusterInfo, contact_info::ContactInfo,
non_circulating_supply::calculate_non_circulating_supply, rpc_error::RpcCustomError, non_circulating_supply::calculate_non_circulating_supply, rpc_error::RpcCustomError,
rpc_health::*, send_transaction_service::SendTransactionService, validator::ValidatorExit, rpc_health::*, validator::ValidatorExit,
}; };
use bincode::{config::Options, serialize}; use bincode::{config::Options, serialize};
use jsonrpc_core::{Error, Metadata, Result}; use jsonrpc_core::{Error, Metadata, Result};
@ -28,6 +28,7 @@ use solana_runtime::{
bank_forks::BankForks, bank_forks::BankForks,
commitment::{BlockCommitmentArray, BlockCommitmentCache}, commitment::{BlockCommitmentArray, BlockCommitmentCache},
log_collector::LogCollector, log_collector::LogCollector,
send_transaction_service::SendTransactionService,
}; };
use solana_sdk::{ use solana_sdk::{
account_utils::StateMut, account_utils::StateMut,

View File

@ -1,9 +1,6 @@
//! The `rpc_service` module implements the Solana JSON RPC service. //! The `rpc_service` module implements the Solana JSON RPC service.
use crate::{ use crate::{cluster_info::ClusterInfo, rpc::*, rpc_health::*, validator::ValidatorExit};
cluster_info::ClusterInfo, rpc::*, rpc_health::*,
send_transaction_service::SendTransactionService, validator::ValidatorExit,
};
use jsonrpc_core::MetaIoHandler; use jsonrpc_core::MetaIoHandler;
use jsonrpc_http_server::{ use jsonrpc_http_server::{
hyper, AccessControlAllowOrigin, CloseHandle, DomainsValidation, RequestMiddleware, hyper, AccessControlAllowOrigin, CloseHandle, DomainsValidation, RequestMiddleware,
@ -14,6 +11,7 @@ use solana_ledger::blockstore::Blockstore;
use solana_runtime::{ use solana_runtime::{
bank_forks::{BankForks, SnapshotConfig}, bank_forks::{BankForks, SnapshotConfig},
commitment::BlockCommitmentCache, commitment::BlockCommitmentCache,
send_transaction_service::SendTransactionService,
snapshot_utils, snapshot_utils,
}; };
use solana_sdk::{hash::Hash, native_token::lamports_to_sol, pubkey::Pubkey}; use solana_sdk::{hash::Hash, native_token::lamports_to_sol, pubkey::Pubkey};

View File

@ -21,6 +21,7 @@ pub mod message_processor;
mod native_loader; mod native_loader;
pub mod nonce_utils; pub mod nonce_utils;
pub mod rent_collector; pub mod rent_collector;
pub mod send_transaction_service;
pub mod serde_snapshot; pub mod serde_snapshot;
pub mod snapshot_package; pub mod snapshot_package;
pub mod snapshot_utils; pub mod snapshot_utils;

View File

@ -1,5 +1,6 @@
use crate::{bank::Bank, bank_forks::BankForks};
use log::*;
use solana_metrics::{datapoint_warn, inc_new_counter_info}; use solana_metrics::{datapoint_warn, inc_new_counter_info};
use solana_runtime::{bank::Bank, bank_forks::BankForks};
use solana_sdk::{clock::Slot, signature::Signature}; use solana_sdk::{clock::Slot, signature::Signature};
use std::{ use std::{
collections::HashMap, collections::HashMap,