hide private types

block_priofees/src/block_priofees.rs

@@ -1,4 +1,4 @@
-use crate::rpc_data::PrioFeesStats;
+use crate::rpc_data::{PrioFeesStats, PrioFeesUpdateMessage};
 use dashmap::DashMap;
 use log::{error, info, trace, warn};
 use solana_lite_rpc_core::types::BlockStream;
@@ -115,11 +115,6 @@ pub async fn start_block_priofees_task(
     )
 }
 
-#[derive(Clone, Debug)]
-pub struct PrioFeesUpdateMessage {
-    pub slot: Slot,
-    pub priofees_stats: PrioFeesStats,
-}
 
 fn calculate_supp_info(
     // Vec(prioritization_fees, cu_consumed)

block_priofees/src/lib.rs

@@ -1,2 +1,4 @@
-pub mod block_priofees;
+mod block_priofees;
+
 pub mod rpc_data;
+pub use block_priofees::{start_block_priofees_task, PrioFeesService};

block_priofees/src/rpc_data.rs

@@ -1,6 +1,6 @@
 use jsonrpsee::core::Serialize;
+use solana_sdk::clock::Slot;
 
-// used as RPC DTO
 #[derive(Clone, Serialize, Debug)]
 pub struct PrioFeesStats {
     pub p_min: u64,
@@ -9,3 +9,10 @@ pub struct PrioFeesStats {
     pub p_90: u64,
     pub p_max: u64,
 }
+
+
+#[derive(Clone, Debug)]
+pub struct PrioFeesUpdateMessage {
+    pub slot: Slot,
+    pub priofees_stats: PrioFeesStats,
+}

lite-rpc/src/bridge.rs

@@ -42,8 +42,8 @@ use crate::{
     jsonrpsee_subscrption_handler_sink::JsonRpseeSubscriptionHandlerSink,
     rpc::LiteRpcServer,
 };
-use solana_lite_rpc_block_priofees::block_priofees::{PrioFeesService, PrioFeesUpdateMessage};
-use solana_lite_rpc_block_priofees::rpc_data::PrioFeesStats;
+use solana_lite_rpc_block_priofees::PrioFeesService;
+use solana_lite_rpc_block_priofees::rpc_data::{PrioFeesStats, PrioFeesUpdateMessage};
 
 lazy_static::lazy_static! {
     static ref RPC_SEND_TX: IntCounter =

lite-rpc/src/main.rs

@@ -42,8 +42,6 @@ use solana_lite_rpc_services::tpu_utils::tpu_service::{TpuService, TpuServiceCon
 use solana_lite_rpc_services::transaction_replayer::TransactionReplayer;
 use solana_lite_rpc_services::tx_sender::TxSender;
 
-use solana_lite_rpc_block_priofees::block_priofees;
-
 use solana_rpc_client::nonblocking::rpc_client::RpcClient;
 use solana_sdk::commitment_config::CommitmentConfig;
 use solana_sdk::signature::Keypair;
@@ -54,6 +52,7 @@ use std::time::Duration;
 use tokio::sync::mpsc;
 use tokio::sync::RwLock;
 use tokio::time::{timeout, Instant};
+use solana_lite_rpc_block_priofees::start_block_priofees_task;
 
 async fn get_latest_block(
     mut block_stream: BlockStream,
@@ -202,7 +201,7 @@ pub async fn start_lite_rpc(args: Config, rpc_client: Arc<RpcClient>) -> anyhow:
     );
 
     let (block_prio_fees_task, block_prio_fees_service) =
-        block_priofees::start_block_priofees_task(blocks_notifier.resubscribe()).await;
+        start_block_priofees_task(blocks_notifier.resubscribe()).await;
 
     drop(blocks_notifier);