@@ -20,11 +20,11 @@ use {
20
20
accounts:: AccountAddressFilter ,
21
21
accounts_index:: { AccountIndex , AccountSecondaryIndexes , IndexKey , ScanConfig } ,
22
22
} ,
23
- solana_client:: connection_cache:: { ConnectionCache , Protocol } ,
23
+ solana_client:: connection_cache:: Protocol ,
24
24
solana_entry:: entry:: Entry ,
25
25
solana_faucet:: faucet:: request_airdrop_transaction,
26
26
solana_feature_set as feature_set,
27
- solana_gossip:: { cluster_info:: ClusterInfo , contact_info :: ContactInfo } ,
27
+ solana_gossip:: cluster_info:: ClusterInfo ,
28
28
solana_inline_spl:: {
29
29
token:: { SPL_TOKEN_ACCOUNT_MINT_OFFSET , SPL_TOKEN_ACCOUNT_OWNER_OFFSET } ,
30
30
token_2022:: { self , ACCOUNTTYPE_ACCOUNT } ,
33
33
blockstore:: { Blockstore , SignatureInfosForAddress } ,
34
34
blockstore_db:: BlockstoreError ,
35
35
blockstore_meta:: { PerfSample , PerfSampleV1 , PerfSampleV2 } ,
36
- get_tmp_ledger_path,
37
36
leader_schedule_cache:: LeaderScheduleCache ,
38
37
} ,
39
38
solana_metrics:: inc_new_counter_info,
54
53
solana_runtime:: {
55
54
bank:: { Bank , TransactionSimulationResult } ,
56
55
bank_forks:: BankForks ,
57
- commitment:: { BlockCommitmentArray , BlockCommitmentCache , CommitmentSlots } ,
56
+ commitment:: { BlockCommitmentArray , BlockCommitmentCache } ,
58
57
installed_scheduler_pool:: BankWithScheduler ,
59
58
non_circulating_supply:: calculate_non_circulating_supply,
60
59
prioritization_fee_cache:: PrioritizationFeeCache ,
80
79
VersionedTransaction , MAX_TX_ACCOUNT_LOCKS ,
81
80
} ,
82
81
} ,
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 ,
87
83
solana_stake_program,
88
84
solana_storage_bigtable:: Error as StorageError ,
89
- solana_streamer:: socket:: SocketAddrSpace ,
90
85
solana_transaction_status:: {
91
86
map_inner_instructions, BlockEncodingOptions , ConfirmedBlock ,
92
87
ConfirmedTransactionStatusWithSignature , ConfirmedTransactionWithStatusMeta ,
@@ -117,6 +112,17 @@ use {
117
112
time:: Duration ,
118
113
} ,
119
114
} ;
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
+ } ;
120
126
121
127
pub mod account_resolver;
122
128
@@ -348,7 +354,7 @@ impl JsonRpcRequestProcessor {
348
354
)
349
355
}
350
356
351
- // Useful for unit testing
357
+ # [ cfg ( test ) ]
352
358
pub fn new_from_bank (
353
359
bank : Bank ,
354
360
socket_addr_space : SocketAddrSpace ,
@@ -4332,11 +4338,12 @@ pub mod tests {
4332
4338
serde:: de:: DeserializeOwned ,
4333
4339
solana_accounts_db:: accounts_db:: { AccountsDbConfig , ACCOUNTS_DB_CONFIG_FOR_TESTING } ,
4334
4340
solana_entry:: entry:: next_versioned_entry,
4335
- solana_gossip:: socketaddr,
4341
+ solana_gossip:: { contact_info :: ContactInfo , socketaddr} ,
4336
4342
solana_ledger:: {
4337
4343
blockstore_meta:: PerfSampleV2 ,
4338
4344
blockstore_processor:: fill_blockstore_slot_with_ticks,
4339
4345
genesis_utils:: { create_genesis_config, GenesisConfigInfo } ,
4346
+ get_tmp_ledger_path,
4340
4347
} ,
4341
4348
solana_rpc_client_api:: {
4342
4349
custom_error:: {
@@ -4347,8 +4354,10 @@ pub mod tests {
4347
4354
filter:: MemcmpEncodedBytes ,
4348
4355
} ,
4349
4356
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,
4352
4361
} ,
4353
4362
solana_sdk:: {
4354
4363
account:: { Account , WritableAccount } ,
@@ -4376,6 +4385,7 @@ pub mod tests {
4376
4385
} ,
4377
4386
vote:: state:: VoteState ,
4378
4387
} ,
4388
+ solana_send_transaction_service:: tpu_info:: NullTpuInfo ,
4379
4389
solana_transaction_status:: {
4380
4390
EncodedConfirmedBlock , EncodedTransaction , EncodedTransactionWithStatusMeta ,
4381
4391
TransactionDetails ,
0 commit comments