accountant -> bank

This commit is contained in:
Greg Fitzgerald
2018-05-14 15:33:11 -06:00
parent 6e8f99d9b2
commit d2dd005a59
13 changed files with 179 additions and 200 deletions

View File

@@ -1,6 +1,6 @@
//! The `request_stage` processes thin client Request messages.
use accountant::Accountant;
use bank::Bank;
use bincode::{deserialize, serialize};
use event::Event;
use packet;
@@ -19,13 +19,13 @@ use streamer;
use timing;
pub struct RequestProcessor {
accountant: Arc<Accountant>,
bank: Arc<Bank>,
}
impl RequestProcessor {
/// Create a new Tpu that wraps the given Accountant.
pub fn new(accountant: Arc<Accountant>) -> Self {
RequestProcessor { accountant }
/// Create a new Tpu that wraps the given Bank.
pub fn new(bank: Arc<Bank>) -> Self {
RequestProcessor { bank }
}
/// Process Request items sent by clients.
@@ -36,19 +36,19 @@ impl RequestProcessor {
) -> Option<(Response, SocketAddr)> {
match msg {
Request::GetBalance { key } => {
let val = self.accountant.get_balance(&key);
let val = self.bank.get_balance(&key);
let rsp = (Response::Balance { key, val }, rsp_addr);
info!("Response::Balance {:?}", rsp);
Some(rsp)
}
Request::GetLastId => {
let id = self.accountant.last_id();
let id = self.bank.last_id();
let rsp = (Response::LastId { id }, rsp_addr);
info!("Response::LastId {:?}", rsp);
Some(rsp)
}
Request::GetTransactionCount => {
let transaction_count = self.accountant.transaction_count() as u64;
let transaction_count = self.bank.transaction_count() as u64;
let rsp = (Response::TransactionCount { transaction_count }, rsp_addr);
info!("Response::TransactionCount {:?}", rsp);
Some(rsp)
@@ -174,7 +174,7 @@ impl RequestProcessor {
debug!("events: {} reqs: {}", events.len(), reqs.len());
debug!("process_events");
let results = self.accountant.process_verified_events(events);
let results = self.bank.process_verified_events(events);
let events = results.into_iter().filter_map(|x| x.ok()).collect();
signal_sender.send(Signal::Events(events))?;
debug!("done process_events");