From 1095cdf43625596a1603f1d33e8697951aa669e2 Mon Sep 17 00:00:00 2001 From: Tyera Eulberg Date: Wed, 24 Aug 2022 20:29:56 -0700 Subject: [PATCH] Fixup docs in sdk to use new clients (#27362) Fixup client docs in sdk --- sdk/program/src/example_mocks.rs | 68 +++++++++++----------- sdk/program/src/log.rs | 8 +-- sdk/program/src/message/legacy.rs | 24 ++++---- sdk/program/src/message/versions/v0/mod.rs | 8 +-- sdk/program/src/pubkey.rs | 4 +- sdk/program/src/secp256k1_recover.rs | 4 +- sdk/program/src/system_instruction.rs | 26 ++++----- sdk/program/src/sysvar/clock.rs | 4 +- sdk/program/src/sysvar/epoch_schedule.rs | 4 +- sdk/program/src/sysvar/rent.rs | 4 +- sdk/program/src/sysvar/slot_hashes.rs | 4 +- sdk/program/src/sysvar/slot_history.rs | 4 +- sdk/program/src/sysvar/stake_history.rs | 4 +- sdk/src/example_mocks.rs | 24 ++++---- sdk/src/secp256k1_instruction.rs | 8 +-- sdk/src/transaction/mod.rs | 58 +++++++++--------- 16 files changed, 128 insertions(+), 128 deletions(-) diff --git a/sdk/program/src/example_mocks.rs b/sdk/program/src/example_mocks.rs index a21470d38..9aa88329a 100644 --- a/sdk/program/src/example_mocks.rs +++ b/sdk/program/src/example_mocks.rs @@ -13,45 +13,15 @@ #![doc(hidden)] #![allow(clippy::new_without_default)] -pub mod solana_client { - pub mod client_error { - #[derive(thiserror::Error, Debug)] - #[error("mock-error")] - pub struct ClientError; - pub type Result = std::result::Result; - } - - pub mod nonce_utils { - use { - super::super::solana_sdk::{ - account::ReadableAccount, account_utils::StateMut, pubkey::Pubkey, - }, - crate::nonce::state::{Data, DurableNonce, Versions}, - }; - - #[derive(thiserror::Error, Debug)] - #[error("mock-error")] - pub struct Error; - - pub fn data_from_account>( - _account: &T, - ) -> Result { - Ok(Data::new( - Pubkey::new_unique(), - DurableNonce::default(), - 5000, - )) - } - } - +pub mod solana_rpc_client { pub mod rpc_client { use { - super::{ - super::solana_sdk::{ + super::super::{ + solana_rpc_client_api::client_error::Result as ClientResult, + solana_sdk::{ account::Account, hash::Hash, pubkey::Pubkey, signature::Signature, transaction::Transaction, }, - client_error::Result as ClientResult, }, std::{cell::RefCell, collections::HashMap, rc::Rc}, }; @@ -106,6 +76,36 @@ pub mod solana_client { } } +pub mod solana_rpc_client_api { + pub mod client_error { + #[derive(thiserror::Error, Debug)] + #[error("mock-error")] + pub struct ClientError; + pub type Result = std::result::Result; + } +} + +pub mod solana_rpc_client_nonce_utils { + use { + super::solana_sdk::{account::ReadableAccount, account_utils::StateMut, pubkey::Pubkey}, + crate::nonce::state::{Data, DurableNonce, Versions}, + }; + + #[derive(thiserror::Error, Debug)] + #[error("mock-error")] + pub struct Error; + + pub fn data_from_account>( + _account: &T, + ) -> Result { + Ok(Data::new( + Pubkey::new_unique(), + DurableNonce::default(), + 5000, + )) + } +} + /// Re-exports and mocks of solana-program modules that mirror those from /// solana-program. /// diff --git a/sdk/program/src/log.rs b/sdk/program/src/log.rs index be700303a..d7ea2198e 100644 --- a/sdk/program/src/log.rs +++ b/sdk/program/src/log.rs @@ -16,16 +16,16 @@ //! network. Note though that transactions that fail during pre-flight //! simulation are not displayed here. //! - When submitting transactions via [`RpcClient`], if Rust's own logging is -//! active then the `solana_client` crate logs at the "debug" level any logs +//! active then the `solana_rpc_client` crate logs at the "debug" level any logs //! for transactions that failed during simulation. If using [`env_logger`] -//! these logs can be activated by setting `RUST_LOG=solana_client=debug`. +//! these logs can be activated by setting `RUST_LOG=solana_rpc_client=debug`. //! - Logs can be retrieved from a finalized transaction by calling //! [`RpcClient::get_transaction`]. //! - Block explorers may display logs. //! -//! [`RpcClient`]: https://docs.rs/solana-client/latest/solana_client/rpc_client/struct.RpcClient.html +//! [`RpcClient`]: https://docs.rs/solana-rpc-client/latest/solana_rpc_client/rpc_client/struct.RpcClient.html //! [`env_logger`]: https://docs.rs/env_logger -//! [`RpcClient::get_transaction`]: https://docs.rs/solana-client/latest/solana_client/rpc_client/struct.RpcClient.html#method.get_transaction +//! [`RpcClient::get_transaction`]: https://docs.rs/solana-rpc-client/latest/solana_rpc_client/rpc_client/struct.RpcClient.html#method.get_transaction //! //! While most logging functions are defined in this module, [`Pubkey`]s can //! also be efficiently logged with the [`Pubkey::log`] function. diff --git a/sdk/program/src/message/legacy.rs b/sdk/program/src/message/legacy.rs index 8b9032240..0ba2da440 100644 --- a/sdk/program/src/message/legacy.rs +++ b/sdk/program/src/message/legacy.rs @@ -169,18 +169,18 @@ impl Message { /// /// # Examples /// - /// This example uses the [`solana_sdk`], [`solana_client`] and [`anyhow`] crates. + /// This example uses the [`solana_sdk`], [`solana_rpc_client`] and [`anyhow`] crates. /// /// [`solana_sdk`]: https://docs.rs/solana-sdk - /// [`solana_client`]: https://docs.rs/solana-client + /// [`solana_rpc_client`]: https://docs.rs/solana-rpc-client /// [`anyhow`]: https://docs.rs/anyhow /// /// ``` /// # use solana_program::example_mocks::solana_sdk; - /// # use solana_program::example_mocks::solana_client; + /// # use solana_program::example_mocks::solana_rpc_client; /// use anyhow::Result; /// use borsh::{BorshSerialize, BorshDeserialize}; - /// use solana_client::rpc_client::RpcClient; + /// use solana_rpc_client::rpc_client::RpcClient; /// use solana_sdk::{ /// instruction::Instruction, /// message::Message, @@ -240,18 +240,18 @@ impl Message { /// /// # Examples /// - /// This example uses the [`solana_sdk`], [`solana_client`] and [`anyhow`] crates. + /// This example uses the [`solana_sdk`], [`solana_rpc_client`] and [`anyhow`] crates. /// /// [`solana_sdk`]: https://docs.rs/solana-sdk - /// [`solana_client`]: https://docs.rs/solana-client + /// [`solana_rpc_client`]: https://docs.rs/solana-rpc-client /// [`anyhow`]: https://docs.rs/anyhow /// /// ``` /// # use solana_program::example_mocks::solana_sdk; - /// # use solana_program::example_mocks::solana_client; + /// # use solana_program::example_mocks::solana_rpc_client; /// use anyhow::Result; /// use borsh::{BorshSerialize, BorshDeserialize}; - /// use solana_client::rpc_client::RpcClient; + /// use solana_rpc_client::rpc_client::RpcClient; /// use solana_sdk::{ /// instruction::Instruction, /// message::Message, @@ -336,18 +336,18 @@ impl Message { /// /// # Examples /// - /// This example uses the [`solana_sdk`], [`solana_client`] and [`anyhow`] crates. + /// This example uses the [`solana_sdk`], [`solana_rpc_client`] and [`anyhow`] crates. /// /// [`solana_sdk`]: https://docs.rs/solana-sdk - /// [`solana_client`]: https://docs.rs/solana-client + /// [`solana_rpc_client`]: https://docs.rs/solana-client /// [`anyhow`]: https://docs.rs/anyhow /// /// ``` /// # use solana_program::example_mocks::solana_sdk; - /// # use solana_program::example_mocks::solana_client; + /// # use solana_program::example_mocks::solana_rpc_client; /// use anyhow::Result; /// use borsh::{BorshSerialize, BorshDeserialize}; - /// use solana_client::rpc_client::RpcClient; + /// use solana_rpc_client::rpc_client::RpcClient; /// use solana_sdk::{ /// hash::Hash, /// instruction::Instruction, diff --git a/sdk/program/src/message/versions/v0/mod.rs b/sdk/program/src/message/versions/v0/mod.rs index 61d12ce5e..9dfe799ef 100644 --- a/sdk/program/src/message/versions/v0/mod.rs +++ b/sdk/program/src/message/versions/v0/mod.rs @@ -179,24 +179,24 @@ impl Message { /// /// # Examples /// - /// This example uses the [`solana_address_lookup_table_program`], [`solana_client`], [`solana_sdk`], and [`anyhow`] crates. + /// This example uses the [`solana_address_lookup_table_program`], [`solana_rpc_client`], [`solana_sdk`], and [`anyhow`] crates. /// /// [`solana_address_lookup_table_program`]: https://docs.rs/solana-address-lookup-table-program - /// [`solana_client`]: https://docs.rs/solana-client + /// [`solana_rpc_client`]: https://docs.rs/solana-rpc-client /// [`solana_sdk`]: https://docs.rs/solana-sdk /// [`anyhow`]: https://docs.rs/anyhow /// /// ``` /// # use solana_program::example_mocks::{ /// # solana_address_lookup_table_program, - /// # solana_client, + /// # solana_rpc_client, /// # solana_sdk, /// # }; /// # use std::borrow::Cow; /// # use solana_sdk::account::Account; /// use anyhow::Result; /// use solana_address_lookup_table_program::state::AddressLookupTable; - /// use solana_client::rpc_client::RpcClient; + /// use solana_rpc_client::rpc_client::RpcClient; /// use solana_sdk::{ /// address_lookup_table_account::AddressLookupTableAccount, /// instruction::{AccountMeta, Instruction}, diff --git a/sdk/program/src/pubkey.rs b/sdk/program/src/pubkey.rs index a8992c367..4cdfe6688 100644 --- a/sdk/program/src/pubkey.rs +++ b/sdk/program/src/pubkey.rs @@ -372,7 +372,7 @@ impl Pubkey { /// /// ``` /// # use borsh::{BorshSerialize, BorshDeserialize}; - /// # use solana_program::example_mocks::{solana_sdk, solana_client}; + /// # use solana_program::example_mocks::{solana_sdk, solana_rpc_client}; /// # use solana_program::{ /// # pubkey::Pubkey, /// # instruction::Instruction, @@ -385,7 +385,7 @@ impl Pubkey { /// # signature::{Signer, Signature}, /// # transaction::Transaction, /// # }; - /// # use solana_client::rpc_client::RpcClient; + /// # use solana_rpc_client::rpc_client::RpcClient; /// # use std::convert::TryFrom; /// # use anyhow::Result; /// # diff --git a/sdk/program/src/secp256k1_recover.rs b/sdk/program/src/secp256k1_recover.rs index 408d41b77..82ef24cff 100644 --- a/sdk/program/src/secp256k1_recover.rs +++ b/sdk/program/src/secp256k1_recover.rs @@ -335,10 +335,10 @@ impl Secp256k1Pubkey { /// The RPC client program: /// /// ```no_run -/// # use solana_program::example_mocks::solana_client; +/// # use solana_program::example_mocks::solana_rpc_client; /// # use solana_program::example_mocks::solana_sdk; /// use anyhow::Result; -/// use solana_client::rpc_client::RpcClient; +/// use solana_rpc_client::rpc_client::RpcClient; /// use solana_sdk::{ /// instruction::Instruction, /// keccak, diff --git a/sdk/program/src/system_instruction.rs b/sdk/program/src/system_instruction.rs index 5b53b4eb4..9ddc2e2cf 100644 --- a/sdk/program/src/system_instruction.rs +++ b/sdk/program/src/system_instruction.rs @@ -581,8 +581,8 @@ pub fn create_nonce_account_with_seed( /// /// ``` /// # use solana_program::example_mocks::solana_sdk; -/// # use solana_program::example_mocks::solana_client; -/// use solana_client::rpc_client::RpcClient; +/// # use solana_program::example_mocks::solana_rpc_client; +/// use solana_rpc_client::rpc_client::RpcClient; /// use solana_sdk::{ /// # pubkey::Pubkey, /// signature::{Keypair, Signer}, @@ -671,7 +671,7 @@ pub fn create_nonce_account( /// setting it to a recent blockhash, the value of the nonce must be retreived /// and deserialized from the nonce account, and that value specified as the /// "recent blockhash". A nonce account can be deserialized with the -/// [`solana_client::nonce_utils::data_from_account`][dfa] function. +/// [`solana_rpc_client_nonce_utils::data_from_account`][dfa] function. /// /// For further description of durable transaction nonces see /// [`create_nonce_account`]. @@ -679,7 +679,7 @@ pub fn create_nonce_account( /// [`Message`]: crate::message::Message /// [`Message::new_with_nonce`]: crate::message::Message::new_with_nonce /// [`recent_blockhash`]: crate::message::Message::recent_blockhash -/// [dfa]: https://docs.rs/solana-client/latest/solana_client/nonce_utils/fn.data_from_account.html +/// [dfa]: https://docs.rs/solana-rpc-client-nonce-utils/latest/solana_rpc_client_nonce_utils/fn.data_from_account.html /// /// # Required signers /// @@ -691,11 +691,9 @@ pub fn create_nonce_account( /// /// ``` /// # use solana_program::example_mocks::solana_sdk; -/// # use solana_program::example_mocks::solana_client; -/// use solana_client::{ -/// rpc_client::RpcClient, -/// nonce_utils, -/// }; +/// # use solana_program::example_mocks::solana_rpc_client; +/// # use solana_program::example_mocks::solana_rpc_client_nonce_utils; +/// use solana_rpc_client::rpc_client::RpcClient; /// use solana_sdk::{ /// message::Message, /// pubkey::Pubkey, @@ -751,7 +749,7 @@ pub fn create_nonce_account( /// # rent_epoch: 1, /// # }); /// let nonce_account = client.get_account(nonce_account_pubkey)?; -/// let nonce_data = nonce_utils::data_from_account(&nonce_account)?; +/// let nonce_data = solana_rpc_client_nonce_utils::data_from_account(&nonce_account)?; /// let blockhash = nonce_data.blockhash(); /// /// tx.try_sign(&[payer], blockhash)?; @@ -817,8 +815,8 @@ pub fn advance_nonce_account(nonce_pubkey: &Pubkey, authorized_pubkey: &Pubkey) /// /// ``` /// # use solana_program::example_mocks::solana_sdk; -/// # use solana_program::example_mocks::solana_client; -/// use solana_client::rpc_client::RpcClient; +/// # use solana_program::example_mocks::solana_rpc_client; +/// use solana_rpc_client::rpc_client::RpcClient; /// use solana_sdk::{ /// pubkey::Pubkey, /// signature::{Keypair, Signer}, @@ -899,8 +897,8 @@ pub fn withdraw_nonce_account( /// /// ``` /// # use solana_program::example_mocks::solana_sdk; -/// # use solana_program::example_mocks::solana_client; -/// use solana_client::rpc_client::RpcClient; +/// # use solana_program::example_mocks::solana_rpc_client; +/// use solana_rpc_client::rpc_client::RpcClient; /// use solana_sdk::{ /// pubkey::Pubkey, /// signature::{Keypair, Signer}, diff --git a/sdk/program/src/sysvar/clock.rs b/sdk/program/src/sysvar/clock.rs index bf8b518f5..198ac0884 100644 --- a/sdk/program/src/sysvar/clock.rs +++ b/sdk/program/src/sysvar/clock.rs @@ -99,9 +99,9 @@ //! //! ``` //! # use solana_program::example_mocks::solana_sdk; -//! # use solana_program::example_mocks::solana_client; +//! # use solana_program::example_mocks::solana_rpc_client; //! # use solana_sdk::account::Account; -//! # use solana_client::rpc_client::RpcClient; +//! # use solana_rpc_client::rpc_client::RpcClient; //! # use solana_sdk::sysvar::clock::{self, Clock}; //! # use anyhow::Result; //! # diff --git a/sdk/program/src/sysvar/epoch_schedule.rs b/sdk/program/src/sysvar/epoch_schedule.rs index 81edba476..1221b49d9 100644 --- a/sdk/program/src/sysvar/epoch_schedule.rs +++ b/sdk/program/src/sysvar/epoch_schedule.rs @@ -99,9 +99,9 @@ //! //! ``` //! # use solana_program::example_mocks::solana_sdk; -//! # use solana_program::example_mocks::solana_client; +//! # use solana_program::example_mocks::solana_rpc_client; //! # use solana_sdk::account::Account; -//! # use solana_client::rpc_client::RpcClient; +//! # use solana_rpc_client::rpc_client::RpcClient; //! # use solana_sdk::sysvar::epoch_schedule::{self, EpochSchedule}; //! # use anyhow::Result; //! # diff --git a/sdk/program/src/sysvar/rent.rs b/sdk/program/src/sysvar/rent.rs index 8b604b9f4..0e0e518e1 100644 --- a/sdk/program/src/sysvar/rent.rs +++ b/sdk/program/src/sysvar/rent.rs @@ -100,9 +100,9 @@ //! //! ``` //! # use solana_program::example_mocks::solana_sdk; -//! # use solana_program::example_mocks::solana_client; +//! # use solana_program::example_mocks::solana_rpc_client; //! # use solana_sdk::account::Account; -//! # use solana_client::rpc_client::RpcClient; +//! # use solana_rpc_client::rpc_client::RpcClient; //! # use solana_sdk::sysvar::rent::{self, Rent}; //! # use anyhow::Result; //! # diff --git a/sdk/program/src/sysvar/slot_hashes.rs b/sdk/program/src/sysvar/slot_hashes.rs index 1aee84056..18971dc48 100644 --- a/sdk/program/src/sysvar/slot_hashes.rs +++ b/sdk/program/src/sysvar/slot_hashes.rs @@ -18,9 +18,9 @@ //! //! ``` //! # use solana_program::example_mocks::solana_sdk; -//! # use solana_program::example_mocks::solana_client; +//! # use solana_program::example_mocks::solana_rpc_client; //! # use solana_sdk::account::Account; -//! # use solana_client::rpc_client::RpcClient; +//! # use solana_rpc_client::rpc_client::RpcClient; //! # use solana_sdk::sysvar::slot_hashes::{self, SlotHashes}; //! # use anyhow::Result; //! # diff --git a/sdk/program/src/sysvar/slot_history.rs b/sdk/program/src/sysvar/slot_history.rs index a742bf7b9..668d4f194 100644 --- a/sdk/program/src/sysvar/slot_history.rs +++ b/sdk/program/src/sysvar/slot_history.rs @@ -18,9 +18,9 @@ //! //! ``` //! # use solana_program::example_mocks::solana_sdk; -//! # use solana_program::example_mocks::solana_client; +//! # use solana_program::example_mocks::solana_rpc_client; //! # use solana_sdk::account::Account; -//! # use solana_client::rpc_client::RpcClient; +//! # use solana_rpc_client::rpc_client::RpcClient; //! # use solana_sdk::sysvar::slot_history::{self, SlotHistory}; //! # use anyhow::Result; //! # diff --git a/sdk/program/src/sysvar/stake_history.rs b/sdk/program/src/sysvar/stake_history.rs index 9586ae16e..aedc52d31 100644 --- a/sdk/program/src/sysvar/stake_history.rs +++ b/sdk/program/src/sysvar/stake_history.rs @@ -18,9 +18,9 @@ //! //! ``` //! # use solana_program::example_mocks::solana_sdk; -//! # use solana_program::example_mocks::solana_client; +//! # use solana_program::example_mocks::solana_rpc_client; //! # use solana_sdk::account::Account; -//! # use solana_client::rpc_client::RpcClient; +//! # use solana_rpc_client::rpc_client::RpcClient; //! # use solana_sdk::sysvar::stake_history::{self, StakeHistory}; //! # use anyhow::Result; //! # diff --git a/sdk/src/example_mocks.rs b/sdk/src/example_mocks.rs index 33a01c0b4..5e4cb5d8a 100644 --- a/sdk/src/example_mocks.rs +++ b/sdk/src/example_mocks.rs @@ -13,19 +13,10 @@ #![doc(hidden)] #![cfg(feature = "full")] -pub mod solana_client { - pub mod client_error { - use thiserror::Error; - - #[derive(Error, Debug)] - #[error("mock-error")] - pub struct ClientError; - pub type Result = std::result::Result; - } - +pub mod solana_rpc_client { pub mod rpc_client { use { - super::client_error::Result as ClientResult, + super::super::solana_rpc_client_api::client_error::Result as ClientResult, crate::{hash::Hash, signature::Signature, transaction::Transaction}, }; @@ -47,3 +38,14 @@ pub mod solana_client { } } } + +pub mod solana_rpc_client_api { + pub mod client_error { + use thiserror::Error; + + #[derive(Error, Debug)] + #[error("mock-error")] + pub struct ClientError; + pub type Result = std::result::Result; + } +} diff --git a/sdk/src/secp256k1_instruction.rs b/sdk/src/secp256k1_instruction.rs index a70ad00bd..c4a8bec94 100644 --- a/sdk/src/secp256k1_instruction.rs +++ b/sdk/src/secp256k1_instruction.rs @@ -417,9 +417,9 @@ //! The client program: //! //! ```no_run -//! # use solana_sdk::example_mocks::solana_client; +//! # use solana_sdk::example_mocks::solana_rpc_client; //! use anyhow::Result; -//! use solana_client::rpc_client::RpcClient; +//! use solana_rpc_client::rpc_client::RpcClient; //! use solana_sdk::{ //! instruction::{AccountMeta, Instruction}, //! secp256k1_instruction, @@ -633,9 +633,9 @@ //! The client program: //! //! ```no_run -//! # use solana_sdk::example_mocks::solana_client; +//! # use solana_sdk::example_mocks::solana_rpc_client; //! use anyhow::Result; -//! use solana_client::rpc_client::RpcClient; +//! use solana_rpc_client::rpc_client::RpcClient; //! use solana_sdk::{ //! instruction::{AccountMeta, Instruction}, //! keccak, diff --git a/sdk/src/transaction/mod.rs b/sdk/src/transaction/mod.rs index 0041889a5..ed6686d42 100644 --- a/sdk/src/transaction/mod.rs +++ b/sdk/src/transaction/mod.rs @@ -42,21 +42,21 @@ //! transaction nonce]_ mechanism instead of a recent blockhash to ensure unique //! transactions. //! -//! [`RpcClient::get_latest_blockhash`]: https://docs.rs/solana-client/latest/solana_client/rpc_client/struct.RpcClient.html#method.get_latest_blockhash +//! [`RpcClient::get_latest_blockhash`]: https://docs.rs/solana-rpc-client/latest/solana_rpc_client/rpc_client/struct.RpcClient.html#method.get_latest_blockhash //! [durable transaction nonce]: https://docs.solana.com/implemented-proposals/durable-tx-nonces //! //! # Examples //! -//! This example uses the [`solana_client`] and [`anyhow`] crates. +//! This example uses the [`solana_rpc_client`] and [`anyhow`] crates. //! -//! [`solana_client`]: https://docs.rs/solana-client +//! [`solana_rpc_client`]: https://docs.rs/solana-rpc-client //! [`anyhow`]: https://docs.rs/anyhow //! //! ``` -//! # use solana_sdk::example_mocks::solana_client; +//! # use solana_sdk::example_mocks::solana_rpc_client; //! use anyhow::Result; //! use borsh::{BorshSerialize, BorshDeserialize}; -//! use solana_client::rpc_client::RpcClient; +//! use solana_rpc_client::rpc_client::RpcClient; //! use solana_sdk::{ //! instruction::Instruction, //! message::Message, @@ -206,16 +206,16 @@ impl Transaction { /// /// # Examples /// - /// This example uses the [`solana_client`] and [`anyhow`] crates. + /// This example uses the [`solana_rpc_client`] and [`anyhow`] crates. /// - /// [`solana_client`]: https://docs.rs/solana-client + /// [`solana_rpc_client`]: https://docs.rs/solana-rpc-client /// [`anyhow`]: https://docs.rs/anyhow /// /// ``` - /// # use solana_sdk::example_mocks::solana_client; + /// # use solana_sdk::example_mocks::solana_rpc_client; /// use anyhow::Result; /// use borsh::{BorshSerialize, BorshDeserialize}; - /// use solana_client::rpc_client::RpcClient; + /// use solana_rpc_client::rpc_client::RpcClient; /// use solana_sdk::{ /// instruction::Instruction, /// message::Message, @@ -285,16 +285,16 @@ impl Transaction { /// /// # Examples /// - /// This example uses the [`solana_client`] and [`anyhow`] crates. + /// This example uses the [`solana_rpc_client`] and [`anyhow`] crates. /// - /// [`solana_client`]: https://docs.rs/solana-client + /// [`solana_rpc_client`]: https://docs.rs/solana-rpc-client /// [`anyhow`]: https://docs.rs/anyhow /// /// ``` - /// # use solana_sdk::example_mocks::solana_client; + /// # use solana_sdk::example_mocks::solana_rpc_client; /// use anyhow::Result; /// use borsh::{BorshSerialize, BorshDeserialize}; - /// use solana_client::rpc_client::RpcClient; + /// use solana_rpc_client::rpc_client::RpcClient; /// use solana_sdk::{ /// instruction::Instruction, /// message::Message, @@ -364,16 +364,16 @@ impl Transaction { /// /// # Examples /// - /// This example uses the [`solana_client`] and [`anyhow`] crates. + /// This example uses the [`solana_rpc_client`] and [`anyhow`] crates. /// - /// [`solana_client`]: https://docs.rs/solana-client + /// [`solana_rpc_client`]: https://docs.rs/solana-rpc-client /// [`anyhow`]: https://docs.rs/anyhow /// /// ``` - /// # use solana_sdk::example_mocks::solana_client; + /// # use solana_sdk::example_mocks::solana_rpc_client; /// use anyhow::Result; /// use borsh::{BorshSerialize, BorshDeserialize}; - /// use solana_client::rpc_client::RpcClient; + /// use solana_rpc_client::rpc_client::RpcClient; /// use solana_sdk::{ /// instruction::Instruction, /// message::Message, @@ -440,16 +440,16 @@ impl Transaction { /// /// # Examples /// - /// This example uses the [`solana_client`] and [`anyhow`] crates. + /// This example uses the [`solana_rpc_client`] and [`anyhow`] crates. /// - /// [`solana_client`]: https://docs.rs/solana-client + /// [`solana_rpc_client`]: https://docs.rs/solana-rpc-client /// [`anyhow`]: https://docs.rs/anyhow /// /// ``` - /// # use solana_sdk::example_mocks::solana_client; + /// # use solana_sdk::example_mocks::solana_rpc_client; /// use anyhow::Result; /// use borsh::{BorshSerialize, BorshDeserialize}; - /// use solana_client::rpc_client::RpcClient; + /// use solana_rpc_client::rpc_client::RpcClient; /// use solana_sdk::{ /// instruction::Instruction, /// message::Message, @@ -648,16 +648,16 @@ impl Transaction { /// /// # Examples /// - /// This example uses the [`solana_client`] and [`anyhow`] crates. + /// This example uses the [`solana_rpc_client`] and [`anyhow`] crates. /// - /// [`solana_client`]: https://docs.rs/solana-client + /// [`solana_rpc_client`]: https://docs.rs/solana-rpc-client /// [`anyhow`]: https://docs.rs/anyhow /// /// ``` - /// # use solana_sdk::example_mocks::solana_client; + /// # use solana_sdk::example_mocks::solana_rpc_client; /// use anyhow::Result; /// use borsh::{BorshSerialize, BorshDeserialize}; - /// use solana_client::rpc_client::RpcClient; + /// use solana_rpc_client::rpc_client::RpcClient; /// use solana_sdk::{ /// instruction::Instruction, /// message::Message, @@ -789,16 +789,16 @@ impl Transaction { /// /// # Examples /// - /// This example uses the [`solana_client`] and [`anyhow`] crates. + /// This example uses the [`solana_rpc_client`] and [`anyhow`] crates. /// - /// [`solana_client`]: https://docs.rs/solana-client + /// [`solana_rpc_client`]: https://docs.rs/solana-rpc-client /// [`anyhow`]: https://docs.rs/anyhow /// /// ``` - /// # use solana_sdk::example_mocks::solana_client; + /// # use solana_sdk::example_mocks::solana_rpc_client; /// use anyhow::Result; /// use borsh::{BorshSerialize, BorshDeserialize}; - /// use solana_client::rpc_client::RpcClient; + /// use solana_rpc_client::rpc_client::RpcClient; /// use solana_sdk::{ /// instruction::Instruction, /// message::Message,