send transaction just to upcoming leaders

anza-xyz · Jun 12, 2024 · 3d3f905 · 3d3f905
1 parent 8a1d35b
commit 3d3f905
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 20 deletions.
diff --git a/local-cluster/src/cluster_tests.rs b/local-cluster/src/cluster_tests.rs
@@ -104,7 +104,7 @@ pub fn spend_and_verify_all_nodes<S: ::std::hash::BuildHasher + Sync + Send>(
         let transaction =
             system_transaction::transfer(funding_keypair, &random_keypair.pubkey(), 1, blockhash);
         let confs = VOTE_THRESHOLD_DEPTH + 1;
-        let sig = client
+        client
             .send_transaction_to_upcoming_leaders(&transaction)
             .unwrap();
         for validator in &cluster_nodes {
@@ -114,7 +114,7 @@ pub fn spend_and_verify_all_nodes<S: ::std::hash::BuildHasher + Sync + Send>(
             let client = new_tpu_quic_client(ingress_node, connection_cache.clone()).unwrap();
             client
                 .rpc_client()
-                .poll_for_signature_confirmation(&sig, confs)
+                .poll_for_signature_confirmation(&transaction.signatures[0], confs)
                 .unwrap();
         }
     });
@@ -300,23 +300,16 @@ pub fn kill_entry_and_spend_and_verify_rest(
             );
 
             let confs = VOTE_THRESHOLD_DEPTH + 1;
-            let sig = {
-                let sig = client.send_transaction_to_upcoming_leaders(&transaction);
-                match sig {
-                    Err(e) => {
-                        result = Err(e);
-                        continue;
-                    }
-
-                    Ok(sig) => sig,
-                }
-            };
+            if let Err(e) = client.send_transaction_to_upcoming_leaders(&transaction) {
+                result = Err(e);
+                continue;
+            }
             info!("poll_all_nodes_for_signature()");
             match poll_all_nodes_for_signature(
                 entry_point_info,
                 &cluster_nodes,
                 connection_cache,
-                &sig,
+                &transaction.signatures[0],
                 confs,
             ) {
                 Err(e) => {

diff --git a/local-cluster/src/local_cluster.rs b/local-cluster/src/local_cluster.rs
@@ -28,22 +28,21 @@ use {
     },
     solana_sdk::{
         account::{Account, AccountSharedData},
-        clock::{Slot, DEFAULT_DEV_SLOTS_PER_EPOCH, DEFAULT_TICKS_PER_SLOT, MAX_PROCESSING_AGE},
+        clock::{Slot, DEFAULT_DEV_SLOTS_PER_EPOCH, DEFAULT_TICKS_PER_SLOT},
         commitment_config::CommitmentConfig,
         epoch_schedule::EpochSchedule,
         feature_set,
         genesis_config::{ClusterType, GenesisConfig},
         message::Message,
         poh_config::PohConfig,
         pubkey::Pubkey,
-        signature::{Keypair, Signature, Signer},
+        signature::{Keypair, Signer},
         stake::{
             instruction as stake_instruction,
             state::{Authorized, Lockup},
         },
         system_transaction,
         transaction::Transaction,
-        transport::TransportError,
     },
     solana_stake_program::stake_state,
     solana_streamer::{socket::SocketAddrSpace, streamer::StakedNodes},
@@ -62,7 +61,6 @@ use {
         net::{IpAddr, Ipv4Addr, UdpSocket},
         path::{Path, PathBuf},
         sync::{Arc, RwLock},
-        time::Instant,
     },
 };
 

diff --git a/tpu-client/src/tpu_client.rs b/tpu-client/src/tpu_client.rs
@@ -111,7 +111,7 @@ where
     pub fn send_transaction_to_upcoming_leaders(
         &self,
         transaction: &Transaction,
-    ) -> TransportResult<Signature> {
+    ) -> TransportResult<()> {
         let wire_transaction =
             bincode::serialize(&transaction).expect("should serialize transaction");
 
@@ -126,7 +126,7 @@ where
             conn.send_data_async(wire_transaction.clone())?;
         }
 
-        Ok(transaction.signatures[0])
+        Ok(())
     }
 
     /// Serialize and send a batch of transactions to the current and upcoming leader TPUs according