remove solana-sdk from wen-restart (anza-xyz#4346)

fkouteib · Jan 9, 2025 · fdacd1f · fdacd1f
1 parent 051c4a8
commit fdacd1f
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
diff --git a/svm/examples/Cargo.lock b/svm/examples/Cargo.lock
diff --git a/wen-restart/Cargo.toml b/wen-restart/Cargo.toml
@@ -16,12 +16,16 @@ log = { workspace = true }
 prost = { workspace = true }
 prost-types = { workspace = true }
 rayon = { workspace = true }
+solana-clock = { workspace = true }
 solana-entry = { workspace = true }
 solana-gossip = { workspace = true }
+solana-hash = { workspace = true }
 solana-ledger = { workspace = true }
 solana-program = { workspace = true }
+solana-pubkey = { workspace = true }
 solana-runtime = { workspace = true }
-solana-sdk = { workspace = true }
+solana-shred-version = { workspace = true }
+solana-time-utils = { workspace = true }
 solana-timings = { workspace = true }
 solana-vote-program = { workspace = true }
 
@@ -31,8 +35,10 @@ rand = { workspace = true }
 serial_test = { workspace = true }
 solana-accounts-db = { workspace = true }
 solana-entry = { workspace = true }
+solana-keypair = { workspace = true }
 solana-logger = { workspace = true }
 solana-runtime = { workspace = true, features = ["dev-context-only-utils"] }
+solana-signer = { workspace = true }
 solana-streamer = { workspace = true }
 solana-vote = { workspace = true }
 tempfile = { workspace = true }

diff --git a/wen-restart/src/heaviest_fork_aggregate.rs b/wen-restart/src/heaviest_fork_aggregate.rs
@@ -2,9 +2,11 @@ use {
     crate::solana::wen_restart_proto::HeaviestForkRecord,
     anyhow::Result,
     log::*,
+    solana_clock::Slot,
     solana_gossip::restart_crds_values::RestartHeaviestFork,
+    solana_hash::Hash,
+    solana_pubkey::Pubkey,
     solana_runtime::epoch_stakes::EpochStakes,
-    solana_sdk::{clock::Slot, hash::Hash, pubkey::Pubkey},
     std::{
         collections::{HashMap, HashSet},
         str::FromStr,
@@ -183,14 +185,16 @@ mod tests {
             solana::wen_restart_proto::HeaviestForkRecord,
         },
         solana_gossip::restart_crds_values::RestartHeaviestFork,
+        solana_hash::Hash,
         solana_program::{clock::Slot, pubkey::Pubkey},
         solana_runtime::{
             bank::Bank,
             genesis_utils::{
                 create_genesis_config_with_vote_accounts, GenesisConfigInfo, ValidatorVoteKeypairs,
             },
         },
-        solana_sdk::{hash::Hash, signature::Signer, timing::timestamp},
+        solana_signer::Signer,
+        solana_time_utils::timestamp,
     };
 
     const TOTAL_VALIDATOR_COUNT: u16 = 20;

diff --git a/wen-restart/src/last_voted_fork_slots_aggregate.rs b/wen-restart/src/last_voted_fork_slots_aggregate.rs
@@ -2,13 +2,11 @@ use {
     crate::solana::wen_restart_proto::LastVotedForkSlotsRecord,
     anyhow::Result,
     log::*,
+    solana_clock::{Epoch, Slot},
     solana_gossip::restart_crds_values::RestartLastVotedForkSlots,
+    solana_hash::Hash,
+    solana_pubkey::Pubkey,
     solana_runtime::bank::Bank,
-    solana_sdk::{
-        clock::{Epoch, Slot},
-        hash::Hash,
-        pubkey::Pubkey,
-    },
     std::{
         collections::{BTreeSet, HashMap},
         str::FromStr,
@@ -247,6 +245,7 @@ mod tests {
             last_voted_fork_slots_aggregate::*, solana::wen_restart_proto::LastVotedForkSlotsRecord,
         },
         solana_gossip::restart_crds_values::RestartLastVotedForkSlots,
+        solana_hash::Hash,
         solana_program::clock::Slot,
         solana_runtime::{
             accounts_background_service::AbsRequestSender,
@@ -256,7 +255,8 @@ mod tests {
                 create_genesis_config_with_vote_accounts, GenesisConfigInfo, ValidatorVoteKeypairs,
             },
         },
-        solana_sdk::{hash::Hash, signature::Signer, timing::timestamp},
+        solana_signer::Signer,
+        solana_time_utils::timestamp,
         solana_vote::vote_account::VoteAccount,
         solana_vote_program::vote_state::create_account_with_authorized,
     };

diff --git a/wen-restart/src/wen_restart.rs b/wen-restart/src/wen_restart.rs
@@ -32,6 +32,7 @@ use {
         clock::{Epoch, Slot},
         hash::Hash,
     },
+    solana_pubkey::Pubkey,
     solana_runtime::{
         accounts_background_service::AbsRequestSender,
         bank::Bank,
@@ -46,7 +47,8 @@ use {
             purge_all_bank_snapshots,
         },
     },
-    solana_sdk::{pubkey::Pubkey, shred_version::compute_shred_version, timing::timestamp},
+    solana_shred_version::compute_shred_version,
+    solana_time_utils::timestamp,
     solana_timings::ExecuteTimings,
     solana_vote_program::vote_state::VoteTransaction,
     std::{
@@ -1428,6 +1430,7 @@ mod tests {
             crds_value::CrdsValue,
             restart_crds_values::{RestartHeaviestFork, RestartLastVotedForkSlots},
         },
+        solana_keypair::Keypair,
         solana_ledger::{
             blockstore::{create_new_ledger, entries_to_test_shreds, Blockstore},
             blockstore_options::LedgerColumnOptions,
@@ -1438,6 +1441,7 @@ mod tests {
             hash::Hash,
             vote::state::{TowerSync, Vote},
         },
+        solana_pubkey::Pubkey,
         solana_runtime::{
             epoch_stakes::EpochStakes,
             genesis_utils::{
@@ -1448,12 +1452,9 @@ mod tests {
             snapshot_hash::SnapshotHash,
             snapshot_utils::build_incremental_snapshot_archive_path,
         },
-        solana_sdk::{
-            pubkey::Pubkey,
-            signature::{Keypair, Signer},
-            timing::timestamp,
-        },
+        solana_signer::Signer,
         solana_streamer::socket::SocketAddrSpace,
+        solana_time_utils::timestamp,
         solana_vote::vote_account::VoteAccount,
         solana_vote_program::vote_state::create_account_with_authorized,
         std::{fs::remove_file, sync::Arc, thread::Builder},