validator: `--tpu-host-addr` -> `--public-tpu-address` (#31137)
This commit is contained in:
parent
9136f80d36
commit
b81b7ebf03
|
@ -3007,7 +3007,7 @@ impl Node {
|
||||||
gossip_addr: &SocketAddr,
|
gossip_addr: &SocketAddr,
|
||||||
port_range: PortRange,
|
port_range: PortRange,
|
||||||
bind_ip_addr: IpAddr,
|
bind_ip_addr: IpAddr,
|
||||||
overwrite_tpu_addr: Option<SocketAddr>,
|
public_tpu_addr: Option<SocketAddr>,
|
||||||
) -> Node {
|
) -> Node {
|
||||||
let (gossip_port, (gossip, ip_echo)) =
|
let (gossip_port, (gossip, ip_echo)) =
|
||||||
Self::get_gossip_port(gossip_addr, port_range, bind_ip_addr);
|
Self::get_gossip_port(gossip_addr, port_range, bind_ip_addr);
|
||||||
|
@ -3061,7 +3061,7 @@ impl Node {
|
||||||
let _ = info.set_tvu((addr, tvu_port));
|
let _ = info.set_tvu((addr, tvu_port));
|
||||||
let _ = info.set_tvu_forwards((addr, tvu_forwards_port));
|
let _ = info.set_tvu_forwards((addr, tvu_forwards_port));
|
||||||
let _ = info.set_repair((addr, repair_port));
|
let _ = info.set_repair((addr, repair_port));
|
||||||
let _ = info.set_tpu(overwrite_tpu_addr.unwrap_or_else(|| SocketAddr::new(addr, tpu_port)));
|
let _ = info.set_tpu(public_tpu_addr.unwrap_or_else(|| SocketAddr::new(addr, tpu_port)));
|
||||||
let _ = info.set_tpu_forwards((addr, tpu_forwards_port));
|
let _ = info.set_tpu_forwards((addr, tpu_forwards_port));
|
||||||
let _ = info.set_tpu_vote((addr, tpu_vote_port));
|
let _ = info.set_tpu_vote((addr, tpu_vote_port));
|
||||||
let _ = info.set_serve_repair((addr, serve_repair_port));
|
let _ = info.set_serve_repair((addr, serve_repair_port));
|
||||||
|
|
|
@ -372,8 +372,9 @@ pub fn app<'a>(version: &'a str, default_args: &'a DefaultArgs) -> App<'a, 'a> {
|
||||||
[default: ask --entrypoint, or 127.0.0.1 when --entrypoint is not provided]"),
|
[default: ask --entrypoint, or 127.0.0.1 when --entrypoint is not provided]"),
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::with_name("tpu_host_addr")
|
Arg::with_name("public_tpu_addr")
|
||||||
.long("tpu-host-addr")
|
.long("public-tpu-address")
|
||||||
|
.alias("tpu-host-addr")
|
||||||
.value_name("HOST:PORT")
|
.value_name("HOST:PORT")
|
||||||
.takes_value(true)
|
.takes_value(true)
|
||||||
.validator(solana_net_utils::is_host_port)
|
.validator(solana_net_utils::is_host_port)
|
||||||
|
|
|
@ -1702,9 +1702,9 @@ pub fn main() {
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
|
|
||||||
let overwrite_tpu_addr = matches.value_of("tpu_host_addr").map(|tpu_addr| {
|
let public_tpu_addr = matches.value_of("public_tpu_addr").map(|public_tpu_addr| {
|
||||||
solana_net_utils::parse_host_port(tpu_addr).unwrap_or_else(|err| {
|
solana_net_utils::parse_host_port(public_tpu_addr).unwrap_or_else(|err| {
|
||||||
eprintln!("Failed to parse --overwrite-tpu-addr: {err}");
|
eprintln!("Failed to parse --public-tpu-address: {err}");
|
||||||
exit(1);
|
exit(1);
|
||||||
})
|
})
|
||||||
});
|
});
|
||||||
|
@ -1719,7 +1719,7 @@ pub fn main() {
|
||||||
&gossip_addr,
|
&gossip_addr,
|
||||||
dynamic_port_range,
|
dynamic_port_range,
|
||||||
bind_address,
|
bind_address,
|
||||||
overwrite_tpu_addr,
|
public_tpu_addr,
|
||||||
);
|
);
|
||||||
|
|
||||||
if restricted_repair_only_mode {
|
if restricted_repair_only_mode {
|
||||||
|
|
Loading…
Reference in New Issue