Initialize recorder from bank's last_id
This commit is contained in:
parent
30c8fa46b4
commit
60609a44ba
|
@ -115,9 +115,7 @@ fn main() {
|
||||||
|
|
||||||
eprintln!("processing entries...");
|
eprintln!("processing entries...");
|
||||||
|
|
||||||
let mut last_id = entry1.id;
|
|
||||||
for entry in entries {
|
for entry in entries {
|
||||||
last_id = entry.id;
|
|
||||||
let results = bank.process_transactions(entry.transactions);
|
let results = bank.process_transactions(entry.transactions);
|
||||||
for result in results {
|
for result in results {
|
||||||
if let Err(e) = result {
|
if let Err(e) = result {
|
||||||
|
@ -125,7 +123,7 @@ fn main() {
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
bank.register_entry_id(&last_id);
|
bank.register_entry_id(&entry.id);
|
||||||
}
|
}
|
||||||
|
|
||||||
eprintln!("creating networking stack...");
|
eprintln!("creating networking stack...");
|
||||||
|
@ -166,7 +164,6 @@ fn main() {
|
||||||
let file = File::create("leader.log").expect("leader.log create");
|
let file = File::create("leader.log").expect("leader.log create");
|
||||||
let server = Server::new_leader(
|
let server = Server::new_leader(
|
||||||
bank,
|
bank,
|
||||||
last_id,
|
|
||||||
//Some(Duration::from_millis(1000)),
|
//Some(Duration::from_millis(1000)),
|
||||||
None,
|
None,
|
||||||
repl_data.clone(),
|
repl_data.clone(),
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
use bank::Bank;
|
use bank::Bank;
|
||||||
use crdt::{Crdt, ReplicatedData};
|
use crdt::{Crdt, ReplicatedData};
|
||||||
use data_replicator::DataReplicator;
|
use data_replicator::DataReplicator;
|
||||||
use hash::Hash;
|
|
||||||
use packet;
|
use packet;
|
||||||
use rpu::Rpu;
|
use rpu::Rpu;
|
||||||
use std::io::Write;
|
use std::io::Write;
|
||||||
|
@ -23,7 +22,6 @@ pub struct Server {
|
||||||
impl Server {
|
impl Server {
|
||||||
pub fn new_leader<W: Write + Send + 'static>(
|
pub fn new_leader<W: Write + Send + 'static>(
|
||||||
bank: Bank,
|
bank: Bank,
|
||||||
start_hash: Hash,
|
|
||||||
tick_duration: Option<Duration>,
|
tick_duration: Option<Duration>,
|
||||||
me: ReplicatedData,
|
me: ReplicatedData,
|
||||||
requests_socket: UdpSocket,
|
requests_socket: UdpSocket,
|
||||||
|
@ -42,7 +40,6 @@ impl Server {
|
||||||
let blob_recycler = packet::BlobRecycler::default();
|
let blob_recycler = packet::BlobRecycler::default();
|
||||||
let tpu = Tpu::new(
|
let tpu = Tpu::new(
|
||||||
bank.clone(),
|
bank.clone(),
|
||||||
start_hash,
|
|
||||||
tick_duration,
|
tick_duration,
|
||||||
transactions_socket,
|
transactions_socket,
|
||||||
blob_recycler.clone(),
|
blob_recycler.clone(),
|
||||||
|
|
|
@ -202,7 +202,6 @@ mod tests {
|
||||||
|
|
||||||
let server = Server::new_leader(
|
let server = Server::new_leader(
|
||||||
bank,
|
bank,
|
||||||
alice.last_id(),
|
|
||||||
Some(Duration::from_millis(30)),
|
Some(Duration::from_millis(30)),
|
||||||
leader.data.clone(),
|
leader.data.clone(),
|
||||||
leader.sockets.requests,
|
leader.sockets.requests,
|
||||||
|
@ -247,7 +246,6 @@ mod tests {
|
||||||
|
|
||||||
let server = Server::new_leader(
|
let server = Server::new_leader(
|
||||||
bank,
|
bank,
|
||||||
alice.last_id(),
|
|
||||||
Some(Duration::from_millis(30)),
|
Some(Duration::from_millis(30)),
|
||||||
leader.data.clone(),
|
leader.data.clone(),
|
||||||
leader.sockets.requests,
|
leader.sockets.requests,
|
||||||
|
|
|
@ -4,7 +4,6 @@
|
||||||
use bank::Bank;
|
use bank::Bank;
|
||||||
use banking_stage::BankingStage;
|
use banking_stage::BankingStage;
|
||||||
use fetch_stage::FetchStage;
|
use fetch_stage::FetchStage;
|
||||||
use hash::Hash;
|
|
||||||
use packet::{BlobRecycler, PacketRecycler};
|
use packet::{BlobRecycler, PacketRecycler};
|
||||||
use record_stage::RecordStage;
|
use record_stage::RecordStage;
|
||||||
use sigverify_stage::SigVerifyStage;
|
use sigverify_stage::SigVerifyStage;
|
||||||
|
@ -25,7 +24,6 @@ pub struct Tpu {
|
||||||
impl Tpu {
|
impl Tpu {
|
||||||
pub fn new<W: Write + Send + 'static>(
|
pub fn new<W: Write + Send + 'static>(
|
||||||
bank: Arc<Bank>,
|
bank: Arc<Bank>,
|
||||||
start_hash: Hash,
|
|
||||||
tick_duration: Option<Duration>,
|
tick_duration: Option<Duration>,
|
||||||
transactions_socket: UdpSocket,
|
transactions_socket: UdpSocket,
|
||||||
blob_recycler: BlobRecycler,
|
blob_recycler: BlobRecycler,
|
||||||
|
@ -49,10 +47,10 @@ impl Tpu {
|
||||||
let record_stage = match tick_duration {
|
let record_stage = match tick_duration {
|
||||||
Some(tick_duration) => RecordStage::new_with_clock(
|
Some(tick_duration) => RecordStage::new_with_clock(
|
||||||
banking_stage.signal_receiver,
|
banking_stage.signal_receiver,
|
||||||
&start_hash,
|
&bank.last_id(),
|
||||||
tick_duration,
|
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(
|
let write_stage = WriteStage::new(
|
||||||
|
|
|
@ -106,7 +106,6 @@ fn test_multi_node() {
|
||||||
let leader_bank = Bank::new(&alice);
|
let leader_bank = Bank::new(&alice);
|
||||||
let server = Server::new_leader(
|
let server = Server::new_leader(
|
||||||
leader_bank,
|
leader_bank,
|
||||||
alice.last_id(),
|
|
||||||
None,
|
None,
|
||||||
leader.data.clone(),
|
leader.data.clone(),
|
||||||
leader.sockets.requests,
|
leader.sockets.requests,
|
||||||
|
|
Loading…
Reference in New Issue