remove solana-sdk from unified-scheduler-logic (#4345)

* remove solana-sdk from unified-scheduler-logic * remove solana-sdk in tests too
anza-xyz · Jan 9, 2025 · 051c4a8 · 051c4a8
1 parent 9f74def
commit 051c4a8
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 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/unified-scheduler-logic/Cargo.toml b/unified-scheduler-logic/Cargo.toml
@@ -11,11 +11,14 @@ edition = { workspace = true }
 
 [dependencies]
 assert_matches = { workspace = true }
+solana-pubkey = { workspace = true }
 solana-runtime-transaction = { workspace = true }
-solana-sdk = { workspace = true }
+solana-transaction = { workspace = true }
 static_assertions = { workspace = true }
 
 [dev-dependencies]
+solana-instruction = { workspace = true }
+solana-message = { workspace = true }
 solana-runtime-transaction = { workspace = true, features = [
     "dev-context-only-utils",
 ] }
diff --git a/unified-scheduler-logic/src/lib.rs b/unified-scheduler-logic/src/lib.rs
@@ -98,8 +98,9 @@
 use {
     crate::utils::{ShortCounter, Token, TokenCell},
     assert_matches::assert_matches,
+    solana_pubkey::Pubkey,
     solana_runtime_transaction::runtime_transaction::RuntimeTransaction,
-    solana_sdk::{pubkey::Pubkey, transaction::SanitizedTransaction},
+    solana_transaction::sanitized::SanitizedTransaction,
     static_assertions::const_assert_eq,
     std::{collections::VecDeque, mem, sync::Arc},
 };
@@ -884,12 +885,10 @@ impl SchedulingStateMachine {
 mod tests {
     use {
         super::*,
-        solana_sdk::{
-            instruction::{AccountMeta, Instruction},
-            message::Message,
-            pubkey::Pubkey,
-            transaction::{SanitizedTransaction, Transaction},
-        },
+        solana_instruction::{AccountMeta, Instruction},
+        solana_message::Message,
+        solana_pubkey::Pubkey,
+        solana_transaction::{sanitized::SanitizedTransaction, Transaction},
         std::{cell::RefCell, collections::HashMap, rc::Rc},
     };