Rename solana-netutil to solana-net-utils for consistency (#6895)

* sed -i -e 's/netutil/net_utils/g' $(git grep --files-with-matches netutil :**.rs)

* sed -i -e 's/netutil/net-utils/g' $(git grep --files-with-matches netutil)

* git mv netutil/ net-utils

* Tweak a bit

* Fix rustfmt & clippy
This commit is contained in:
Ryo Onodera
2019-11-13 05:37:13 +09:00
committed by Michael Vines
parent bb00904fc8
commit 3faeb7fa79
33 changed files with 78 additions and 74 deletions

View File

@ -14,7 +14,7 @@ solana-clap-utils = { path = "../clap-utils", version = "0.21.0" }
solana-core = { path = "../core", version = "0.21.0" }
solana-client = { path = "../client", version = "0.21.0" }
solana-logger = { path = "../logger", version = "0.21.0" }
solana-netutil = { path = "../netutil", version = "0.21.0" }
solana-net-utils = { path = "../net-utils", version = "0.21.0" }
solana-sdk = { path = "../sdk", version = "0.21.0" }

View File

@ -28,7 +28,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {
.value_name("HOST:PORT")
.takes_value(true)
.default_value(&entrypoint_string)
.validator(solana_netutil::is_host_port)
.validator(solana_net_utils::is_host_port)
.global(true)
.help("Rendezvous with the cluster at this entry point"),
)
@ -113,7 +113,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {
.get_matches();
if let Some(addr) = matches.value_of("entrypoint") {
entrypoint_addr = solana_netutil::parse_host_port(addr).unwrap_or_else(|e| {
entrypoint_addr = solana_net_utils::parse_host_port(addr).unwrap_or_else(|e| {
eprintln!("failed to parse entrypoint address: {}", e);
exit(1);
});
@ -136,7 +136,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {
.map(|pubkey_str| pubkey_str.parse::<Pubkey>().unwrap());
let gossip_addr = SocketAddr::new(
solana_netutil::get_public_ip_addr(&entrypoint_addr).unwrap_or_else(|err| {
solana_net_utils::get_public_ip_addr(&entrypoint_addr).unwrap_or_else(|err| {
eprintln!("failed to contact {}: {}", entrypoint_addr, err);
exit(1);
}),