From 1e58c585d3c5b11a8992c1e4955e1cef1ca022af Mon Sep 17 00:00:00 2001 From: Stephen Akridge Date: Sat, 9 Feb 2019 19:51:50 -0800 Subject: [PATCH] Add retry_get_balance function clients don't need to know about json --- src/rpc_mock.rs | 13 +++++++ src/rpc_request.rs | 31 +++++++++------ wallet/src/wallet.rs | 30 +++----------- wallet/tests/pay.rs | 69 +++++++++++---------------------- wallet/tests/request_airdrop.rs | 7 +--- 5 files changed, 63 insertions(+), 87 deletions(-) diff --git a/src/rpc_mock.rs b/src/rpc_mock.rs index ceeb0a4ae..eda4a3e69 100644 --- a/src/rpc_mock.rs +++ b/src/rpc_mock.rs @@ -25,6 +25,19 @@ impl MockRpcClient { MockRpcClient { addr } } + 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)? + .as_u64(); + Ok(res) + } + pub fn retry_make_rpc_request( &self, _id: u64, diff --git a/src/rpc_request.rs b/src/rpc_request.rs index 4eb30b5cf..04c2666f1 100644 --- a/src/rpc_request.rs +++ b/src/rpc_request.rs @@ -6,6 +6,8 @@ use std::thread::sleep; use std::time::Duration; use std::{error, fmt}; +use solana_sdk::pubkey::Pubkey; + #[derive(Clone)] pub struct RpcClient { pub client: reqwest::Client, @@ -33,6 +35,19 @@ impl RpcClient { Self::new(get_rpc_request_str(addr, false)) } + 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)? + .as_u64(); + Ok(res) + } + pub fn retry_make_rpc_request( &self, id: u64, @@ -191,21 +206,13 @@ mod tests { #[test] fn test_build_request_json() { let test_request = RpcRequest::GetAccountInfo; - let request = test_request.build_request_json( - 1, - Some(json!(["deadbeefXjn8o3yroDHxUtKsZZgoy4GPkPPXfouKNHhx"])), - ); + let addr = json!(["deadbeefXjn8o3yroDHxUtKsZZgoy4GPkPPXfouKNHhx"]); + let request = test_request.build_request_json(1, Some(addr.clone())); assert_eq!(request["method"], "getAccountInfo"); - assert_eq!( - request["params"], - json!(["deadbeefXjn8o3yroDHxUtKsZZgoy4GPkPPXfouKNHhx"]) - ); + assert_eq!(request["params"], addr,); let test_request = RpcRequest::GetBalance; - let request = test_request.build_request_json( - 1, - Some(json!(["deadbeefXjn8o3yroDHxUtKsZZgoy4GPkPPXfouKNHhx"])), - ); + let request = test_request.build_request_json(1, Some(addr)); assert_eq!(request["method"], "getBalance"); let test_request = RpcRequest::GetConfirmationTime; diff --git a/wallet/src/wallet.rs b/wallet/src/wallet.rs index c7cfe6acb..410c39865 100644 --- a/wallet/src/wallet.rs +++ b/wallet/src/wallet.rs @@ -325,11 +325,7 @@ fn process_airdrop( "Requesting airdrop of {:?} tokens from {}", tokens, drone_addr ); - let params = json!([format!("{}", config.id.pubkey())]); - let previous_balance = match rpc_client - .retry_make_rpc_request(1, &RpcRequest::GetBalance, Some(params), 5)? - .as_u64() - { + let previous_balance = match rpc_client.retry_get_balance(1, config.id.pubkey(), 5)? { Some(tokens) => tokens, None => Err(WalletError::RpcRequestError( "Received result of an unexpected type".to_string(), @@ -338,10 +334,8 @@ fn process_airdrop( request_and_confirm_airdrop(&rpc_client, &drone_addr, &config.id, tokens)?; - let params = json!([format!("{}", config.id.pubkey())]); let current_balance = rpc_client - .retry_make_rpc_request(1, &RpcRequest::GetBalance, Some(params), 5)? - .as_u64() + .retry_get_balance(1, config.id.pubkey(), 5)? .unwrap_or(previous_balance); if current_balance < previous_balance { @@ -361,10 +355,7 @@ fn process_airdrop( } fn process_balance(config: &WalletConfig, rpc_client: &RpcClient) -> ProcessResult { - let params = json!([format!("{}", config.id.pubkey())]); - let balance = rpc_client - .retry_make_rpc_request(1, &RpcRequest::GetBalance, Some(params), 5)? - .as_u64(); + let balance = rpc_client.retry_get_balance(1, config.id.pubkey(), 5)?; match balance { Some(0) => Ok("No account found! Request an airdrop to get started.".to_string()), Some(tokens) => Ok(format!("Your balance is: {:?}", tokens)), @@ -398,10 +389,7 @@ fn process_deploy( config: &WalletConfig, program_location: &str, ) -> ProcessResult { - let params = json!([format!("{}", config.id.pubkey())]); - let balance = rpc_client - .retry_make_rpc_request(1, &RpcRequest::GetBalance, Some(params), 5)? - .as_u64(); + let balance = rpc_client.retry_get_balance(1, config.id.pubkey(), 5)?; if let Some(tokens) = balance { if tokens < 1 { Err(WalletError::DynamicProgramError( @@ -626,10 +614,7 @@ fn process_time_elapsed( pubkey: Pubkey, dt: DateTime, ) -> ProcessResult { - let params = json!([format!("{}", config.id.pubkey())]); - let balance = rpc_client - .retry_make_rpc_request(1, &RpcRequest::GetBalance, Some(params), 5)? - .as_u64(); + let balance = rpc_client.retry_get_balance(1, config.id.pubkey(), 5)?; if let Some(0) = balance { request_and_confirm_airdrop(&rpc_client, &drone_addr, &config.id, 1)?; @@ -650,10 +635,7 @@ fn process_witness( to: Pubkey, pubkey: Pubkey, ) -> ProcessResult { - let params = json!([format!("{}", config.id.pubkey())]); - let balance = rpc_client - .retry_make_rpc_request(1, &RpcRequest::GetBalance, Some(params), 5)? - .as_u64(); + let balance = rpc_client.retry_get_balance(1, config.id.pubkey(), 5)?; if let Some(0) = balance { request_and_confirm_airdrop(&rpc_client, &drone_addr, &config.id, 1)?; diff --git a/wallet/tests/pay.rs b/wallet/tests/pay.rs index f83e31673..65f24ae18 100644 --- a/wallet/tests/pay.rs +++ b/wallet/tests/pay.rs @@ -1,6 +1,6 @@ use chrono::prelude::*; -use serde_json::{json, Value}; -use solana::rpc_request::{RpcClient, RpcRequest, RpcRequestHandler}; +use serde_json::Value; +use solana::rpc_request::RpcClient; use solana_drone::drone::run_local_drone; use solana_sdk::pubkey::Pubkey; use solana_sdk::signature::{Keypair, KeypairUtil}; @@ -13,12 +13,8 @@ use std::sync::mpsc::channel; #[cfg(test)] use solana::thin_client::new_fullnode; -fn check_balance(expected_balance: u64, client: &RpcClient, params: Value) { - let balance = client - .make_rpc_request(1, RpcRequest::GetBalance, Some(params)) - .unwrap() - .as_u64() - .unwrap(); +fn check_balance(expected_balance: u64, client: &RpcClient, pubkey: Pubkey) { + let balance = client.retry_get_balance(1, pubkey, 1).unwrap().unwrap(); assert_eq!(balance, expected_balance); } @@ -45,8 +41,7 @@ fn test_wallet_timestamp_tx() { assert_ne!(config_payer.id.pubkey(), config_witness.id.pubkey()); request_and_confirm_airdrop(&rpc_client, &drone_addr, &config_payer.id, 50).unwrap(); - let params = json!([format!("{}", config_payer.id.pubkey())]); - check_balance(50, &rpc_client, params); + check_balance(50, &rpc_client, config_payer.id.pubkey()); // Make transaction (from config_payer to bob_pubkey) requiring timestamp from config_witness let date_string = "\"2018-09-19T17:30:59Z\""; @@ -68,23 +63,17 @@ fn test_wallet_timestamp_tx() { .expect("base58-encoded public key"); let process_id = Pubkey::new(&process_id_vec); - let params = json!([format!("{}", config_payer.id.pubkey())]); - check_balance(39, &rpc_client, params); // config_payer balance - let params = json!([format!("{}", process_id)]); - check_balance(11, &rpc_client, params); // contract balance - let params = json!([format!("{}", bob_pubkey)]); - check_balance(0, &rpc_client, params); // recipient balance + check_balance(39, &rpc_client, config_payer.id.pubkey()); // config_payer balance + check_balance(11, &rpc_client, process_id); // contract balance + check_balance(0, &rpc_client, bob_pubkey); // recipient balance // Sign transaction by config_witness config_witness.command = WalletCommand::TimeElapsed(bob_pubkey, process_id, dt); process_command(&config_witness).unwrap(); - let params = json!([format!("{}", config_payer.id.pubkey())]); - check_balance(39, &rpc_client, params); // config_payer balance - let params = json!([format!("{}", process_id)]); - check_balance(1, &rpc_client, params); // contract balance - let params = json!([format!("{}", bob_pubkey)]); - check_balance(10, &rpc_client, params); // recipient balance + check_balance(39, &rpc_client, config_payer.id.pubkey()); // config_payer balance + check_balance(1, &rpc_client, process_id); // contract balance + check_balance(10, &rpc_client, bob_pubkey); // recipient balance server_exit(); remove_dir_all(ledger_path).unwrap(); @@ -132,23 +121,17 @@ fn test_wallet_witness_tx() { .expect("base58-encoded public key"); let process_id = Pubkey::new(&process_id_vec); - let params = json!([format!("{}", config_payer.id.pubkey())]); - check_balance(39, &rpc_client, params); // config_payer balance - let params = json!([format!("{}", process_id)]); - check_balance(11, &rpc_client, params); // contract balance - let params = json!([format!("{}", bob_pubkey)]); - check_balance(0, &rpc_client, params); // recipient balance + check_balance(39, &rpc_client, config_payer.id.pubkey()); // config_payer balance + check_balance(11, &rpc_client, process_id); // contract balance + check_balance(0, &rpc_client, bob_pubkey); // recipient balance // Sign transaction by config_witness config_witness.command = WalletCommand::Witness(bob_pubkey, process_id); process_command(&config_witness).unwrap(); - let params = json!([format!("{}", config_payer.id.pubkey())]); - check_balance(39, &rpc_client, params); // config_payer balance - let params = json!([format!("{}", process_id)]); - check_balance(1, &rpc_client, params); // contract balance - let params = json!([format!("{}", bob_pubkey)]); - check_balance(10, &rpc_client, params); // recipient balance + check_balance(39, &rpc_client, config_payer.id.pubkey()); // config_payer balance + check_balance(1, &rpc_client, process_id); // contract balance + check_balance(10, &rpc_client, bob_pubkey); // recipient balance server_exit(); remove_dir_all(ledger_path).unwrap(); @@ -196,23 +179,17 @@ fn test_wallet_cancel_tx() { .expect("base58-encoded public key"); let process_id = Pubkey::new(&process_id_vec); - let params = json!([format!("{}", config_payer.id.pubkey())]); - check_balance(39, &rpc_client, params); // config_payer balance - let params = json!([format!("{}", process_id)]); - check_balance(11, &rpc_client, params); // contract balance - let params = json!([format!("{}", bob_pubkey)]); - check_balance(0, &rpc_client, params); // recipient balance + check_balance(39, &rpc_client, config_payer.id.pubkey()); // config_payer balance + check_balance(11, &rpc_client, process_id); // contract balance + check_balance(0, &rpc_client, bob_pubkey); // recipient balance // Sign transaction by config_witness config_payer.command = WalletCommand::Cancel(process_id); process_command(&config_payer).unwrap(); - let params = json!([format!("{}", config_payer.id.pubkey())]); - check_balance(49, &rpc_client, params); // config_payer balance - let params = json!([format!("{}", process_id)]); - check_balance(1, &rpc_client, params); // contract balance - let params = json!([format!("{}", bob_pubkey)]); - check_balance(0, &rpc_client, params); // recipient balance + check_balance(49, &rpc_client, config_payer.id.pubkey()); // config_payer balance + check_balance(1, &rpc_client, process_id); // contract balance + check_balance(0, &rpc_client, bob_pubkey); // recipient balance server_exit(); remove_dir_all(ledger_path).unwrap(); diff --git a/wallet/tests/request_airdrop.rs b/wallet/tests/request_airdrop.rs index 16fe50530..f938394ca 100644 --- a/wallet/tests/request_airdrop.rs +++ b/wallet/tests/request_airdrop.rs @@ -1,5 +1,4 @@ -use serde_json::json; -use solana::rpc_request::{RpcClient, RpcRequest, RpcRequestHandler}; +use solana::rpc_request::RpcClient; use solana::thin_client::new_fullnode; use solana_drone::drone::run_local_drone; use solana_sdk::signature::KeypairUtil; @@ -25,11 +24,9 @@ fn test_wallet_request_airdrop() { let rpc_client = RpcClient::new_from_socket(leader_data.rpc); - let params = json!([format!("{}", bob_config.id.pubkey())]); let balance = rpc_client - .make_rpc_request(1, RpcRequest::GetBalance, Some(params)) + .retry_get_balance(1, bob_config.id.pubkey(), 1) .unwrap() - .as_u64() .unwrap(); assert_eq!(balance, 50);