remove solana-sdk from cargo-registry (#4281)

anza-xyz · Jan 8, 2025 · df5c9ad · df5c9ad
1 parent dd3ad63
commit df5c9ad
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cargo-registry/Cargo.toml b/cargo-registry/Cargo.toml
@@ -23,11 +23,14 @@ solana-clap-utils = { workspace = true }
 solana-cli = { workspace = true }
 solana-cli-config = { workspace = true }
 solana-cli-output = { workspace = true }
+solana-commitment-config = { workspace = true }
+solana-keypair = { workspace = true }
 solana-logger = { workspace = true }
+solana-pubkey = { workspace = true }
 solana-remote-wallet = { workspace = true, features = ["default"] }
 solana-rpc-client = { workspace = true, features = ["default"] }
 solana-rpc-client-api = { workspace = true }
-solana-sdk = { workspace = true }
+solana-signer = { workspace = true }
 solana-version = { workspace = true }
 tar = { workspace = true }
 tempfile = { workspace = true }

diff --git a/cargo-registry/src/client.rs b/cargo-registry/src/client.rs
@@ -7,12 +7,10 @@ use {
     },
     solana_cli::cli::{CliConfig, DEFAULT_CONFIRM_TX_TIMEOUT_SECONDS, DEFAULT_RPC_TIMEOUT_SECONDS},
     solana_cli_config::{Config, ConfigInput},
+    solana_commitment_config::CommitmentConfig,
+    solana_keypair::{read_keypair_file, Keypair},
     solana_rpc_client::rpc_client::RpcClient,
     solana_rpc_client_api::config::RpcSendTransactionConfig,
-    solana_sdk::{
-        commitment_config,
-        signature::{read_keypair_file, Keypair},
-    },
     std::{error, sync::Arc, time::Duration},
 };
 
@@ -21,7 +19,7 @@ pub(crate) struct Client {
     pub port: u16,
     pub server_url: String,
     websocket_url: String,
-    commitment: commitment_config::CommitmentConfig,
+    commitment: CommitmentConfig,
     cli_signers: Vec<Keypair>,
     pub authority_signer_index: SignerIndex,
     send_transaction_config: RpcSendTransactionConfig,

diff --git a/cargo-registry/src/crate_handler.rs b/cargo-registry/src/crate_handler.rs
@@ -13,11 +13,9 @@ use {
     serde_json::from_slice,
     sha2::{Digest, Sha256},
     solana_cli::program_v4::{process_deploy_program, process_dump},
-    solana_sdk::{
-        pubkey::Pubkey,
-        signature::{Keypair, Signer},
-        signer::EncodableKey,
-    },
+    solana_keypair::Keypair,
+    solana_pubkey::Pubkey,
+    solana_signer::{EncodableKey, Signer},
     std::{
         collections::BTreeMap,
         fs,