diff --git a/src/bin/fullnode.rs b/src/bin/fullnode.rs index 19a6b5c24b..3a3fec1448 100644 --- a/src/bin/fullnode.rs +++ b/src/bin/fullnode.rs @@ -115,9 +115,7 @@ fn main() { eprintln!("processing entries..."); - let mut last_id = entry1.id; for entry in entries { - last_id = entry.id; let results = bank.process_transactions(entry.transactions); for result in results { if let Err(e) = result { @@ -125,7 +123,7 @@ fn main() { exit(1); } } - bank.register_entry_id(&last_id); + bank.register_entry_id(&entry.id); } eprintln!("creating networking stack..."); @@ -166,7 +164,6 @@ fn main() { let file = File::create("leader.log").expect("leader.log create"); let server = Server::new_leader( bank, - last_id, //Some(Duration::from_millis(1000)), None, repl_data.clone(), diff --git a/src/server.rs b/src/server.rs index 1a85320cbd..bc42164f70 100644 --- a/src/server.rs +++ b/src/server.rs @@ -3,7 +3,6 @@ use bank::Bank; use crdt::{Crdt, ReplicatedData}; use data_replicator::DataReplicator; -use hash::Hash; use packet; use rpu::Rpu; use std::io::Write; @@ -23,7 +22,6 @@ pub struct Server { impl Server { pub fn new_leader( bank: Bank, - start_hash: Hash, tick_duration: Option, me: ReplicatedData, requests_socket: UdpSocket, @@ -42,7 +40,6 @@ impl Server { let blob_recycler = packet::BlobRecycler::default(); let tpu = Tpu::new( bank.clone(), - start_hash, tick_duration, transactions_socket, blob_recycler.clone(), diff --git a/src/thin_client.rs b/src/thin_client.rs index 4d079a8041..b1efb58017 100644 --- a/src/thin_client.rs +++ b/src/thin_client.rs @@ -202,7 +202,6 @@ mod tests { let server = Server::new_leader( bank, - alice.last_id(), Some(Duration::from_millis(30)), leader.data.clone(), leader.sockets.requests, @@ -247,7 +246,6 @@ mod tests { let server = Server::new_leader( bank, - alice.last_id(), Some(Duration::from_millis(30)), leader.data.clone(), leader.sockets.requests, diff --git a/src/tpu.rs b/src/tpu.rs index 094de1f11d..8bf0d6f930 100644 --- a/src/tpu.rs +++ b/src/tpu.rs @@ -4,7 +4,6 @@ use bank::Bank; use banking_stage::BankingStage; use fetch_stage::FetchStage; -use hash::Hash; use packet::{BlobRecycler, PacketRecycler}; use record_stage::RecordStage; use sigverify_stage::SigVerifyStage; @@ -25,7 +24,6 @@ pub struct Tpu { impl Tpu { pub fn new( bank: Arc, - start_hash: Hash, tick_duration: Option, transactions_socket: UdpSocket, blob_recycler: BlobRecycler, @@ -49,10 +47,10 @@ impl Tpu { let record_stage = match tick_duration { Some(tick_duration) => RecordStage::new_with_clock( banking_stage.signal_receiver, - &start_hash, + &bank.last_id(), tick_duration, ), - None => RecordStage::new(banking_stage.signal_receiver, &start_hash), + None => RecordStage::new(banking_stage.signal_receiver, &bank.last_id()), }; let write_stage = WriteStage::new( diff --git a/tests/multinode.rs b/tests/multinode.rs index cdadd88ba1..cdb6c86ef7 100644 --- a/tests/multinode.rs +++ b/tests/multinode.rs @@ -106,7 +106,6 @@ fn test_multi_node() { let leader_bank = Bank::new(&alice); let server = Server::new_leader( leader_bank, - alice.last_id(), None, leader.data.clone(), leader.sockets.requests,