Move CacheBlockMetaService from solana-core to solana-rpc (#4031)

The service is only created when a node is running with RPC flags
anza-xyz · Dec 11, 2024 · 8c3a6bb · 8c3a6bb
1 parent 9da143a
commit 8c3a6bb
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 5 deletions.
diff --git a/core/src/lib.rs b/core/src/lib.rs
@@ -13,7 +13,6 @@ pub mod admin_rpc_post_init;
 pub mod banking_simulation;
 pub mod banking_stage;
 pub mod banking_trace;
-pub mod cache_block_meta_service;
 pub mod cluster_info_vote_listener;
 pub mod cluster_slots_service;
 pub mod commitment_service;

diff --git a/core/src/replay_stage.rs b/core/src/replay_stage.rs
@@ -3,7 +3,6 @@
 use {
     crate::{
         banking_trace::BankingTracer,
-        cache_block_meta_service::CacheBlockMetaSender,
         cluster_info_vote_listener::{
             DuplicateConfirmedSlotsReceiver, GossipVerifiedVoteHashReceiver, VoteTracker,
         },
@@ -51,6 +50,7 @@ use {
     solana_measure::measure::Measure,
     solana_poh::poh_recorder::{PohLeaderStatus, PohRecorder, GRACE_TICKS_FACTOR, MAX_GRACE_SLOTS},
     solana_rpc::{
+        cache_block_meta_service::CacheBlockMetaSender,
         optimistically_confirmed_bank_tracker::{BankNotification, BankNotificationSenderConfig},
         rpc_subscriptions::RpcSubscriptions,
         slot_status_notifier::SlotStatusNotifier,

diff --git a/core/src/tvu.rs b/core/src/tvu.rs
@@ -4,7 +4,6 @@
 use {
     crate::{
         banking_trace::BankingTracer,
-        cache_block_meta_service::CacheBlockMetaSender,
         cluster_info_vote_listener::{
             DuplicateConfirmedSlotsReceiver, GossipVerifiedVoteHashReceiver, VerifiedVoteReceiver,
             VoteTracker,
@@ -38,7 +37,8 @@ use {
     },
     solana_poh::poh_recorder::PohRecorder,
     solana_rpc::{
-        max_slots::MaxSlots, optimistically_confirmed_bank_tracker::BankNotificationSenderConfig,
+        cache_block_meta_service::CacheBlockMetaSender, max_slots::MaxSlots,
+        optimistically_confirmed_bank_tracker::BankNotificationSenderConfig,
         rpc_subscriptions::RpcSubscriptions, slot_status_notifier::SlotStatusNotifier,
     },
     solana_runtime::{

diff --git a/core/src/validator.rs b/core/src/validator.rs
@@ -6,7 +6,6 @@ use {
         accounts_hash_verifier::AccountsHashVerifier,
         admin_rpc_post_init::AdminRpcRequestMetadataPostInit,
         banking_trace::{self, BankingTracer, TraceError},
-        cache_block_meta_service::{CacheBlockMetaSender, CacheBlockMetaService},
         cluster_info_vote_listener::VoteTracker,
         completed_data_sets_service::CompletedDataSetsService,
         consensus::{
@@ -82,6 +81,7 @@ use {
     },
     solana_rayon_threadlimit::{get_max_thread_count, get_thread_count},
     solana_rpc::{
+        cache_block_meta_service::{CacheBlockMetaSender, CacheBlockMetaService},
         max_slots::MaxSlots,
         optimistically_confirmed_bank_tracker::{
             BankNotificationSenderConfig, OptimisticallyConfirmedBank,

diff --git a/core/src/cache_block_meta_service.rs → rpc/src/cache_block_meta_service.rs b/core/src/cache_block_meta_service.rs → rpc/src/cache_block_meta_service.rs
diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs
@@ -1,4 +1,5 @@
 #![allow(clippy::arithmetic_side_effects)]
+pub mod cache_block_meta_service;
 mod cluster_tpu_info;
 pub mod filter;
 pub mod max_slots;