Remove tuples from JSON RPC responses (#7806) (#7811)

automerge

cli/src/cli.rs

@@ -1980,7 +1980,8 @@ mod tests {
     use serde_json::Value;
     use solana_client::{
         mock_rpc_client_request::SIGNATURE,
-        rpc_request::{self, RpcRequest, RpcResponseContext},
+        rpc_request::RpcRequest,
+        rpc_response::{Response, RpcResponseContext},
     };
     use solana_sdk::{
         account::Account,
@@ -2658,7 +2659,7 @@ mod tests {
 
         // Nonced pay
         let blockhash = Hash::default();
-        let nonce_response = json!(rpc_request::Response {
+        let nonce_response = json!(Response {
             context: RpcResponseContext { slot: 1 },
             value: json!(Account::new_data(
                 1,
@@ -2684,7 +2685,7 @@ mod tests {
         let bob_keypair = Keypair::new();
         let bob_pubkey = bob_keypair.pubkey();
         let blockhash = Hash::default();
-        let nonce_authority_response = json!(rpc_request::Response {
+        let nonce_authority_response = json!(Response {
             context: RpcResponseContext { slot: 1 },
             value: json!(Account::new_data(
                 1,

cli/src/cluster_query.rs

@@ -9,7 +9,7 @@ use clap::{value_t, value_t_or_exit, App, Arg, ArgMatches, SubCommand};
 use console::{style, Emoji};
 use indicatif::{ProgressBar, ProgressStyle};
 use solana_clap_utils::{input_parsers::*, input_validators::*};
-use solana_client::{rpc_client::RpcClient, rpc_request::RpcVoteAccountInfo};
+use solana_client::{rpc_client::RpcClient, rpc_response::RpcVoteAccountInfo};
 use solana_sdk::{
     clock::{self, Slot},
     commitment_config::CommitmentConfig,