From acef7baab6883371703dca933de078e363b25976 Mon Sep 17 00:00:00 2001
From: Tao Zhu <82401714+taozhu-chicago@users.noreply.github.com>
Date: Fri, 19 Jan 2024 12:14:31 -0600
Subject: [PATCH] harden cli tests (#34844)

harden cli tests by setting up TestValidator correctly
---
 cli/tests/nonce.rs    |  2 +-
 cli/tests/stake.rs    |  2 +-
 cli/tests/transfer.rs | 17 +++++++++--------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/cli/tests/nonce.rs b/cli/tests/nonce.rs
index c5a2bcbb2..965753fc0 100644
--- a/cli/tests/nonce.rs
+++ b/cli/tests/nonce.rs
@@ -249,7 +249,7 @@ fn test_create_account_with_seed() {
     let faucet_addr = run_local_faucet(mint_keypair, None);
     let test_validator = TestValidator::with_custom_fees(
         mint_pubkey,
-        1,
+        sol_to_lamports(ONE_SIG_FEE),
         Some(faucet_addr),
         SocketAddrSpace::Unspecified,
     );
diff --git a/cli/tests/stake.rs b/cli/tests/stake.rs
index 5984e1d0c..ecaf5a737 100644
--- a/cli/tests/stake.rs
+++ b/cli/tests/stake.rs
@@ -1276,7 +1276,7 @@ fn test_stake_authorize_with_fee_payer() {
     let faucet_addr = run_local_faucet(mint_keypair, None);
     let test_validator = TestValidator::with_custom_fees(
         mint_pubkey,
-        1,
+        fee_one_sig,
         Some(faucet_addr),
         SocketAddrSpace::Unspecified,
     );
diff --git a/cli/tests/transfer.rs b/cli/tests/transfer.rs
index 7270a2c7e..f75ca5226 100644
--- a/cli/tests/transfer.rs
+++ b/cli/tests/transfer.rs
@@ -34,7 +34,7 @@ fn test_transfer() {
     let faucet_addr = run_local_faucet(mint_keypair, None);
     let test_validator = TestValidator::with_custom_fees(
         mint_pubkey,
-        1,
+        fee_one_sig,
         Some(faucet_addr),
         SocketAddrSpace::Unspecified,
     );
@@ -325,13 +325,14 @@ fn test_transfer() {
 #[test]
 fn test_transfer_multisession_signing() {
     solana_logger::setup();
-    let fee = FeeStructure::default().get_max_fee(2, 0);
+    let fee_one_sig = FeeStructure::default().get_max_fee(1, 0);
+    let fee_two_sig = FeeStructure::default().get_max_fee(2, 0);
     let mint_keypair = Keypair::new();
     let mint_pubkey = mint_keypair.pubkey();
     let faucet_addr = run_local_faucet(mint_keypair, None);
     let test_validator = TestValidator::with_custom_fees(
         mint_pubkey,
-        1,
+        fee_one_sig,
         Some(faucet_addr),
         SocketAddrSpace::Unspecified,
     );
@@ -355,7 +356,7 @@ fn test_transfer_multisession_signing() {
         &rpc_client,
         &CliConfig::recent_for_tests(),
         &offline_fee_payer_signer.pubkey(),
-        sol_to_lamports(1.0) + 2 * fee,
+        sol_to_lamports(1.0) + 2 * fee_two_sig,
     )
     .unwrap();
     check_balance!(
@@ -364,7 +365,7 @@ fn test_transfer_multisession_signing() {
         &offline_from_signer.pubkey(),
     );
     check_balance!(
-        sol_to_lamports(1.0) + 2 * fee,
+        sol_to_lamports(1.0) + 2 * fee_two_sig,
         &rpc_client,
         &offline_fee_payer_signer.pubkey(),
     );
@@ -467,7 +468,7 @@ fn test_transfer_multisession_signing() {
         &offline_from_signer.pubkey(),
     );
     check_balance!(
-        sol_to_lamports(1.0) + fee,
+        sol_to_lamports(1.0) + fee_two_sig,
         &rpc_client,
         &offline_fee_payer_signer.pubkey(),
     );
@@ -483,7 +484,7 @@ fn test_transfer_all() {
     let faucet_addr = run_local_faucet(mint_keypair, None);
     let test_validator = TestValidator::with_custom_fees(
         mint_pubkey,
-        1,
+        fee,
         Some(faucet_addr),
         SocketAddrSpace::Unspecified,
     );
@@ -592,7 +593,7 @@ fn test_transfer_with_seed() {
     let faucet_addr = run_local_faucet(mint_keypair, None);
     let test_validator = TestValidator::with_custom_fees(
         mint_pubkey,
-        1,
+        fee,
         Some(faucet_addr),
         SocketAddrSpace::Unspecified,
     );