Use struct to pass all Tpu sockets as one argument to Tpu::new() (#21965)
Tpu::new() now matches Tvu::new() in having struct to reduce argument list. Additionally, Rust supports partial moves, so there is no need to clone the Tvu sockets out of Node object.
This commit is contained in:
@@ -17,8 +17,8 @@ use {
|
||||
stats_reporter_service::StatsReporterService,
|
||||
system_monitor_service::{verify_udp_stats_access, SystemMonitorService},
|
||||
tower_storage::TowerStorage,
|
||||
tpu::{Tpu, DEFAULT_TPU_COALESCE_MS},
|
||||
tvu::{Sockets, Tvu, TvuConfig},
|
||||
tpu::{Tpu, TpuSockets, DEFAULT_TPU_COALESCE_MS},
|
||||
tvu::{Tvu, TvuConfig, TvuSockets},
|
||||
},
|
||||
crossbeam_channel::{bounded, unbounded},
|
||||
rand::{thread_rng, Rng},
|
||||
@@ -822,35 +822,12 @@ impl Validator {
|
||||
authorized_voter_keypairs,
|
||||
&bank_forks,
|
||||
&cluster_info,
|
||||
Sockets {
|
||||
repair: node
|
||||
.sockets
|
||||
.repair
|
||||
.try_clone()
|
||||
.expect("Failed to clone repair socket"),
|
||||
retransmit: node
|
||||
.sockets
|
||||
.retransmit_sockets
|
||||
.iter()
|
||||
.map(|s| s.try_clone().expect("Failed to clone retransmit socket"))
|
||||
.collect(),
|
||||
fetch: node
|
||||
.sockets
|
||||
.tvu
|
||||
.iter()
|
||||
.map(|s| s.try_clone().expect("Failed to clone TVU Sockets"))
|
||||
.collect(),
|
||||
forwards: node
|
||||
.sockets
|
||||
.tvu_forwards
|
||||
.iter()
|
||||
.map(|s| s.try_clone().expect("Failed to clone TVU forwards Sockets"))
|
||||
.collect(),
|
||||
ancestor_hashes_requests: node
|
||||
.sockets
|
||||
.ancestor_hashes_requests
|
||||
.try_clone()
|
||||
.expect("Failed to clone ancestor_hashes_requests socket"),
|
||||
TvuSockets {
|
||||
repair: node.sockets.repair,
|
||||
retransmit: node.sockets.retransmit_sockets,
|
||||
fetch: node.sockets.tvu,
|
||||
forwards: node.sockets.tvu_forwards,
|
||||
ancestor_hashes_requests: node.sockets.ancestor_hashes_requests,
|
||||
},
|
||||
blockstore.clone(),
|
||||
ledger_signal_receiver,
|
||||
@@ -902,10 +879,12 @@ impl Validator {
|
||||
&poh_recorder,
|
||||
entry_receiver,
|
||||
retransmit_slots_receiver,
|
||||
node.sockets.tpu,
|
||||
node.sockets.tpu_forwards,
|
||||
node.sockets.tpu_vote,
|
||||
node.sockets.broadcast,
|
||||
TpuSockets {
|
||||
transactions: node.sockets.tpu,
|
||||
transaction_forwards: node.sockets.tpu_forwards,
|
||||
vote: node.sockets.tpu_vote,
|
||||
broadcast: node.sockets.broadcast,
|
||||
},
|
||||
&rpc_subscriptions,
|
||||
transaction_status_sender,
|
||||
&blockstore,
|
||||
|
Reference in New Issue
Block a user