Skip to content

Commit

Permalink
merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
lijunwangs committed Dec 12, 2024
1 parent 1a1c035 commit be439f9
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions core/src/voting_service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,16 @@ impl VotingService {

if !upcoming_leader_sockets.is_empty() {
for tpu_vote_socket in upcoming_leader_sockets {
let _ = cluster_info.send_transaction(vote_op.tx(), Some(tpu_vote_socket));
let _ = send_vote_transaction(
cluster_info,
vote_op.tx(),
Some(tpu_vote_socket),
&connection_cache,
);
}
} else {
// Send to our own tpu vote socket if we cannot find a leader to send to
let _ = cluster_info.send_transaction(vote_op.tx(), None);
let _ = send_vote_transaction(cluster_info, vote_op.tx(), None, &connection_cache);
}

match vote_op {
Expand Down

0 comments on commit be439f9

Please sign in to comment.