gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add retry_get_balance function

Browse Source 
clients don't need to know about json
This commit is contained in:
Stephen Akridge
2019-02-09 19:51:50 -08:00
committed by sakridge
parent ed4e9febe0
commit 1e58c585d3
5 changed files with 63 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
wallet/tests/pay.rs
View File

@@ -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();

7
wallet/tests/request_airdrop.rs
View File

@@ -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);