remove solana-sdk from rpc-client

anza-xyz · Dec 5, 2024 · 3f21340 · 3f21340
1 parent e28c4df
commit 3f21340
Show file tree

Hide file tree

Showing 7 changed files with 407 additions and 468 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
diff --git a/rpc-client/Cargo.toml b/rpc-client/Cargo.toml
@@ -22,9 +22,20 @@ semver = { workspace = true }
 serde = { workspace = true }
 serde_derive = { workspace = true }
 serde_json = { workspace = true }
+solana-account = { workspace = true }
 solana-account-decoder-client-types = { workspace = true, features = ["zstd"] }
+solana-clock = { workspace = true }
+solana-commitment-config = { workspace = true }
+solana-epoch-info = { workspace = true }
+solana-epoch-schedule = { workspace = true }
+solana-hash = { workspace = true }
+solana-instruction = { workspace = true }
+solana-program = { workspace = true, default-features = false }
+solana-pubkey = { workspace = true }
 solana-rpc-client-api = { workspace = true }
-solana-sdk = { workspace = true }
+solana-signature = { workspace = true }
+solana-transaction = { workspace = true }
+solana-transaction-error = { workspace = true }
 solana-transaction-status-client-types = { workspace = true }
 solana-version = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
@@ -36,6 +47,9 @@ futures = { workspace = true }
 jsonrpc-core = { workspace = true }
 jsonrpc-http-server = { workspace = true }
 solana-account-decoder = { workspace = true }
+solana-keypair = { workspace = true }
+solana-sdk = { path = "../sdk" }
+solana-signer = { workspace = true }
 
 [features]
 default = ["spinner"]

diff --git a/rpc-client/src/mock_sender.rs b/rpc-client/src/mock_sender.rs
@@ -6,6 +6,12 @@ use {
     base64::{prelude::BASE64_STANDARD, Engine},
     serde_json::{json, Number, Value},
     solana_account_decoder_client_types::{UiAccount, UiAccountData, UiAccountEncoding},
+    solana_clock::{Slot, UnixTimestamp},
+    solana_epoch_info::EpochInfo,
+    solana_epoch_schedule::EpochSchedule,
+    solana_instruction::error::InstructionError,
+    solana_program::message::MessageHeader,
+    solana_pubkey::Pubkey,
     solana_rpc_client_api::{
         client_error::Result,
         config::RpcBlockProductionConfig,
@@ -19,16 +25,9 @@ use {
             RpcVoteAccountStatus,
         },
     },
-    solana_sdk::{
-        clock::{Slot, UnixTimestamp},
-        epoch_info::EpochInfo,
-        instruction::InstructionError,
-        message::MessageHeader,
-        pubkey::Pubkey,
-        signature::Signature,
-        sysvar::epoch_schedule::EpochSchedule,
-        transaction::{self, Transaction, TransactionError, TransactionVersion},
-    },
+    solana_signature::Signature,
+    solana_transaction::{versioned::TransactionVersion, Transaction},
+    solana_transaction_error::{TransactionError, TransactionResult},
     solana_transaction_status_client_types::{
         option_serializer::OptionSerializer, EncodedConfirmedBlock,
         EncodedConfirmedTransactionWithStatusMeta, EncodedTransaction,
@@ -124,7 +123,7 @@ impl RpcSender for MockSender {
                 transaction_count: Some(123),
             })?,
             "getSignatureStatuses" => {
-                let status: transaction::Result<()> = if self.url == "account_in_use" {
+                let status: TransactionResult<()> = if self.url == "account_in_use" {
                     Err(TransactionError::AccountInUse)
                 } else if self.url == "instruction_error" {
                     Err(TransactionError::InstructionError(
@@ -455,7 +454,7 @@ pub(crate) fn mock_encoded_account(pubkey: &Pubkey) -> UiAccount {
 
 #[cfg(test)]
 mod tests {
-    use {super::*, solana_account_decoder::encode_ui_account, solana_sdk::account::Account};
+    use {super::*, solana_account::Account, solana_account_decoder::encode_ui_account};
 
     #[test]
     fn test_mock_encoded_account() {