Skip to content

Commit 4e7f7f7

Browse files
authored
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
1 parent 144925e commit 4e7f7f7

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,
@@ -81,13 +80,9 @@ use {
8180
VersionedTransaction, MAX_TX_ACCOUNT_LOCKS,
8281
},
8382
},
84-
solana_send_transaction_service::{
85-
send_transaction_service::{SendTransactionService, TransactionInfo},
86-
tpu_info::NullTpuInfo,
87-
},
83+
solana_send_transaction_service::send_transaction_service::TransactionInfo,
8884
solana_stake_program,
8985
solana_storage_bigtable::Error as StorageError,
90-
solana_streamer::socket::SocketAddrSpace,
9186
solana_transaction_status::{
9287
map_inner_instructions, BlockEncodingOptions, ConfirmedBlock,
9388
ConfirmedTransactionStatusWithSignature, ConfirmedTransactionWithStatusMeta,
@@ -118,6 +113,17 @@ use {
118113
time::Duration,
119114
},
120115
};
116+
#[cfg(test)]
117+
use {
118+
solana_client::connection_cache::ConnectionCache,
119+
solana_gossip::contact_info::ContactInfo,
120+
solana_ledger::get_tmp_ledger_path,
121+
solana_runtime::commitment::CommitmentSlots,
122+
solana_send_transaction_service::{
123+
send_transaction_service::SendTransactionService, tpu_info::NullTpuInfo,
124+
},
125+
solana_streamer::socket::SocketAddrSpace,
126+
};
121127

122128
pub mod account_resolver;
123129

@@ -349,7 +355,7 @@ impl JsonRpcRequestProcessor {
349355
)
350356
}
351357

352-
// Useful for unit testing
358+
#[cfg(test)]
353359
pub fn new_from_bank(
354360
bank: Bank,
355361
socket_addr_space: SocketAddrSpace,
@@ -4333,11 +4339,12 @@ pub mod tests {
43334339
serde::de::DeserializeOwned,
43344340
solana_accounts_db::accounts_db::{AccountsDbConfig, ACCOUNTS_DB_CONFIG_FOR_TESTING},
43354341
solana_entry::entry::next_versioned_entry,
4336-
solana_gossip::socketaddr,
4342+
solana_gossip::{contact_info::ContactInfo, socketaddr},
43374343
solana_ledger::{
43384344
blockstore_meta::PerfSampleV2,
43394345
blockstore_processor::fill_blockstore_slot_with_ticks,
43404346
genesis_utils::{create_genesis_config, GenesisConfigInfo},
4347+
get_tmp_ledger_path,
43414348
},
43424349
solana_rpc_client_api::{
43434350
custom_error::{
@@ -4348,8 +4355,10 @@ pub mod tests {
43484355
filter::MemcmpEncodedBytes,
43494356
},
43504357
solana_runtime::{
4351-
accounts_background_service::AbsRequestSender, bank::BankTestConfig,
4352-
commitment::BlockCommitment, non_circulating_supply::non_circulating_accounts,
4358+
accounts_background_service::AbsRequestSender,
4359+
bank::BankTestConfig,
4360+
commitment::{BlockCommitment, CommitmentSlots},
4361+
non_circulating_supply::non_circulating_accounts,
43534362
},
43544363
solana_sdk::{
43554364
account::{Account, WritableAccount},
@@ -4377,6 +4386,7 @@ pub mod tests {
43774386
},
43784387
vote::state::VoteState,
43794388
},
4389+
solana_send_transaction_service::tpu_info::NullTpuInfo,
43804390
solana_transaction_status::{
43814391
EncodedConfirmedBlock, EncodedTransaction, EncodedTransactionWithStatusMeta,
43824392
TransactionDetails,

0 commit comments

Comments
 (0)