From bcc34b906c84d0ad18d1a05c6e00a1dc65ecae67 Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Fri, 15 Mar 2019 23:49:28 -0700 Subject: [PATCH] Relieve the caller of having to care about the rpc request id --- client/src/rpc_mock.rs | 7 ++----- client/src/rpc_request.rs | 19 ++++++++---------- client/src/thin_client.rs | 34 ++++++++++++++++----------------- core/src/replicator.rs | 4 ++-- core/src/voting_keypair.rs | 6 +++--- tests/thin_client.rs | 8 ++++++-- wallet/src/wallet.rs | 22 ++++++++++----------- wallet/tests/deploy.rs | 2 +- wallet/tests/pay.rs | 2 +- wallet/tests/request_airdrop.rs | 2 +- 10 files changed, 51 insertions(+), 55 deletions(-) diff --git a/client/src/rpc_mock.rs b/client/src/rpc_mock.rs index cac1b1b2cf..e7541dd5db 100644 --- a/client/src/rpc_mock.rs +++ b/client/src/rpc_mock.rs @@ -27,20 +27,18 @@ impl MockRpcClient { pub fn retry_get_balance( &self, - id: u64, pubkey: &Pubkey, retries: usize, ) -> Result, Box> { let params = json!([format!("{}", pubkey)]); let res = self - .retry_make_rpc_request(id, &RpcRequest::GetBalance, Some(params), retries)? + .retry_make_rpc_request(&RpcRequest::GetBalance, Some(params), retries)? .as_u64(); Ok(res) } pub fn retry_make_rpc_request( &self, - _id: u64, request: &RpcRequest, params: Option, mut _retries: usize, @@ -86,11 +84,10 @@ impl MockRpcClient { impl RpcRequestHandler for MockRpcClient { fn make_rpc_request( &self, - id: u64, request: RpcRequest, params: Option, ) -> Result> { - self.retry_make_rpc_request(id, &request, params, 0) + self.retry_make_rpc_request(&request, params, 0) } } diff --git a/client/src/rpc_request.rs b/client/src/rpc_request.rs index c621bf4250..6e36537ccd 100644 --- a/client/src/rpc_request.rs +++ b/client/src/rpc_request.rs @@ -39,25 +39,26 @@ impl RpcClient { pub fn retry_get_balance( &self, - id: u64, pubkey: &Pubkey, retries: usize, ) -> Result, Box> { let params = json!([format!("{}", pubkey)]); let res = self - .retry_make_rpc_request(id, &RpcRequest::GetBalance, Some(params), retries)? + .retry_make_rpc_request(&RpcRequest::GetBalance, Some(params), retries)? .as_u64(); Ok(res) } pub fn retry_make_rpc_request( &self, - id: u64, request: &RpcRequest, params: Option, mut retries: usize, ) -> Result> { - let request_json = request.build_request_json(id, params); + // Concurrent requests are not supported so reuse the same request id for all requests + let request_id = 1; + + let request_json = request.build_request_json(request_id, params); loop { match self @@ -108,7 +109,6 @@ pub fn get_rpc_request_str(rpc_addr: SocketAddr, tls: bool) -> String { pub trait RpcRequestHandler { fn make_rpc_request( &self, - id: u64, request: RpcRequest, params: Option, ) -> Result>; @@ -117,11 +117,10 @@ pub trait RpcRequestHandler { impl RpcRequestHandler for RpcClient { fn make_rpc_request( &self, - id: u64, request: RpcRequest, params: Option, ) -> Result> { - self.retry_make_rpc_request(id, &request, params, 0) + self.retry_make_rpc_request(&request, params, 0) } } @@ -272,13 +271,12 @@ mod tests { let rpc_client = RpcClient::new_socket(rpc_addr); let balance = rpc_client.make_rpc_request( - 1, RpcRequest::GetBalance, Some(json!(["deadbeefXjn8o3yroDHxUtKsZZgoy4GPkPPXfouKNHhx"])), ); assert_eq!(balance.unwrap().as_u64().unwrap(), 50); - let blockhash = rpc_client.make_rpc_request(2, RpcRequest::GetRecentBlockhash, None); + let blockhash = rpc_client.make_rpc_request(RpcRequest::GetRecentBlockhash, None); assert_eq!( blockhash.unwrap().as_str().unwrap(), "deadbeefXjn8o3yroDHxUtKsZZgoy4GPkPPXfouKNHhx" @@ -286,7 +284,7 @@ mod tests { // Send erroneous parameter let blockhash = - rpc_client.make_rpc_request(3, RpcRequest::GetRecentBlockhash, Some(json!("paramter"))); + rpc_client.make_rpc_request(RpcRequest::GetRecentBlockhash, Some(json!("paramter"))); assert_eq!(blockhash.is_err(), true); } @@ -321,7 +319,6 @@ mod tests { let rpc_client = RpcClient::new_socket(rpc_addr); let balance = rpc_client.retry_make_rpc_request( - 1, &RpcRequest::GetBalance, Some(json!(["deadbeefXjn8o3yroDHxUtKsZZgoy4GPkPPXfouKNHhw"])), 10, diff --git a/client/src/thin_client.rs b/client/src/thin_client.rs index 8444e6b396..4ca6f35b19 100644 --- a/client/src/thin_client.rs +++ b/client/src/thin_client.rs @@ -144,9 +144,9 @@ impl ThinClient { pub fn get_account_data(&mut self, pubkey: &Pubkey) -> io::Result>> { let params = json!([format!("{}", pubkey)]); - let response = - self.rpc_client - .make_rpc_request(1, RpcRequest::GetAccountInfo, Some(params)); + let response = self + .rpc_client + .make_rpc_request(RpcRequest::GetAccountInfo, Some(params)); match response { Ok(account_json) => { let account: Account = @@ -169,9 +169,9 @@ impl ThinClient { pub fn get_balance(&mut self, pubkey: &Pubkey) -> io::Result { trace!("get_balance sending request to {}", self.rpc_addr); let params = json!([format!("{}", pubkey)]); - let response = - self.rpc_client - .make_rpc_request(1, RpcRequest::GetAccountInfo, Some(params)); + let response = self + .rpc_client + .make_rpc_request(RpcRequest::GetAccountInfo, Some(params)); response .and_then(|account_json| { @@ -192,9 +192,9 @@ impl ThinClient { pub fn transaction_count(&mut self) -> u64 { debug!("transaction_count"); for _tries in 0..5 { - let response = - self.rpc_client - .make_rpc_request(1, RpcRequest::GetTransactionCount, None); + let response = self + .rpc_client + .make_rpc_request(RpcRequest::GetTransactionCount, None); match response { Ok(value) => { @@ -215,9 +215,9 @@ impl ThinClient { pub fn try_get_recent_blockhash(&mut self, mut num_retries: u64) -> Option { loop { trace!("try_get_recent_blockhash send_to {}", &self.rpc_addr); - let response = - self.rpc_client - .make_rpc_request(1, RpcRequest::GetRecentBlockhash, None); + let response = self + .rpc_client + .make_rpc_request(RpcRequest::GetRecentBlockhash, None); match response { Ok(value) => { @@ -326,11 +326,9 @@ impl ThinClient { let now = Instant::now(); loop { - let response = self.rpc_client.make_rpc_request( - 1, - RpcRequest::ConfirmTransaction, - Some(params.clone()), - ); + let response = self + .rpc_client + .make_rpc_request(RpcRequest::ConfirmTransaction, Some(params.clone())); match response { Ok(confirmation) => { @@ -363,7 +361,7 @@ impl ThinClient { trace!("fullnode_exit sending request to {}", self.rpc_addr); let response = self .rpc_client - .make_rpc_request(1, RpcRequest::FullnodeExit, None) + .make_rpc_request(RpcRequest::FullnodeExit, None) .map_err(|error| { debug!("Response from {} fullndoe_exit: {}", self.rpc_addr, error); io::Error::new(io::ErrorKind::Other, "FullodeExit request failure") diff --git a/core/src/replicator.rs b/core/src/replicator.rs index bade4f5d9d..488da8afd0 100644 --- a/core/src/replicator.rs +++ b/core/src/replicator.rs @@ -357,11 +357,11 @@ impl Replicator { RpcClient::new_socket(rpc_peers[node_idx].rpc) }; let storage_blockhash = rpc_client - .make_rpc_request(2, RpcRequest::GetStorageBlockhash, None) + .make_rpc_request(RpcRequest::GetStorageBlockhash, None) .expect("rpc request") .to_string(); let storage_entry_height = rpc_client - .make_rpc_request(2, RpcRequest::GetStorageEntryHeight, None) + .make_rpc_request(RpcRequest::GetStorageEntryHeight, None) .expect("rpc request") .as_u64() .unwrap(); diff --git a/core/src/voting_keypair.rs b/core/src/voting_keypair.rs index 337f94b861..a0e5c42870 100644 --- a/core/src/voting_keypair.rs +++ b/core/src/voting_keypair.rs @@ -30,7 +30,7 @@ impl VoteSigner for RemoteVoteSigner { let params = json!([pubkey, sig, msg]); let resp = self .rpc_client - .retry_make_rpc_request(1, &RpcRequest::RegisterNode, Some(params), 5) + .retry_make_rpc_request(&RpcRequest::RegisterNode, Some(params), 5) .unwrap(); let vote_account: Pubkey = serde_json::from_value(resp).unwrap(); Ok(vote_account) @@ -44,7 +44,7 @@ impl VoteSigner for RemoteVoteSigner { let params = json!([pubkey, sig, msg]); let resp = self .rpc_client - .retry_make_rpc_request(1, &RpcRequest::SignVote, Some(params), 0) + .retry_make_rpc_request(&RpcRequest::SignVote, Some(params), 0) .unwrap(); let vote_signature: Signature = serde_json::from_value(resp).unwrap(); Ok(vote_signature) @@ -53,7 +53,7 @@ impl VoteSigner for RemoteVoteSigner { let params = json!([pubkey, sig, msg]); let _resp = self .rpc_client - .retry_make_rpc_request(1, &RpcRequest::DeregisterNode, Some(params), 5) + .retry_make_rpc_request(&RpcRequest::DeregisterNode, Some(params), 5) .unwrap(); Ok(()) } diff --git a/tests/thin_client.rs b/tests/thin_client.rs index c7420f3012..7e87ef0fe4 100644 --- a/tests/thin_client.rs +++ b/tests/thin_client.rs @@ -139,8 +139,12 @@ fn test_transaction_count() { solana_logger::setup(); let addr = "0.0.0.0:1234".parse().unwrap(); let transactions_socket = UdpSocket::bind("0.0.0.0:0").unwrap(); - let mut client = - ThinClient::new_socket_with_timeout(addr, addr, transactions_socket, Duration::from_secs(2)); + let mut client = ThinClient::new_socket_with_timeout( + addr, + addr, + transactions_socket, + Duration::from_secs(2), + ); assert_eq!(client.transaction_count(), 0); } diff --git a/wallet/src/wallet.rs b/wallet/src/wallet.rs index 3be1247c57..d87f73cdc3 100644 --- a/wallet/src/wallet.rs +++ b/wallet/src/wallet.rs @@ -375,7 +375,7 @@ fn process_airdrop( "Requesting airdrop of {:?} lamports from {}", lamports, drone_addr ); - let previous_balance = match rpc_client.retry_get_balance(1, &config.id.pubkey(), 5)? { + let previous_balance = match rpc_client.retry_get_balance(&config.id.pubkey(), 5)? { Some(lamports) => lamports, None => Err(WalletError::RpcRequestError( "Received result of an unexpected type".to_string(), @@ -385,7 +385,7 @@ fn process_airdrop( request_and_confirm_airdrop(&rpc_client, &drone_addr, &config.id.pubkey(), lamports)?; let current_balance = rpc_client - .retry_get_balance(1, &config.id.pubkey(), 5)? + .retry_get_balance(&config.id.pubkey(), 5)? .unwrap_or(previous_balance); if current_balance < previous_balance { @@ -405,7 +405,7 @@ fn process_airdrop( } fn process_balance(config: &WalletConfig, rpc_client: &RpcClient) -> ProcessResult { - let balance = rpc_client.retry_get_balance(1, &config.id.pubkey(), 5)?; + let balance = rpc_client.retry_get_balance(&config.id.pubkey(), 5)?; match balance { Some(0) => Ok("No account found! Request an airdrop to get started.".to_string()), Some(lamports) => Ok(format!("Your balance is: {:?}", lamports)), @@ -418,7 +418,7 @@ fn process_balance(config: &WalletConfig, rpc_client: &RpcClient) -> ProcessResu fn process_confirm(rpc_client: &RpcClient, signature: Signature) -> ProcessResult { let params = json!([format!("{}", signature)]); let confirmation = rpc_client - .retry_make_rpc_request(1, &RpcRequest::ConfirmTransaction, Some(params), 5)? + .retry_make_rpc_request(&RpcRequest::ConfirmTransaction, Some(params), 5)? .as_bool(); match confirmation { Some(b) => { @@ -478,7 +478,7 @@ fn process_deploy( config: &WalletConfig, program_location: &str, ) -> ProcessResult { - let balance = rpc_client.retry_get_balance(1, &config.id.pubkey(), 5)?; + let balance = rpc_client.retry_get_balance(&config.id.pubkey(), 5)?; if let Some(lamports) = balance { if lamports < 1 { Err(WalletError::DynamicProgramError( @@ -632,7 +632,7 @@ fn process_cancel(rpc_client: &RpcClient, config: &WalletConfig, pubkey: &Pubkey fn process_get_transaction_count(rpc_client: &RpcClient) -> ProcessResult { let transaction_count = rpc_client - .retry_make_rpc_request(1, &RpcRequest::GetTransactionCount, None, 5)? + .retry_make_rpc_request(&RpcRequest::GetTransactionCount, None, 5)? .as_u64(); match transaction_count { Some(count) => Ok(count.to_string()), @@ -650,7 +650,7 @@ fn process_time_elapsed( pubkey: &Pubkey, dt: DateTime, ) -> ProcessResult { - let balance = rpc_client.retry_get_balance(1, &config.id.pubkey(), 5)?; + let balance = rpc_client.retry_get_balance(&config.id.pubkey(), 5)?; if let Some(0) = balance { request_and_confirm_airdrop(&rpc_client, &drone_addr, &config.id.pubkey(), 1)?; @@ -671,7 +671,7 @@ fn process_witness( to: &Pubkey, pubkey: &Pubkey, ) -> ProcessResult { - let balance = rpc_client.retry_get_balance(1, &config.id.pubkey(), 5)?; + let balance = rpc_client.retry_get_balance(&config.id.pubkey(), 5)?; if let Some(0) = balance { request_and_confirm_airdrop(&rpc_client, &drone_addr, &config.id.pubkey(), 1)?; @@ -771,7 +771,7 @@ pub fn process_command(config: &WalletConfig) -> ProcessResult { } fn get_recent_blockhash(rpc_client: &RpcClient) -> Result> { - let result = rpc_client.retry_make_rpc_request(1, &RpcRequest::GetRecentBlockhash, None, 5)?; + let result = rpc_client.retry_make_rpc_request(&RpcRequest::GetRecentBlockhash, None, 5)?; if result.as_str().is_none() { Err(WalletError::RpcRequestError( "Received bad blockhash".to_string(), @@ -823,7 +823,7 @@ fn send_transaction( let serialized = serialize(transaction).unwrap(); let params = json!([serialized]); let signature = - rpc_client.retry_make_rpc_request(2, &RpcRequest::SendTransaction, Some(params), 5)?; + rpc_client.retry_make_rpc_request(&RpcRequest::SendTransaction, Some(params), 5)?; if signature.as_str().is_none() { Err(WalletError::RpcRequestError( "Received result of an unexpected type".to_string(), @@ -838,7 +838,7 @@ fn confirm_transaction( ) -> Result> { let params = json!([signature.to_string()]); let signature_status = - rpc_client.retry_make_rpc_request(1, &RpcRequest::GetSignatureStatus, Some(params), 5)?; + rpc_client.retry_make_rpc_request(&RpcRequest::GetSignatureStatus, Some(params), 5)?; if let Some(status) = signature_status.as_str() { let rpc_status = RpcSignatureStatus::from_str(status).map_err(|_| { WalletError::RpcRequestError("Unable to parse signature status".to_string()) diff --git a/wallet/tests/deploy.rs b/wallet/tests/deploy.rs index c6d03eab3d..21336e0e35 100644 --- a/wallet/tests/deploy.rs +++ b/wallet/tests/deploy.rs @@ -47,7 +47,7 @@ fn test_wallet_deploy_program() { let params = json!([program_id_str]); let account_info = rpc_client - .make_rpc_request(1, RpcRequest::GetAccountInfo, Some(params)) + .make_rpc_request(RpcRequest::GetAccountInfo, Some(params)) .unwrap(); let account_info_obj = account_info.as_object().unwrap(); assert_eq!( diff --git a/wallet/tests/pay.rs b/wallet/tests/pay.rs index c202abd4d6..fb2eba0931 100644 --- a/wallet/tests/pay.rs +++ b/wallet/tests/pay.rs @@ -14,7 +14,7 @@ use std::sync::mpsc::channel; use solana::fullnode::new_fullnode_for_tests; fn check_balance(expected_balance: u64, client: &RpcClient, pubkey: &Pubkey) { - let balance = client.retry_get_balance(1, pubkey, 1).unwrap().unwrap(); + let balance = client.retry_get_balance(pubkey, 1).unwrap().unwrap(); assert_eq!(balance, expected_balance); } diff --git a/wallet/tests/request_airdrop.rs b/wallet/tests/request_airdrop.rs index a59a5ea030..6cb7836e59 100644 --- a/wallet/tests/request_airdrop.rs +++ b/wallet/tests/request_airdrop.rs @@ -24,7 +24,7 @@ fn test_wallet_request_airdrop() { let rpc_client = RpcClient::new_socket(leader_data.rpc); let balance = rpc_client - .retry_get_balance(1, &bob_config.id.pubkey(), 1) + .retry_get_balance(&bob_config.id.pubkey(), 1) .unwrap() .unwrap(); assert_eq!(balance, 50);