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

@ -23,7 +23,7 @@ use solana_client::{rpc_client::RpcClient, rpc_request::RpcRequest, thin_client:
use solana_ledger::{
blocktree::Blocktree, leader_schedule_cache::LeaderScheduleCache, shred::Shred,
};
use solana_netutil::bind_in_range;
use solana_net_utils::bind_in_range;
use solana_perf::recycler::Recycler;
use solana_sdk::{
account_utils::State,

View File

@ -32,7 +32,7 @@ use itertools::Itertools;
use rand::{thread_rng, Rng};
use solana_ledger::{bank_forks::BankForks, blocktree::Blocktree, staking_utils};
use solana_metrics::{datapoint_debug, inc_new_counter_debug, inc_new_counter_error};
use solana_netutil::{
use solana_net_utils::{
bind_common, bind_common_in_range, bind_in_range, find_available_port_in_range,
multi_bind_in_range, PortRange,
};

View File

@ -76,7 +76,7 @@ pub fn discover(
info!("Gossip entry point: {:?}", entry_point);
info!("Spy node id: {:?}", id);
let _ip_echo_server = ip_echo.map(solana_netutil::ip_echo_server);
let _ip_echo_server = ip_echo.map(solana_net_utils::ip_echo_server);
let (met_criteria, secs, tvu_peers, archivers) = spy(
spy_ref.clone(),
@ -143,7 +143,7 @@ pub fn get_multi_client(nodes: &[ContactInfo]) -> (ThinClient, usize) {
.collect();
let rpc_addrs: Vec<_> = addrs.iter().map(|addr| addr.0).collect();
let tpu_addrs: Vec<_> = addrs.iter().map(|addr| addr.1).collect();
let (_, transactions_socket) = solana_netutil::bind_in_range(VALIDATOR_PORT_RANGE).unwrap();
let (_, transactions_socket) = solana_net_utils::bind_in_range(VALIDATOR_PORT_RANGE).unwrap();
let num_nodes = tpu_addrs.len();
(
ThinClient::new_from_addrs(rpc_addrs, tpu_addrs, transactions_socket),

View File

@ -1,7 +1,7 @@
//! The `local_vote_signer_service` can be started locally to sign validator votes
use crate::service::Service;
use solana_netutil::PortRange;
use solana_net_utils::PortRange;
use solana_vote_signer::rpc::VoteSignerRpcService;
use std::net::{IpAddr, Ipv4Addr, SocketAddr};
use std::sync::atomic::{AtomicBool, Ordering};
@ -25,7 +25,7 @@ impl Service for LocalVoteSignerService {
impl LocalVoteSignerService {
#[allow(clippy::new_ret_no_self)]
pub fn new(port_range: PortRange) -> (Self, SocketAddr) {
let addr = match solana_netutil::find_available_port_in_range(port_range) {
let addr = match solana_net_utils::find_available_port_in_range(port_range) {
Ok(port) => SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), port),
Err(_e) => panic!("Failed to find an available port for local vote signer service"),
};

View File

@ -278,7 +278,7 @@ mod tests {
use crate::packet::{self, Meta, Packet, Packets};
use solana_ledger::blocktree::create_new_tmp_ledger;
use solana_ledger::blocktree_processor::{process_blocktree, ProcessOptions};
use solana_netutil::find_available_port_in_range;
use solana_net_utils::find_available_port_in_range;
use solana_sdk::pubkey::Pubkey;
#[test]

View File

@ -202,7 +202,7 @@ mod tests {
)));
let rpc_addr = SocketAddr::new(
IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)),
solana_netutil::find_available_port_in_range((10000, 65535)).unwrap(),
solana_net_utils::find_available_port_in_range((10000, 65535)).unwrap(),
);
let bank_forks = Arc::new(RwLock::new(BankForks::new(bank.slot(), bank)));
let block_commitment_cache = Arc::new(RwLock::new(BlockCommitmentCache::default()));

View File

@ -106,7 +106,7 @@ pub struct Validator {
poh_service: PohService,
tpu: Tpu,
tvu: Tvu,
ip_echo_server: solana_netutil::IpEchoServer,
ip_echo_server: solana_net_utils::IpEchoServer,
}
impl Validator {
@ -272,7 +272,7 @@ impl Validator {
"New blob signal for the TVU should be the same as the clear bank signal."
);
let ip_echo_server = solana_netutil::ip_echo_server(node.sockets.ip_echo.unwrap());
let ip_echo_server = solana_net_utils::ip_echo_server(node.sockets.ip_echo.unwrap());
let gossip_service = GossipService::new(
&cluster_info,