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

More object-oriented

Browse Source
This commit is contained in:
Greg Fitzgerald
2018-05-12 00:19:12 -06:00
parent 73abea088a
commit b4ca414492
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/bin/testnode.rs
View File

@ -130,8 +130,7 @@ fn main() {
serve_sock.local_addr().unwrap(), serve_sock.local_addr().unwrap(),
); );
eprintln!("starting server..."); eprintln!("starting server...");
let threads = Tpu::serve( let threads = tpu.serve(
&tpu,
d, d,
serve_sock, serve_sock,
events_sock, events_sock,

4
src/thin_client.rs
View File

@ -191,8 +191,8 @@ mod tests {
let exit = Arc::new(AtomicBool::new(false)); let exit = Arc::new(AtomicBool::new(false));
let accounting_stage = AccountingStage::new(accountant, &alice.last_id(), Some(30)); let accounting_stage = AccountingStage::new(accountant, &alice.last_id(), Some(30));
let tpu = Arc::new(Tpu::new(accounting_stage)); let tpu = Arc::new(Tpu::new(accounting_stage));
let threads = let threads = tpu.serve(d, serve, events_socket, gossip, exit.clone(), sink())
Tpu::serve(&tpu, d, serve, events_socket, gossip, exit.clone(), sink()).unwrap(); .unwrap();
sleep(Duration::from_millis(300)); sleep(Duration::from_millis(300));
let requests_socket = UdpSocket::bind("0.0.0.0:0").unwrap(); let requests_socket = UdpSocket::bind("0.0.0.0:0").unwrap();

10
src/tpu.rs
View File

@ -74,7 +74,7 @@ impl Tpu {
/// This service is the network leader /// This service is the network leader
/// Set `exit` to shutdown its threads. /// Set `exit` to shutdown its threads.
pub fn serve<W: Write + Send + 'static>( pub fn serve<W: Write + Send + 'static>(
obj: &SharedTpu, &self,
me: ReplicatedData, me: ReplicatedData,
requests_socket: UdpSocket, requests_socket: UdpSocket,
_events_socket: UdpSocket, _events_socket: UdpSocket,
@ -103,8 +103,8 @@ impl Tpu {
let blob_recycler = packet::BlobRecycler::default(); let blob_recycler = packet::BlobRecycler::default();
let thin_client_service = ThinClientService::new( let thin_client_service = ThinClientService::new(
obj.request_processor.clone(), self.request_processor.clone(),
obj.accounting_stage.clone(), self.accounting_stage.clone(),
exit.clone(), exit.clone(),
sig_verify_stage.output, sig_verify_stage.output,
packet_recycler.clone(), packet_recycler.clone(),
@ -113,8 +113,8 @@ impl Tpu {
let (broadcast_sender, broadcast_receiver) = channel(); let (broadcast_sender, broadcast_receiver) = channel();
let t_write = Self::write_service( let t_write = Self::write_service(
obj.accounting_stage.clone(), self.accounting_stage.clone(),
obj.request_processor.clone(), self.request_processor.clone(),
exit.clone(), exit.clone(),
broadcast_sender, broadcast_sender,
blob_recycler.clone(), blob_recycler.clone(),