Reduce rpc test code (#9413)

automerge

cli/tests/nonce.rs

@@ -1,3 +1,4 @@
+use solana_cli::test_utils::check_balance;
 use solana_cli::{
     cli::{process_command, request_and_confirm_airdrop, CliCommand, CliConfig},
     nonce,
@@ -7,6 +8,7 @@ use solana_cli::{
     },
 };
 use solana_client::rpc_client::RpcClient;
+use solana_core::contact_info::ContactInfo;
 use solana_core::validator::{TestValidator, TestValidatorOptions};
 use solana_faucet::faucet::run_local_faucet;
 use solana_sdk::{
@@ -15,23 +17,11 @@ use solana_sdk::{
     signature::{keypair_from_seed, Keypair, Signer},
     system_program,
 };
-use std::{fs::remove_dir_all, sync::mpsc::channel, thread::sleep, time::Duration};
-
-fn check_balance(expected_balance: u64, client: &RpcClient, pubkey: &Pubkey) {
-    (0..5).for_each(|tries| {
-        let balance = client.retry_get_balance(pubkey, 1).unwrap().unwrap();
-        if balance == expected_balance {
-            return;
-        }
-        if tries == 4 {
-            assert_eq!(balance, expected_balance);
-        }
-        sleep(Duration::from_millis(500));
-    });
-}
+use std::{fs::remove_dir_all, sync::mpsc::channel};
 
 #[test]
 fn test_nonce() {
+    solana_logger::setup();
     let TestValidator {
         server,
         leader_data,
@@ -39,14 +29,8 @@ fn test_nonce() {
         ledger_path,
         ..
     } = TestValidator::run();
-    let (sender, receiver) = channel();
-    run_local_faucet(alice, sender, None);
-    let faucet_addr = receiver.recv().unwrap();
 
-    let rpc_client = RpcClient::new_socket(leader_data.rpc);
-    let json_rpc_url = format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port());
-
-    full_battery_tests(&rpc_client, &faucet_addr, json_rpc_url, None, false);
+    full_battery_tests(leader_data, alice, None, false);
 
     server.close().unwrap();
     remove_dir_all(ledger_path).unwrap();
@@ -61,20 +45,8 @@ fn test_nonce_with_seed() {
         ledger_path,
         ..
     } = TestValidator::run();
-    let (sender, receiver) = channel();
-    run_local_faucet(alice, sender, None);
-    let faucet_addr = receiver.recv().unwrap();
 
-    let rpc_client = RpcClient::new_socket(leader_data.rpc);
-    let json_rpc_url = format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port());
-
-    full_battery_tests(
-        &rpc_client,
-        &faucet_addr,
-        json_rpc_url,
-        Some(String::from("seed")),
-        false,
-    );
+    full_battery_tests(leader_data, alice, Some(String::from("seed")), false);
 
     server.close().unwrap();
     remove_dir_all(ledger_path).unwrap();
@@ -89,6 +61,19 @@ fn test_nonce_with_authority() {
         ledger_path,
         ..
     } = TestValidator::run();
+
+    full_battery_tests(leader_data, alice, None, true);
+
+    server.close().unwrap();
+    remove_dir_all(ledger_path).unwrap();
+}
+
+fn full_battery_tests(
+    leader_data: ContactInfo,
+    alice: Keypair,
+    seed: Option<String>,
+    use_nonce_authority: bool,
+) {
     let (sender, receiver) = channel();
     run_local_faucet(alice, sender, None);
     let faucet_addr = receiver.recv().unwrap();
@@ -96,19 +81,6 @@ fn test_nonce_with_authority() {
     let rpc_client = RpcClient::new_socket(leader_data.rpc);
     let json_rpc_url = format!("http://{}:{}", leader_data.rpc.ip(), leader_data.rpc.port());
 
-    full_battery_tests(&rpc_client, &faucet_addr, json_rpc_url, None, true);
-
-    server.close().unwrap();
-    remove_dir_all(ledger_path).unwrap();
-}
-
-fn full_battery_tests(
-    rpc_client: &RpcClient,
-    faucet_addr: &std::net::SocketAddr,
-    json_rpc_url: String,
-    seed: Option<String>,
-    use_nonce_authority: bool,
-) {
     let mut config_payer = CliConfig::default();
     config_payer.json_rpc_url = json_rpc_url.clone();
     let payer = Keypair::new();

cli/tests/pay.rs

@@ -1,5 +1,6 @@
 use chrono::prelude::*;
 use serde_json::Value;
+use solana_cli::test_utils::check_balance;
 use solana_cli::{
     cli::{process_command, request_and_confirm_airdrop, CliCommand, CliConfig, PayCommand},
     nonce,
@@ -16,20 +17,7 @@ use solana_sdk::{
     pubkey::Pubkey,
     signature::{Keypair, Signer},
 };
-use std::{fs::remove_dir_all, sync::mpsc::channel, thread::sleep, time::Duration};
-
-fn check_balance(expected_balance: u64, client: &RpcClient, pubkey: &Pubkey) {
-    (0..5).for_each(|tries| {
-        let balance = client.retry_get_balance(pubkey, 1).unwrap().unwrap();
-        if balance == expected_balance {
-            return;
-        }
-        if tries == 4 {
-            assert_eq!(balance, expected_balance);
-        }
-        sleep(Duration::from_millis(500));
-    });
-}
+use std::{fs::remove_dir_all, sync::mpsc::channel};
 
 #[test]
 fn test_cli_timestamp_tx() {

cli/tests/stake.rs

@@ -1,3 +1,4 @@
+use solana_cli::test_utils::check_balance;
 use solana_cli::{
     cli::{process_command, request_and_confirm_airdrop, CliCommand, CliConfig},
     nonce,
@@ -19,20 +20,7 @@ use solana_stake_program::{
     stake_instruction::LockupArgs,
     stake_state::{Lockup, StakeAuthorize, StakeState},
 };
-use std::{fs::remove_dir_all, sync::mpsc::channel, thread::sleep, time::Duration};
-
-fn check_balance(expected_balance: u64, client: &RpcClient, pubkey: &Pubkey) {
-    (0..5).for_each(|tries| {
-        let balance = client.retry_get_balance(pubkey, 1).unwrap().unwrap();
-        if balance == expected_balance {
-            return;
-        }
-        if tries == 4 {
-            assert_eq!(balance, expected_balance);
-        }
-        sleep(Duration::from_millis(500));
-    });
-}
+use std::{fs::remove_dir_all, sync::mpsc::channel};
 
 #[test]
 fn test_stake_delegation_force() {

cli/tests/transfer.rs

@@ -1,3 +1,4 @@
+use solana_cli::test_utils::check_balance;
 use solana_cli::{
     cli::{process_command, request_and_confirm_airdrop, CliCommand, CliConfig},
     nonce,
@@ -14,20 +15,7 @@ use solana_sdk::{
     pubkey::Pubkey,
     signature::{keypair_from_seed, Keypair, NullSigner, Signer},
 };
-use std::{fs::remove_dir_all, sync::mpsc::channel, thread::sleep, time::Duration};
-
-fn check_balance(expected_balance: u64, client: &RpcClient, pubkey: &Pubkey) {
-    (0..5).for_each(|tries| {
-        let balance = client.retry_get_balance(pubkey, 1).unwrap().unwrap();
-        if balance == expected_balance {
-            return;
-        }
-        if tries == 4 {
-            assert_eq!(balance, expected_balance);
-        }
-        sleep(Duration::from_millis(500));
-    });
-}
+use std::{fs::remove_dir_all, sync::mpsc::channel};
 
 #[test]
 fn test_transfer() {

cli/tests/vote.rs

@@ -1,4 +1,5 @@
 use solana_cli::cli::{process_command, request_and_confirm_airdrop, CliCommand, CliConfig};
+use solana_cli::test_utils::check_balance;
 use solana_client::rpc_client::RpcClient;
 use solana_core::validator::TestValidator;
 use solana_faucet::faucet::run_local_faucet;
@@ -8,20 +9,7 @@ use solana_sdk::{
     signature::{Keypair, Signer},
 };
 use solana_vote_program::vote_state::{VoteAuthorize, VoteState, VoteStateVersions};
-use std::{fs::remove_dir_all, sync::mpsc::channel, thread::sleep, time::Duration};
-
-fn check_balance(expected_balance: u64, client: &RpcClient, pubkey: &Pubkey) {
-    (0..5).for_each(|tries| {
-        let balance = client.retry_get_balance(pubkey, 1).unwrap().unwrap();
-        if balance == expected_balance {
-            return;
-        }
-        if tries == 4 {
-            assert_eq!(balance, expected_balance);
-        }
-        sleep(Duration::from_millis(500));
-    });
-}
+use std::{fs::remove_dir_all, sync::mpsc::channel};
 
 #[test]
 fn test_vote_authorize_and_withdraw() {