gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Anatoly Yakovenko 2018-05-23 07:44:01 -07:00 committed by Greg Fitzgerald
parent 437c485e5c
commit 59be94a81f
1 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/server.rs
View File

@ -17,7 +17,7 @@ pub struct Server {
} }
impl Server { impl Server {
pub fn new<W: Write + Send + 'static>( pub fn leader<W: Write + Send + 'static>(
bank: Bank, bank: Bank,
start_hash: Hash, start_hash: Hash,
tick_duration: Option<Duration>, tick_duration: Option<Duration>,
@ -26,7 +26,7 @@ impl Server {
events_socket: UdpSocket, events_socket: UdpSocket,
broadcast_socket: UdpSocket, broadcast_socket: UdpSocket,
respond_socket: UdpSocket, respond_socket: UdpSocket,
gossip: UdpSocket, gossip_socket: UdpSocket,
exit: Arc<AtomicBool>, exit: Arc<AtomicBool>,
writer: W, writer: W,
) -> Self { ) -> Self {
@ -34,7 +34,6 @@ impl Server {
let mut thread_hdls = vec![]; let mut thread_hdls = vec![];
let rpu = Rpu::new(bank.clone(), requests_socket, respond_socket, exit.clone()); let rpu = Rpu::new(bank.clone(), requests_socket, respond_socket, exit.clone());
thread_hdls.extend(rpu.thread_hdls); thread_hdls.extend(rpu.thread_hdls);
let tpu = Tpu::new( let tpu = Tpu::new(
bank.clone(), bank.clone(),
start_hash, start_hash,
@ -42,12 +41,36 @@ impl Server {
me, me,
events_socket, events_socket,
broadcast_socket, broadcast_socket,
gossip, gossip_socket,
exit.clone(), exit.clone(),
writer, writer,
); );
thread_hdls.extend(tpu.thread_hdls); thread_hdls.extend(tpu.thread_hdls);
Server { thread_hdls }
}
pub fn validator(
bank: Bank,
me: ReplicatedData,
requests_socket: UdpSocket,
respond_socket: UdpSocket,
replicate_socket: UdpSocket,
gossip_socket: UdpSocket,
leader_repl_data: ReplicatedData,
exit: Arc<AtomicBool>,
) -> Self {
let bank = Arc::new(bank);
let mut thread_hdls = vec![];
let rpu = Rpu::new(bank.clone(), requests_socket, respond_socket, exit.clone());
thread_hdls.extend(rpu.thread_hdls);
let tvu = Tvu::new(
bank.clone(),
me,
gossip_socket,
replicate_socket,
leader_repl_data,
exit.clone(),
);
thread_hdls.extend(tpu.thread_hdls);
Server { thread_hdls } Server { thread_hdls }
} }
} }