Forward transactions as packets instead of blobs (#5334)

* Forward transactions as packets instead of blobs

* clippy
This commit is contained in:
Pankaj Garg
2019-07-30 14:50:02 -07:00
committed by GitHub
parent 8d243221f0
commit a7a10e12c7
8 changed files with 46 additions and 200 deletions

View File

@ -1463,7 +1463,7 @@ pub struct Sockets {
pub gossip: UdpSocket,
pub tvu: Vec<UdpSocket>,
pub tpu: Vec<UdpSocket>,
pub tpu_via_blobs: Vec<UdpSocket>,
pub tpu_forwards: Vec<UdpSocket>,
pub broadcast: UdpSocket,
pub repair: UdpSocket,
pub retransmit: UdpSocket,
@ -1508,7 +1508,7 @@ impl Node {
gossip,
tvu: vec![tvu],
tpu: vec![],
tpu_via_blobs: vec![],
tpu_forwards: vec![],
broadcast,
repair,
retransmit,
@ -1520,7 +1520,7 @@ impl Node {
let tpu = UdpSocket::bind("127.0.0.1:0").unwrap();
let gossip = UdpSocket::bind("127.0.0.1:0").unwrap();
let tvu = UdpSocket::bind("127.0.0.1:0").unwrap();
let tpu_via_blobs = UdpSocket::bind("127.0.0.1:0").unwrap();
let tpu_forwards = UdpSocket::bind("127.0.0.1:0").unwrap();
let repair = UdpSocket::bind("127.0.0.1:0").unwrap();
let rpc_port = find_available_port_in_range((1024, 65535)).unwrap();
let rpc_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), rpc_port);
@ -1536,7 +1536,7 @@ impl Node {
gossip.local_addr().unwrap(),
tvu.local_addr().unwrap(),
tpu.local_addr().unwrap(),
tpu_via_blobs.local_addr().unwrap(),
tpu_forwards.local_addr().unwrap(),
storage.local_addr().unwrap(),
rpc_addr,
rpc_pubsub_addr,
@ -1548,7 +1548,7 @@ impl Node {
gossip,
tvu: vec![tvu],
tpu: vec![tpu],
tpu_via_blobs: vec![tpu_via_blobs],
tpu_forwards: vec![tpu_forwards],
broadcast,
repair,
retransmit,
@ -1582,7 +1582,7 @@ impl Node {
let (tpu_port, tpu_sockets) = multi_bind_in_range(port_range, 32).expect("tpu multi_bind");
let (tpu_via_blobs_port, tpu_via_blobs_sockets) =
let (tpu_forwards_port, tpu_forwards_sockets) =
multi_bind_in_range(port_range, 8).expect("tpu multi_bind");
let (_, repair) = Self::bind(port_range);
@ -1594,7 +1594,7 @@ impl Node {
SocketAddr::new(gossip_addr.ip(), gossip_port),
SocketAddr::new(gossip_addr.ip(), tvu_port),
SocketAddr::new(gossip_addr.ip(), tpu_port),
SocketAddr::new(gossip_addr.ip(), tpu_via_blobs_port),
SocketAddr::new(gossip_addr.ip(), tpu_forwards_port),
socketaddr_any!(),
socketaddr_any!(),
socketaddr_any!(),
@ -1608,7 +1608,7 @@ impl Node {
gossip,
tvu: tvu_sockets,
tpu: tpu_sockets,
tpu_via_blobs: tpu_via_blobs_sockets,
tpu_forwards: tpu_forwards_sockets,
broadcast,
repair,
retransmit,
@ -1629,9 +1629,9 @@ impl Node {
let empty = socketaddr_any!();
new.info.tpu = empty;
new.info.tpu_via_blobs = empty;
new.info.tpu_forwards = empty;
new.sockets.tpu = vec![];
new.sockets.tpu_via_blobs = vec![];
new.sockets.tpu_forwards = vec![];
new
}