various fixes to tests by having additional funds

Author: apfitzge

banks-client/src/lib.rs

@@ -557,7 +557,7 @@ mod tests {
         // It creates a runtime explicitly (no globals via tokio macros) and calls
         // `runtime.block_on()` just once, to run all the async code.
 
-        let genesis = create_genesis_config(10);
+        let genesis = create_genesis_config(10_000_000_000);
         let bank = Bank::new_for_tests(&genesis.genesis_config);
         let slot = bank.slot();
         let block_commitment_cache = Arc::new(RwLock::new(
@@ -596,7 +596,7 @@ mod tests {
         // is processed (or blockhash expires). In this test, we verify the
         // server-side functionality is available to the client.
 
-        let genesis = create_genesis_config(10);
+        let genesis = create_genesis_config(10_000_000_000);
         let bank = Bank::new_for_tests(&genesis.genesis_config);
         let slot = bank.slot();
         let block_commitment_cache = Arc::new(RwLock::new(

bench-tps/tests/bench_tps.rs

@@ -142,7 +142,7 @@ fn test_bench_tps_test_validator(config: Config) {
         .expect("Should build Quic Tpu Client."),
     );
 
-    let lamports_per_account = 1000;
+    let lamports_per_account = 20000;
 
     let keypair_count = config.tx_count * config.keypair_multiplier;
     let keypairs = generate_and_fund_keypairs(

local-cluster/src/integration_tests.rs

@@ -63,7 +63,6 @@ use {
 pub const RUST_LOG_FILTER: &str =
     "error,solana_core::replay_stage=warn,solana_local_cluster=info,local_cluster=info";
 
-pub const DEFAULT_CLUSTER_LAMPORTS: u64 = 10_000_000 * LAMPORTS_PER_SOL;
 pub const DEFAULT_NODE_STAKE: u64 = 10 * LAMPORTS_PER_SOL;
 
 pub fn last_vote_in_tower(tower_path: &Path, node_pubkey: &Pubkey) -> Option<(Slot, Hash)> {
@@ -319,7 +318,6 @@ pub fn run_cluster_partition<C>(
         .map(|stake_weight| 100 * *stake_weight as u64)
         .collect();
     assert_eq!(node_stakes.len(), num_nodes);
-    let cluster_lamports = node_stakes.iter().sum::<u64>() * 2;
     let turbine_disabled = Arc::new(AtomicBool::new(false));
     let mut validator_config = ValidatorConfig {
         turbine_disabled: turbine_disabled.clone(),
@@ -351,7 +349,6 @@ pub fn run_cluster_partition<C>(
 
     let slots_per_epoch = 2048;
     let mut config = ClusterConfig {
-        cluster_lamports,
         node_stakes,
         validator_configs: make_identical_validator_configs(&validator_config, num_nodes),
         validator_keys: Some(
@@ -490,7 +487,6 @@ pub fn test_faulty_node(
     }
 
     let mut cluster_config = ClusterConfig {
-        cluster_lamports: 10_000,
         node_stakes,
         validator_configs,
         validator_keys: Some(validator_keys.clone()),

local-cluster/src/local_cluster.rs

@@ -35,6 +35,7 @@ use {
         epoch_schedule::EpochSchedule,
         genesis_config::{ClusterType, GenesisConfig},
         message::Message,
+        native_token::LAMPORTS_PER_SOL,
         poh_config::PohConfig,
         pubkey::Pubkey,
         signature::{Keypair, Signature, Signer},
@@ -69,6 +70,7 @@ use {
 };
 
 const DUMMY_SNAPSHOT_CONFIG_PATH_MARKER: &str = "dummy";
+pub const DEFAULT_CLUSTER_LAMPORTS: u64 = 10_000_000 * LAMPORTS_PER_SOL;
 
 pub struct ClusterConfig {
     /// The validator config that should be applied to every node in the cluster
@@ -126,7 +128,7 @@ impl Default for ClusterConfig {
             validator_keys: None,
             node_stakes: vec![],
             node_vote_keys: None,
-            cluster_lamports: 0,
+            cluster_lamports: DEFAULT_CLUSTER_LAMPORTS,
             ticks_per_slot: DEFAULT_TICKS_PER_SLOT,
             slots_per_epoch: DEFAULT_DEV_SLOTS_PER_EPOCH,
             stakers_slot_offset: DEFAULT_DEV_SLOTS_PER_EPOCH,
@@ -745,12 +747,21 @@ impl LocalCluster {
         dest_pubkey: &Pubkey,
         lamports: u64,
     ) -> u64 {
-        trace!("getting current balance");
-        let current_balance = client
+        trace!("getting current balances");
+        let current_source_balance = client
+            .rpc_client()
+            .get_balance_with_commitment(&source_keypair.pubkey(), CommitmentConfig::processed())
+            .unwrap()
+            .value;
+        let current_dest_balance = client
             .rpc_client()
             .get_balance_with_commitment(dest_pubkey, CommitmentConfig::processed())
             .unwrap()
             .value;
+        assert!(
+            current_source_balance >= lamports + 5_000,
+            "{current_source_balance} {lamports}"
+        );
         trace!("getting leader blockhash");
         let (blockhash, _) = client
             .rpc_client()
@@ -762,7 +773,7 @@ impl LocalCluster {
             lamports,
             source_keypair.pubkey(),
             *dest_pubkey,
-            current_balance
+            current_dest_balance
         );
 
         LocalCluster::send_transaction_with_retries(client, &[source_keypair], &mut tx, 10, 0)
@@ -771,7 +782,7 @@ impl LocalCluster {
             .rpc_client()
             .wait_for_balance_with_commitment(
                 dest_pubkey,
-                Some(lamports + current_balance),
+                Some(lamports + current_dest_balance),
                 CommitmentConfig::processed(),
             )
             .expect("get balance should succeed")

local-cluster/tests/local_cluster.rs

@@ -41,9 +41,9 @@ use {
             run_cluster_partition, run_kill_partition_switch_threshold, save_tower,
             setup_snapshot_validator_config, test_faulty_node, wait_for_duplicate_proof,
             wait_for_last_vote_in_tower_to_land_in_ledger, SnapshotValidatorConfig,
-            ValidatorTestConfig, DEFAULT_CLUSTER_LAMPORTS, DEFAULT_NODE_STAKE, RUST_LOG_FILTER,
+            ValidatorTestConfig, DEFAULT_NODE_STAKE, RUST_LOG_FILTER,
         },
-        local_cluster::{ClusterConfig, LocalCluster},
+        local_cluster::{ClusterConfig, LocalCluster, DEFAULT_CLUSTER_LAMPORTS},
         validator_configs::*,
     },
     solana_pubsub_client::pubsub_client::PubsubClient,