move keypair_loaded to core

core/src/keypair_loader.rs

@@ -1,5 +1,5 @@
-use std::env;
 use solana_sdk::signature::Keypair;
+use std::env;
 
 // note this is duplicated from lite-rpc module
 pub async fn load_identity_keypair(identity_from_cli: &String) -> Option<Keypair> {

core/src/lib.rs

@@ -1,6 +1,7 @@
 pub mod block_information_store;
 pub mod cluster_info;
 pub mod data_cache;
+pub mod keypair_loader;
 pub mod leaders_fetcher_trait;
 pub mod notifications;
 pub mod proxy_request_format;
@@ -13,6 +14,5 @@ pub mod structures;
 pub mod subscription_handler;
 pub mod subscription_sink;
 pub mod tx_store;
-pub mod keypair_loader;
 
 pub type AnyhowJoinHandle = tokio::task::JoinHandle<anyhow::Result<()>>;

lite-rpc/src/main.rs

@@ -17,6 +17,7 @@ use solana_lite_rpc_cluster_endpoints::json_rpc_subscription::create_json_rpc_po
 use solana_lite_rpc_core::block_information_store::{BlockInformation, BlockInformationStore};
 use solana_lite_rpc_core::cluster_info::ClusterInfo;
 use solana_lite_rpc_core::data_cache::{DataCache, SlotCache};
+use solana_lite_rpc_core::keypair_loader::load_identity_keypair;
 use solana_lite_rpc_core::notifications::NotificationSender;
 use solana_lite_rpc_core::quic_connection_utils::QuicConnectionParameters;
 use solana_lite_rpc_core::streams::BlockStream;
@@ -32,12 +33,11 @@ use solana_lite_rpc_services::transaction_replayer::TransactionReplayer;
 use solana_lite_rpc_services::tx_sender::TxSender;
 use solana_rpc_client::nonblocking::rpc_client::RpcClient;
 use solana_sdk::commitment_config::CommitmentConfig;
+use solana_sdk::signature::Keypair;
 use solana_sdk::signer::Signer;
 use std::env;
 use std::sync::Arc;
-use solana_sdk::signature::Keypair;
 use tokio::sync::mpsc;
-use solana_lite_rpc_core::keypair_loader::load_identity_keypair;
 
 use crate::rpc_tester::RpcTester;
 
@@ -90,8 +90,11 @@ pub async fn start_lite_rpc(args: Args) -> anyhow::Result<()> {
         ..
     } = args;
 
-    let validator_identity = Arc::new(load_identity_keypair(&identity_keypair)
-        .await.unwrap_or_else(|| Keypair::new()));
+    let validator_identity = Arc::new(
+        load_identity_keypair(&identity_keypair)
+            .await
+            .unwrap_or_else(Keypair::new),
+    );
 
     let retry_after = Duration::from_secs(transaction_retry_after_secs);
 

quic-forward-proxy/src/main.rs

@@ -5,8 +5,8 @@ use anyhow::bail;
 use clap::Parser;
 use dotenv::dotenv;
 use log::info;
-use std::sync::Arc;
 use solana_lite_rpc_core::keypair_loader::load_identity_keypair;
+use std::sync::Arc;
 
 use crate::validator_identity::ValidatorIdentity;