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

Better names

Browse Source
This commit is contained in:
Greg Fitzgerald
2018-05-11 16:41:35 -06:00
parent 600a1f8866
commit 55100854d6
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/tpu.rs
View File

@ -202,7 +202,7 @@ impl Tpu {
pub fn serve<W: Write + Send + 'static>( pub fn serve<W: Write + Send + 'static>(
obj: &SharedTpu, obj: &SharedTpu,
me: ReplicatedData, me: ReplicatedData,
serve: UdpSocket, requests_socket: UdpSocket,
_events_socket: UdpSocket, _events_socket: UdpSocket,
gossip: UdpSocket, gossip: UdpSocket,
exit: Arc<AtomicBool>, exit: Arc<AtomicBool>,
@ -213,15 +213,19 @@ impl Tpu {
let t_listen = Crdt::listen(crdt.clone(), gossip, exit.clone()); let t_listen = Crdt::listen(crdt.clone(), gossip, exit.clone());
// make sure we are on the same interface // make sure we are on the same interface
let mut local = serve.local_addr()?; let mut local = requests_socket.local_addr()?;
local.set_port(0); local.set_port(0);
let respond_socket = UdpSocket::bind(local.clone())?; let respond_socket = UdpSocket::bind(local.clone())?;
let packet_recycler = packet::PacketRecycler::default(); let packet_recycler = packet::PacketRecycler::default();
let blob_recycler = packet::BlobRecycler::default(); let blob_recycler = packet::BlobRecycler::default();
let (packet_sender, packet_receiver) = channel(); let (packet_sender, packet_receiver) = channel();
let t_receiver = let t_receiver = streamer::receiver(
streamer::receiver(serve, exit.clone(), packet_recycler.clone(), packet_sender)?; requests_socket,
exit.clone(),
packet_recycler.clone(),
packet_sender,
)?;
let (responder_sender, responder_receiver) = channel(); let (responder_sender, responder_receiver) = channel();
let t_responder = streamer::responder( let t_responder = streamer::responder(
respond_socket, respond_socket,
@ -317,7 +321,7 @@ impl Tpu {
obj: &SharedTpu, obj: &SharedTpu,
me: ReplicatedData, me: ReplicatedData,
gossip: UdpSocket, gossip: UdpSocket,
serve: UdpSocket, requests_socket: UdpSocket,
replicate: UdpSocket, replicate: UdpSocket,
leader: ReplicatedData, leader: ReplicatedData,
exit: Arc<AtomicBool>, exit: Arc<AtomicBool>,
@ -380,15 +384,19 @@ impl Tpu {
//serve pipeline //serve pipeline
// make sure we are on the same interface // make sure we are on the same interface
let mut local = serve.local_addr()?; let mut local = requests_socket.local_addr()?;
local.set_port(0); local.set_port(0);
let respond_socket = UdpSocket::bind(local.clone())?; let respond_socket = UdpSocket::bind(local.clone())?;
let packet_recycler = packet::PacketRecycler::default(); let packet_recycler = packet::PacketRecycler::default();
let blob_recycler = packet::BlobRecycler::default(); let blob_recycler = packet::BlobRecycler::default();
let (packet_sender, packet_receiver) = channel(); let (packet_sender, packet_receiver) = channel();
let t_packet_receiver = let t_packet_receiver = streamer::receiver(
streamer::receiver(serve, exit.clone(), packet_recycler.clone(), packet_sender)?; requests_socket,
exit.clone(),
packet_recycler.clone(),
packet_sender,
)?;
let (responder_sender, responder_receiver) = channel(); let (responder_sender, responder_receiver) = channel();
let t_responder = streamer::responder( let t_responder = streamer::responder(
respond_socket, respond_socket,
@ -458,15 +466,15 @@ pub fn test_node() -> (ReplicatedData, UdpSocket, UdpSocket, UdpSocket, UdpSocke
let events_socket = UdpSocket::bind("127.0.0.1:0").unwrap(); let events_socket = UdpSocket::bind("127.0.0.1:0").unwrap();
let gossip = UdpSocket::bind("127.0.0.1:0").unwrap(); let gossip = UdpSocket::bind("127.0.0.1:0").unwrap();
let replicate = UdpSocket::bind("127.0.0.1:0").unwrap(); let replicate = UdpSocket::bind("127.0.0.1:0").unwrap();
let serve = UdpSocket::bind("127.0.0.1:0").unwrap(); let requests_socket = UdpSocket::bind("127.0.0.1:0").unwrap();
let pubkey = KeyPair::new().pubkey(); let pubkey = KeyPair::new().pubkey();
let d = ReplicatedData::new( let d = ReplicatedData::new(
pubkey, pubkey,
gossip.local_addr().unwrap(), gossip.local_addr().unwrap(),
replicate.local_addr().unwrap(), replicate.local_addr().unwrap(),
serve.local_addr().unwrap(), requests_socket.local_addr().unwrap(),
); );
(d, gossip, replicate, serve, events_socket) (d, gossip, replicate, requests_socket, events_socket)
} }
#[cfg(test)] #[cfg(test)]