diff --git a/src/accountant_skel.rs b/src/accountant_skel.rs index c2a3456eca..b8e7db7379 100644 --- a/src/accountant_skel.rs +++ b/src/accountant_skel.rs @@ -27,6 +27,7 @@ use std::thread::{spawn, JoinHandle}; use std::time::Duration; use streamer; use transaction::Transaction; +use subscribers::Subscribers; pub struct AccountantSkel { acc: Accountant, @@ -293,7 +294,7 @@ impl AccountantSkel { let exit_ = exit.clone(); let t_verifier = spawn(move || loop { - let e = Self::blob_verifier(&blob_receiver, &verified_sender); + let e = Self::verifier(&packet_receiver, &verified_sender); if e.is_err() && exit_.load(Ordering::Relaxed) { break; } @@ -351,7 +352,7 @@ impl AccountantSkel { let (retransmit_sender, retransmit_receiver) = channel(); let subs = Arc::new(RwLock::new(rsubs)); - let t_retransmit = retransmitter( + let t_retransmit = streamer::retransmitter( write, exit.clone(), subs, diff --git a/src/result.rs b/src/result.rs index 9b3c17a369..01872dfbe1 100644 --- a/src/result.rs +++ b/src/result.rs @@ -4,6 +4,7 @@ use bincode; use serde_json; use std; use std::any::Any; +use accountant; #[derive(Debug)] pub enum Error { @@ -14,6 +15,7 @@ pub enum Error { RecvError(std::sync::mpsc::RecvError), RecvTimeoutError(std::sync::mpsc::RecvTimeoutError), Serialize(std::boxed::Box), + AccountingError(accountant::AccountingError), SendError, Services, } @@ -30,6 +32,11 @@ impl std::convert::From for Error { Error::RecvTimeoutError(e) } } +impl std::convert::From for Error { + fn from(e: accountant::AccountingError) -> Error { + Error::AccountingError(e) + } +} impl std::convert::From> for Error { fn from(_e: std::sync::mpsc::SendError) -> Error { Error::SendError