Skip to content

Commit c1bddce

Browse files
v2.1: make new_from_bank to be only for tests (backport of #3455) (#3484)
make new_from_bank to be only for tests (#3455) * make new_from_bank to be only for tests * moved unnecessary use to cfg(test) * remove new line which breaks checks (cherry picked from commit 4e7f7f7) Co-authored-by: kirill lykov <[email protected]>
1 parent 95ee9c1 commit c1bddce

File tree

1 file changed

+23
-13
lines changed

1 file changed

+23
-13
lines changed

rpc/src/rpc.rs

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ use {
2020
accounts::AccountAddressFilter,
2121
accounts_index::{AccountIndex, AccountSecondaryIndexes, IndexKey, ScanConfig},
2222
},
23-
solana_client::connection_cache::{ConnectionCache, Protocol},
23+
solana_client::connection_cache::Protocol,
2424
solana_entry::entry::Entry,
2525
solana_faucet::faucet::request_airdrop_transaction,
2626
solana_feature_set as feature_set,
27-
solana_gossip::{cluster_info::ClusterInfo, contact_info::ContactInfo},
27+
solana_gossip::cluster_info::ClusterInfo,
2828
solana_inline_spl::{
2929
token::{SPL_TOKEN_ACCOUNT_MINT_OFFSET, SPL_TOKEN_ACCOUNT_OWNER_OFFSET},
3030
token_2022::{self, ACCOUNTTYPE_ACCOUNT},
@@ -33,7 +33,6 @@ use {
3333
blockstore::{Blockstore, SignatureInfosForAddress},
3434
blockstore_db::BlockstoreError,
3535
blockstore_meta::{PerfSample, PerfSampleV1, PerfSampleV2},
36-
get_tmp_ledger_path,
3736
leader_schedule_cache::LeaderScheduleCache,
3837
},
3938
solana_metrics::inc_new_counter_info,
@@ -54,7 +53,7 @@ use {
5453
solana_runtime::{
5554
bank::{Bank, TransactionSimulationResult},
5655
bank_forks::BankForks,
57-
commitment::{BlockCommitmentArray, BlockCommitmentCache, CommitmentSlots},
56+
commitment::{BlockCommitmentArray, BlockCommitmentCache},
5857
installed_scheduler_pool::BankWithScheduler,
5958
non_circulating_supply::calculate_non_circulating_supply,
6059
prioritization_fee_cache::PrioritizationFeeCache,
@@ -80,13 +79,9 @@ use {
8079
VersionedTransaction, MAX_TX_ACCOUNT_LOCKS,
8180
},
8281
},
83-
solana_send_transaction_service::{
84-
send_transaction_service::{SendTransactionService, TransactionInfo},
85-
tpu_info::NullTpuInfo,
86-
},
82+
solana_send_transaction_service::send_transaction_service::TransactionInfo,
8783
solana_stake_program,
8884
solana_storage_bigtable::Error as StorageError,
89-
solana_streamer::socket::SocketAddrSpace,
9085
solana_transaction_status::{
9186
map_inner_instructions, BlockEncodingOptions, ConfirmedBlock,
9287
ConfirmedTransactionStatusWithSignature, ConfirmedTransactionWithStatusMeta,
@@ -117,6 +112,17 @@ use {
117112
time::Duration,
118113
},
119114
};
115+
#[cfg(test)]
116+
use {
117+
solana_client::connection_cache::ConnectionCache,
118+
solana_gossip::contact_info::ContactInfo,
119+
solana_ledger::get_tmp_ledger_path,
120+
solana_runtime::commitment::CommitmentSlots,
121+
solana_send_transaction_service::{
122+
send_transaction_service::SendTransactionService, tpu_info::NullTpuInfo,
123+
},
124+
solana_streamer::socket::SocketAddrSpace,
125+
};
120126

121127
pub mod account_resolver;
122128

@@ -348,7 +354,7 @@ impl JsonRpcRequestProcessor {
348354
)
349355
}
350356

351-
// Useful for unit testing
357+
#[cfg(test)]
352358
pub fn new_from_bank(
353359
bank: Bank,
354360
socket_addr_space: SocketAddrSpace,
@@ -4332,11 +4338,12 @@ pub mod tests {
43324338
serde::de::DeserializeOwned,
43334339
solana_accounts_db::accounts_db::{AccountsDbConfig, ACCOUNTS_DB_CONFIG_FOR_TESTING},
43344340
solana_entry::entry::next_versioned_entry,
4335-
solana_gossip::socketaddr,
4341+
solana_gossip::{contact_info::ContactInfo, socketaddr},
43364342
solana_ledger::{
43374343
blockstore_meta::PerfSampleV2,
43384344
blockstore_processor::fill_blockstore_slot_with_ticks,
43394345
genesis_utils::{create_genesis_config, GenesisConfigInfo},
4346+
get_tmp_ledger_path,
43404347
},
43414348
solana_rpc_client_api::{
43424349
custom_error::{
@@ -4347,8 +4354,10 @@ pub mod tests {
43474354
filter::MemcmpEncodedBytes,
43484355
},
43494356
solana_runtime::{
4350-
accounts_background_service::AbsRequestSender, bank::BankTestConfig,
4351-
commitment::BlockCommitment, non_circulating_supply::non_circulating_accounts,
4357+
accounts_background_service::AbsRequestSender,
4358+
bank::BankTestConfig,
4359+
commitment::{BlockCommitment, CommitmentSlots},
4360+
non_circulating_supply::non_circulating_accounts,
43524361
},
43534362
solana_sdk::{
43544363
account::{Account, WritableAccount},
@@ -4376,6 +4385,7 @@ pub mod tests {
43764385
},
43774386
vote::state::VoteState,
43784387
},
4388+
solana_send_transaction_service::tpu_info::NullTpuInfo,
43794389
solana_transaction_status::{
43804390
EncodedConfirmedBlock, EncodedTransaction, EncodedTransactionWithStatusMeta,
43814391
TransactionDetails,

0 commit comments

Comments
 (0)