v2.0: chore: add dcou to apply_votes_to_tower (backport of #1831) (#1843

) chore: add dcou to apply_votes_to_tower (#1831) * add dcou to apply_votes_to_tower * cargo sort * fix fmt (cherry picked from commit 66bdefd) Co-authored-by: Yihau Chen <[email protected]>
anza-xyz · Jun 24, 2024 · edca605 · edca605
1 parent 9d7f0c1
commit edca605
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/local-cluster/Cargo.toml b/local-cluster/Cargo.toml
@@ -48,6 +48,7 @@ serial_test = { workspace = true }
 solana-core = { workspace = true, features = ["dev-context-only-utils"] }
 solana-download-utils = { workspace = true }
 solana-ledger = { workspace = true, features = ["dev-context-only-utils"] }
+solana-local-cluster = { path = ".", features = ["dev-context-only-utils"] }
 solana-runtime = { workspace = true, features = ["dev-context-only-utils"] }
 
 [package.metadata.docs.rs]

diff --git a/local-cluster/src/cluster_tests.rs b/local-cluster/src/cluster_tests.rs
@@ -8,10 +8,7 @@ use {
     rand::{thread_rng, Rng},
     rayon::{prelude::*, ThreadPool},
     solana_client::connection_cache::{ConnectionCache, Protocol},
-    solana_core::consensus::{
-        tower_storage::{FileTowerStorage, SavedTower, SavedTowerVersions, TowerStorage},
-        VOTE_THRESHOLD_DEPTH,
-    },
+    solana_core::consensus::VOTE_THRESHOLD_DEPTH,
     solana_entry::entry::{self, Entry, EntrySlice},
     solana_gossip::{
         cluster_info::{self, ClusterInfo},
@@ -44,7 +41,7 @@ use {
     std::{
         collections::{HashMap, HashSet, VecDeque},
         net::{IpAddr, Ipv4Addr, SocketAddr, TcpListener},
-        path::{Path, PathBuf},
+        path::Path,
         sync::{
             atomic::{AtomicBool, Ordering},
             Arc, RwLock,
@@ -53,6 +50,13 @@ use {
         time::{Duration, Instant},
     },
 };
+#[cfg(feature = "dev-context-only-utils")]
+use {
+    solana_core::consensus::tower_storage::{
+        FileTowerStorage, SavedTower, SavedTowerVersions, TowerStorage,
+    },
+    std::path::PathBuf,
+};
 
 pub fn get_client_facing_addr(
     protocol: Protocol,
@@ -348,6 +352,7 @@ pub fn kill_entry_and_spend_and_verify_rest(
     }
 }
 
+#[cfg(feature = "dev-context-only-utils")]
 pub fn apply_votes_to_tower(node_keypair: &Keypair, votes: Vec<(Slot, Hash)>, tower_path: PathBuf) {
     let tower_storage = FileTowerStorage::new(tower_path);
     let mut tower = tower_storage.load(&node_keypair.pubkey()).unwrap();