From 8f0aa956a3ba7b1b06f829ce5a2a3f741def5b57 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Fri, 8 Mar 2019 11:05:00 -0800
Subject: [PATCH] bench-tps no longer cares who the leader is

---
 bench-tps/src/bench.rs | 10 +++++-----
 bench-tps/src/main.rs  | 18 ++++++------------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/bench-tps/src/bench.rs b/bench-tps/src/bench.rs
index 22fa23876..a1048eb88 100644
--- a/bench-tps/src/bench.rs
+++ b/bench-tps/src/bench.rs
@@ -179,9 +179,9 @@ pub fn generate_txs(
     dest: &[Keypair],
     threads: usize,
     reclaim: bool,
-    leader: &NodeInfo,
+    node_info: &NodeInfo,
 ) {
-    let mut client = mk_client(leader);
+    let mut client = mk_client(node_info);
     let blockhash = client.get_recent_blockhash();
     let tx_count = source.len();
     println!("Signing transactions... {} (reclaim={})", tx_count, reclaim);
@@ -236,12 +236,12 @@ pub fn generate_txs(
 pub fn do_tx_transfers(
     exit_signal: &Arc<AtomicBool>,
     shared_txs: &SharedTransactions,
-    leader: &NodeInfo,
+    node_info: &NodeInfo,
     shared_tx_thread_count: &Arc<AtomicIsize>,
     total_tx_sent_count: &Arc<AtomicUsize>,
     thread_batch_sleep_ms: usize,
 ) {
-    let client = mk_client(&leader);
+    let client = mk_client(&node_info);
     loop {
         if thread_batch_sleep_ms > 0 {
             sleep(Duration::from_millis(thread_batch_sleep_ms as u64));
@@ -256,7 +256,7 @@ pub fn do_tx_transfers(
             println!(
                 "Transferring 1 unit {} times... to {}",
                 txs0.len(),
-                leader.tpu
+                node_info.tpu
             );
             let tx_len = txs0.len();
             let transfer_start = Instant::now();
diff --git a/bench-tps/src/main.rs b/bench-tps/src/main.rs
index 5f764d937..2473a1644 100644
--- a/bench-tps/src/main.rs
+++ b/bench-tps/src/main.rs
@@ -40,7 +40,7 @@ fn main() {
     } = cfg;
 
     let cluster_entrypoint = ContactInfo::new_entry_point(&network);
-    let (leader, nodes) = discover(&cluster_entrypoint, num_nodes).unwrap_or_else(|err| {
+    let (_leader, nodes) = discover(&cluster_entrypoint, num_nodes).unwrap_or_else(|err| {
         eprintln!("Failed to discover {} nodes: {:?}", num_nodes, err);
         exit(1);
     });
@@ -59,18 +59,12 @@ fn main() {
         exit(1);
     }
 
-    if leader.is_none() {
-        eprintln!("Error: No leader");
-        exit(1);
-    }
-
     if converge_only {
         return;
     }
 
-    let leader = leader.unwrap();
-    let mut client = mk_client(&leader);
-    let mut barrier_client = mk_client(&leader);
+    let mut client = mk_client(&cluster_entrypoint);
+    let mut barrier_client = mk_client(&cluster_entrypoint);
 
     let mut seed = [0u8; 32];
     seed.copy_from_slice(&id.public_key_bytes()[..32]);
@@ -144,7 +138,7 @@ fn main() {
         .map(|_| {
             let exit_signal = exit_signal.clone();
             let shared_txs = shared_txs.clone();
-            let leader = leader.clone();
+            let cluster_entrypoint = cluster_entrypoint.clone();
             let shared_tx_active_thread_count = shared_tx_active_thread_count.clone();
             let total_tx_sent_count = total_tx_sent_count.clone();
             Builder::new()
@@ -153,7 +147,7 @@ fn main() {
                     do_tx_transfers(
                         &exit_signal,
                         &shared_txs,
-                        &leader,
+                        &cluster_entrypoint,
                         &shared_tx_active_thread_count,
                         &total_tx_sent_count,
                         thread_batch_sleep_ms,
@@ -181,7 +175,7 @@ fn main() {
             &keypairs[len..],
             threads,
             reclaim_lamports_back_to_source_account,
-            &leader,
+            &cluster_entrypoint,
         );
         // In sustained mode overlap the transfers with generation
         // this has higher average performance but lower peak performance