Skip to content

Commit 9d99617

Browse files
authored
remove solana-sdk from rpc-client (anza-xyz#3833)
* remove solana-sdk from rpc-client * remove solana-program * no default features in solana-program dev-dep * remove solana-sdk from direct dev deps * sort deps * fmt * activate features that were previously implicitly activated
1 parent b3c2274 commit 9d99617

File tree

8 files changed

+423
-472
lines changed

8 files changed

+423
-472
lines changed

Cargo.lock

+18-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

programs/sbf/Cargo.lock

+13-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rpc-client-nonce-utils/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ edition = { workspace = true }
1111

1212
[dependencies]
1313
clap = { version = "2.33.0", optional = true }
14-
solana-account = { workspace = true }
14+
solana-account = { workspace = true, features = ["bincode"] }
1515
solana-clap-utils = { workspace = true, optional = true }
1616
solana-commitment-config = { workspace = true }
1717
solana-hash = { workspace = true }
1818
solana-message = { workspace = true }
19-
solana-nonce = { workspace = true }
19+
solana-nonce = { workspace = true, features = ["serde"] }
2020
solana-pubkey = { workspace = true }
2121
solana-rpc-client = { workspace = true }
2222
solana-sdk-ids = { workspace = true }

rpc-client/Cargo.toml

+18-1
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,21 @@ semver = { workspace = true }
2222
serde = { workspace = true }
2323
serde_derive = { workspace = true }
2424
serde_json = { workspace = true }
25+
solana-account = { workspace = true }
2526
solana-account-decoder-client-types = { workspace = true, features = ["zstd"] }
27+
solana-clock = { workspace = true }
28+
solana-commitment-config = { workspace = true }
29+
solana-epoch-info = { workspace = true, features = ["serde"] }
30+
solana-epoch-schedule = { workspace = true, features = ["serde"] }
31+
solana-feature-gate-interface = { workspace = true, features = ["serde"] }
32+
solana-hash = { workspace = true }
33+
solana-instruction = { workspace = true }
34+
solana-message = { workspace = true }
35+
solana-pubkey = { workspace = true }
2636
solana-rpc-client-api = { workspace = true }
27-
solana-sdk = { workspace = true }
37+
solana-signature = { workspace = true }
38+
solana-transaction = { workspace = true, features = ["bincode"] }
39+
solana-transaction-error = { workspace = true }
2840
solana-transaction-status-client-types = { workspace = true }
2941
solana-version = { workspace = true }
3042
tokio = { workspace = true, features = ["full"] }
@@ -36,6 +48,11 @@ futures = { workspace = true }
3648
jsonrpc-core = { workspace = true }
3749
jsonrpc-http-server = { workspace = true }
3850
solana-account-decoder = { workspace = true }
51+
solana-keypair = { workspace = true }
52+
solana-program = { workspace = true, default-features = false }
53+
solana-signer = { workspace = true }
54+
solana-system-transaction = { workspace = true }
55+
static_assertions = { workspace = true }
3956

4057
[features]
4158
default = ["spinner"]

rpc-client/src/mock_sender.rs

+11-12
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ use {
66
base64::{prelude::BASE64_STANDARD, Engine},
77
serde_json::{json, Number, Value},
88
solana_account_decoder_client_types::{UiAccount, UiAccountData, UiAccountEncoding},
9+
solana_clock::{Slot, UnixTimestamp},
10+
solana_epoch_info::EpochInfo,
11+
solana_epoch_schedule::EpochSchedule,
12+
solana_instruction::error::InstructionError,
13+
solana_message::MessageHeader,
14+
solana_pubkey::Pubkey,
915
solana_rpc_client_api::{
1016
client_error::Result,
1117
config::RpcBlockProductionConfig,
@@ -19,16 +25,9 @@ use {
1925
RpcVoteAccountStatus,
2026
},
2127
},
22-
solana_sdk::{
23-
clock::{Slot, UnixTimestamp},
24-
epoch_info::EpochInfo,
25-
instruction::InstructionError,
26-
message::MessageHeader,
27-
pubkey::Pubkey,
28-
signature::Signature,
29-
sysvar::epoch_schedule::EpochSchedule,
30-
transaction::{self, Transaction, TransactionError, TransactionVersion},
31-
},
28+
solana_signature::Signature,
29+
solana_transaction::{versioned::TransactionVersion, Transaction},
30+
solana_transaction_error::{TransactionError, TransactionResult},
3231
solana_transaction_status_client_types::{
3332
option_serializer::OptionSerializer, EncodedConfirmedBlock,
3433
EncodedConfirmedTransactionWithStatusMeta, EncodedTransaction,
@@ -124,7 +123,7 @@ impl RpcSender for MockSender {
124123
transaction_count: Some(123),
125124
})?,
126125
"getSignatureStatuses" => {
127-
let status: transaction::Result<()> = if self.url == "account_in_use" {
126+
let status: TransactionResult<()> = if self.url == "account_in_use" {
128127
Err(TransactionError::AccountInUse)
129128
} else if self.url == "instruction_error" {
130129
Err(TransactionError::InstructionError(
@@ -455,7 +454,7 @@ pub(crate) fn mock_encoded_account(pubkey: &Pubkey) -> UiAccount {
455454

456455
#[cfg(test)]
457456
mod tests {
458-
use {super::*, solana_account_decoder::encode_ui_account, solana_sdk::account::Account};
457+
use {super::*, solana_account::Account, solana_account_decoder::encode_ui_account};
459458

460459
#[test]
461460
fn test_mock_encoded_account() {

0 commit comments

Comments
 (0)