Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extract rpc-response crate #2084

Closed
wants to merge 9 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 27 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ members = [
"rpc-client",
"rpc-client-api",
"rpc-client-nonce-utils",
"rpc-response",
"rpc-test",
"runtime",
"runtime-transaction",
Expand Down Expand Up @@ -442,6 +443,7 @@ solana-rpc = { path = "rpc", version = "=2.1.0" }
solana-rpc-client = { path = "rpc-client", version = "=2.1.0", default-features = false }
solana-rpc-client-api = { path = "rpc-client-api", version = "=2.1.0" }
solana-rpc-client-nonce-utils = { path = "rpc-client-nonce-utils", version = "=2.1.0" }
solana-rpc-response = { path = "rpc-response", version = "=2.1.0" }
solana-runtime = { path = "runtime", version = "=2.1.0" }
solana-runtime-transaction = { path = "runtime-transaction", version = "=2.1.0" }
solana-sdk = { path = "sdk", version = "=2.1.0" }
Expand Down
2 changes: 1 addition & 1 deletion cli-output/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ serde_json = { workspace = true }
solana-account-decoder = { workspace = true }
solana-clap-utils = { workspace = true }
solana-cli-config = { workspace = true }
solana-rpc-client-api = { workspace = true }
solana-rpc-response = { workspace = true }
solana-sdk = { workspace = true }
solana-transaction-status = { workspace = true }
solana-vote-program = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion cli-output/src/cli_output.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use {
UiAccountEncoding, UiDataSliceConfig,
},
solana_clap_utils::keypair::SignOnly,
solana_rpc_client_api::response::{
solana_rpc_response::{
RpcAccountBalance, RpcContactInfo, RpcInflationGovernor, RpcInflationRate, RpcKeyedAccount,
RpcSupply, RpcVoteAccountInfo,
},
Expand Down
1 change: 1 addition & 0 deletions cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ solana-remote-wallet = { workspace = true, features = ["default"] }
solana-rpc-client = { workspace = true, features = ["default"] }
solana-rpc-client-api = { workspace = true }
solana-rpc-client-nonce-utils = { workspace = true, features = ["clap"] }
solana-rpc-response = { workspace = true }
solana-sdk = { workspace = true }
solana-streamer = { workspace = true }
solana-tps-client = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion cli/src/cluster_query.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ use {
},
filter::{Memcmp, RpcFilterType},
request::DELINQUENT_VALIDATOR_SLOT_DISTANCE,
response::{RpcPerfSample, RpcPrioritizationFee, SlotInfo},
},
solana_rpc_response::{RpcPerfSample, RpcPrioritizationFee, SlotInfo},
solana_sdk::{
account::from_account,
account_utils::StateMut,
Expand Down
6 changes: 2 additions & 4 deletions cli/src/feature.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,8 @@ use {
solana_feature_set::FEATURE_NAMES,
solana_remote_wallet::remote_wallet::RemoteWalletManager,
solana_rpc_client::rpc_client::RpcClient,
solana_rpc_client_api::{
client_error::Error as ClientError, request::MAX_MULTIPLE_ACCOUNTS,
response::RpcVoteAccountInfo,
},
solana_rpc_client_api::{client_error::Error as ClientError, request::MAX_MULTIPLE_ACCOUNTS},
solana_rpc_response::RpcVoteAccountInfo,
solana_sdk::{
account::Account,
clock::Slot,
Expand Down
5 changes: 2 additions & 3 deletions cli/src/stake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,10 @@ use {
solana_remote_wallet::remote_wallet::RemoteWalletManager,
solana_rpc_client::rpc_client::RpcClient,
solana_rpc_client_api::{
config::RpcGetVoteAccountsConfig,
request::DELINQUENT_VALIDATOR_SLOT_DISTANCE,
response::{RpcInflationReward, RpcVoteAccountStatus},
config::RpcGetVoteAccountsConfig, request::DELINQUENT_VALIDATOR_SLOT_DISTANCE,
},
solana_rpc_client_nonce_utils::blockhash_query::BlockhashQuery,
solana_rpc_response::{RpcInflationReward, RpcVoteAccountStatus},
solana_sdk::{
account::{from_account, Account},
account_utils::StateMut,
Expand Down
1 change: 1 addition & 0 deletions client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ solana-quic-client = { workspace = true }
solana-rpc-client = { workspace = true, features = ["default"] }
solana-rpc-client-api = { workspace = true }
solana-rpc-client-nonce-utils = { workspace = true }
solana-rpc-response = { workspace = true }
solana-sdk = { workspace = true }
solana-streamer = { workspace = true }
solana-thin-client = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion client/src/send_and_confirm_transactions_in_parallel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ use {
solana_rpc_client_api::{
client_error::ErrorKind,
request::{RpcError, RpcResponseErrorData, MAX_GET_SIGNATURE_STATUSES_QUERY_ITEMS},
response::RpcSimulateTransactionResult,
},
solana_rpc_response::RpcSimulateTransactionResult,
solana_sdk::{
hash::Hash,
message::Message,
Expand Down
1 change: 1 addition & 0 deletions core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ solana-quic-client = { workspace = true }
solana-rayon-threadlimit = { workspace = true }
solana-rpc = { workspace = true }
solana-rpc-client-api = { workspace = true }
solana-rpc-response = { workspace = true }
solana-runtime = { workspace = true }
solana-runtime-transaction = { workspace = true }
solana-sanitize = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion core/src/replay_stage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ use {
optimistically_confirmed_bank_tracker::{BankNotification, BankNotificationSenderConfig},
rpc_subscriptions::RpcSubscriptions,
},
solana_rpc_client_api::response::SlotUpdate,
solana_rpc_response::SlotUpdate,
solana_runtime::{
accounts_background_service::AbsRequestSender,
bank::{bank_hash_details, Bank, NewBankOptions},
Expand Down
27 changes: 24 additions & 3 deletions programs/sbf/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions pubsub-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ serde_derive = { workspace = true }
serde_json = { workspace = true }
solana-account-decoder = { workspace = true }
solana-rpc-client-api = { workspace = true }
solana-rpc-response = { workspace = true }
solana-sdk = { workspace = true }
thiserror = { workspace = true }
tokio = { workspace = true, features = ["full"] }
Expand Down
8 changes: 4 additions & 4 deletions pubsub-client/src/nonblocking/pubsub_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -183,10 +183,10 @@ use {
RpcTransactionLogsFilter,
},
error_object::RpcErrorObject,
response::{
Response as RpcResponse, RpcBlockUpdate, RpcKeyedAccount, RpcLogsResponse,
RpcSignatureResult, RpcVote, SlotInfo, SlotUpdate,
},
},
solana_rpc_response::{
Response as RpcResponse, RpcBlockUpdate, RpcKeyedAccount, RpcLogsResponse,
RpcSignatureResult, RpcVote, SlotInfo, SlotUpdate,
},
solana_sdk::{clock::Slot, pubkey::Pubkey, signature::Signature},
std::collections::BTreeMap,
Expand Down
Loading
Loading