diff --git a/src/fullnode.rs b/src/fullnode.rs index 0fa5a3019f..d3d440520e 100644 --- a/src/fullnode.rs +++ b/src/fullnode.rs @@ -81,13 +81,10 @@ pub struct Fullnode { bank: Arc, crdt: Arc>, ledger_path: String, - sigverify_disabled: bool, shared_window: window::SharedWindow, replicate_socket: Vec, repair_socket: UdpSocket, retransmit_socket: UdpSocket, - transaction_sockets: Vec, - broadcast_socket: UdpSocket, requests_socket: UdpSocket, respond_socket: UdpSocket, } @@ -348,7 +345,6 @@ impl Fullnode { crdt, shared_window, bank, - sigverify_disabled, rpu, ncp, rpc_service, @@ -358,8 +354,6 @@ impl Fullnode { replicate_socket: node.sockets.replicate, repair_socket: node.sockets.repair, retransmit_socket: node.sockets.retransmit, - transaction_sockets: node.sockets.transaction, - broadcast_socket: node.sockets.broadcast, requests_socket: node.sockets.requests, respond_socket: node.sockets.respond, } diff --git a/src/write_stage.rs b/src/write_stage.rs index 1515ae7807..f251201e52 100644 --- a/src/write_stage.rs +++ b/src/write_stage.rs @@ -307,7 +307,7 @@ mod tests { my_id: Pubkey, write_stage: WriteStage, entry_sender: Sender>, - write_stage_entry_receiver: Receiver>, + _write_stage_entry_receiver: Receiver>, crdt: Arc>, bank: Arc, leader_ledger_path: String, @@ -345,7 +345,7 @@ mod tests { let (entry_sender, entry_receiver) = channel(); // Start up the write stage - let (write_stage, write_stage_entry_receiver) = WriteStage::new( + let (write_stage, _write_stage_entry_receiver) = WriteStage::new( leader_keypair, bank.clone(), crdt.clone(), @@ -358,7 +358,9 @@ mod tests { my_id, write_stage, entry_sender, - write_stage_entry_receiver, + // Need to keep this alive, otherwise the write_stage will detect ChannelClosed + // and shut down + _write_stage_entry_receiver, crdt, bank, leader_ledger_path,