diff --git a/Cargo.toml b/Cargo.toml index 5b51252b2a..ed4acf233e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,6 @@ members = [ "merkle-tree", "measure", "metrics", - "netutil", "programs/bpf", "programs/bpf_loader_api", "programs/bpf_loader_program", @@ -51,6 +50,7 @@ members = [ "sdk-c", "upload-perf", "validator-info", + "utils/netutil", "utils/fixed_buf", "vote-signer", "wallet", diff --git a/bench-exchange/Cargo.toml b/bench-exchange/Cargo.toml index 882f2ee018..6850d6a699 100644 --- a/bench-exchange/Cargo.toml +++ b/bench-exchange/Cargo.toml @@ -32,7 +32,7 @@ solana-exchange-api = { path = "../programs/exchange_api", version = "0.18.0-pre solana-exchange-program = { path = "../programs/exchange_program", version = "0.18.0-pre1" } solana-logger = { path = "../logger", version = "0.18.0-pre1" } solana-metrics = { path = "../metrics", version = "0.18.0-pre1" } -solana-netutil = { path = "../netutil", version = "0.18.0-pre1" } +solana-netutil = { path = "../utils/netutil", version = "0.18.0-pre1" } solana-runtime = { path = "../runtime", version = "0.18.0-pre1" } solana-sdk = { path = "../sdk", version = "0.18.0-pre1" } untrusted = "0.7.0" diff --git a/bench-streamer/Cargo.toml b/bench-streamer/Cargo.toml index 329c8757cf..92f95209c7 100644 --- a/bench-streamer/Cargo.toml +++ b/bench-streamer/Cargo.toml @@ -11,7 +11,7 @@ homepage = "https://solana.com/" clap = "2.33.0" solana = { path = "../core", version = "0.18.0-pre1" } solana-logger = { path = "../logger", version = "0.18.0-pre1" } -solana-netutil = { path = "../netutil", version = "0.18.0-pre1" } +solana-netutil = { path = "../utils/netutil", version = "0.18.0-pre1" } [features] cuda = ["solana/cuda"] diff --git a/bench-tps/Cargo.toml b/bench-tps/Cargo.toml index aa96c209ce..41cdf4f20d 100644 --- a/bench-tps/Cargo.toml +++ b/bench-tps/Cargo.toml @@ -24,7 +24,7 @@ solana-librapay-api = { path = "../programs/librapay_api", version = "0.18.0-pre solana-logger = { path = "../logger", version = "0.18.0-pre1" } solana-metrics = { path = "../metrics", version = "0.18.0-pre1" } solana-measure = { path = "../measure", version = "0.18.0-pre1" } -solana-netutil = { path = "../netutil", version = "0.18.0-pre1" } +solana-netutil = { path = "../utils/netutil", version = "0.18.0-pre1" } solana-runtime = { path = "../runtime", version = "0.18.0-pre1" } solana-sdk = { path = "../sdk", version = "0.18.0-pre1" } solana-move-loader-program = { path = "../programs/move_loader_program", version = "0.18.0-pre1" } diff --git a/client/Cargo.toml b/client/Cargo.toml index 61607c4e62..e9b67e6f6c 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -19,7 +19,7 @@ reqwest = "0.9.19" serde = "1.0.98" serde_derive = "1.0.98" serde_json = "1.0.40" -solana-netutil = { path = "../netutil", version = "0.18.0-pre1" } +solana-netutil = { path = "../utils/netutil", version = "0.18.0-pre1" } solana-sdk = { path = "../sdk", version = "0.18.0-pre1" } [dev-dependencies] diff --git a/core/Cargo.toml b/core/Cargo.toml index 0a97cea88b..8dba792d06 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -58,7 +58,7 @@ solana-logger = { path = "../logger", version = "0.18.0-pre1" } solana-merkle-tree = { path = "../merkle-tree", version = "0.18.0-pre1" } solana-metrics = { path = "../metrics", version = "0.18.0-pre1" } solana-measure = { path = "../measure", version = "0.18.0-pre1" } -solana-netutil = { path = "../netutil", version = "0.18.0-pre1" } +solana-netutil = { path = "../utils/netutil", version = "0.18.0-pre1" } solana-runtime = { path = "../runtime", version = "0.18.0-pre1" } solana-sdk = { path = "../sdk", version = "0.18.0-pre1" } solana-stake-api = { path = "../programs/stake_api", version = "0.18.0-pre1" } diff --git a/gossip/Cargo.toml b/gossip/Cargo.toml index 8e2fcd997e..14cb925d76 100644 --- a/gossip/Cargo.toml +++ b/gossip/Cargo.toml @@ -13,7 +13,7 @@ clap = "2.33.0" solana = { path = "../core", version = "0.18.0-pre1" } solana-client = { path = "../client", version = "0.18.0-pre1" } solana-logger = { path = "../logger", version = "0.18.0-pre1" } -solana-netutil = { path = "../netutil", version = "0.18.0-pre1" } +solana-netutil = { path = "../utils/netutil", version = "0.18.0-pre1" } solana-sdk = { path = "../sdk", version = "0.18.0-pre1" } [features] diff --git a/replicator/Cargo.toml b/replicator/Cargo.toml index 3220197228..a13a26cd3e 100644 --- a/replicator/Cargo.toml +++ b/replicator/Cargo.toml @@ -11,7 +11,7 @@ homepage = "https://solana.com/" clap = "2.33.0" solana = { path = "../core", version = "0.18.0-pre1" } solana-logger = { path = "../logger", version = "0.18.0-pre1" } -solana-netutil = { path = "../netutil", version = "0.18.0-pre1" } +solana-netutil = { path = "../utils/netutil", version = "0.18.0-pre1" } solana-sdk = { path = "../sdk", version = "0.18.0-pre1" } [features] diff --git a/netutil/.gitignore b/utils/netutil/.gitignore similarity index 100% rename from netutil/.gitignore rename to utils/netutil/.gitignore diff --git a/netutil/Cargo.toml b/utils/netutil/Cargo.toml similarity index 89% rename from netutil/Cargo.toml rename to utils/netutil/Cargo.toml index aaef58a44a..1514f4e304 100644 --- a/netutil/Cargo.toml +++ b/utils/netutil/Cargo.toml @@ -15,7 +15,7 @@ log = "0.4.8" nix = "0.15.0" rand = "0.6.1" socket2 = "0.3.11" -solana-logger = { path = "../logger", version = "0.18.0-pre1" } +solana-logger = { path = "../../logger", version = "0.18.0-pre1" } tokio = "0.1" [lib] diff --git a/netutil/src/bin/ip_address.rs b/utils/netutil/src/bin/ip_address.rs similarity index 100% rename from netutil/src/bin/ip_address.rs rename to utils/netutil/src/bin/ip_address.rs diff --git a/netutil/src/bin/ip_address_server.rs b/utils/netutil/src/bin/ip_address_server.rs similarity index 100% rename from netutil/src/bin/ip_address_server.rs rename to utils/netutil/src/bin/ip_address_server.rs diff --git a/netutil/src/ip_echo_server.rs b/utils/netutil/src/ip_echo_server.rs similarity index 100% rename from netutil/src/ip_echo_server.rs rename to utils/netutil/src/ip_echo_server.rs diff --git a/netutil/src/lib.rs b/utils/netutil/src/lib.rs similarity index 100% rename from netutil/src/lib.rs rename to utils/netutil/src/lib.rs diff --git a/validator/Cargo.toml b/validator/Cargo.toml index 3864c8036c..86fcc33b7c 100644 --- a/validator/Cargo.toml +++ b/validator/Cargo.toml @@ -18,7 +18,7 @@ solana = { path = "../core", version = "0.18.0-pre1" } solana-drone = { path = "../drone", version = "0.18.0-pre1" } solana-logger = { path = "../logger", version = "0.18.0-pre1" } solana-metrics = { path = "../metrics", version = "0.18.0-pre1" } -solana-netutil = { path = "../netutil", version = "0.18.0-pre1" } +solana-netutil = { path = "../utils/netutil", version = "0.18.0-pre1" } solana-runtime = { path = "../runtime", version = "0.18.0-pre1" } solana-sdk = { path = "../sdk", version = "0.18.0-pre1" } solana-vote-api = { path = "../programs/vote_api", version = "0.18.0-pre1" } diff --git a/wallet/Cargo.toml b/wallet/Cargo.toml index a9f93c1c44..5162700b9c 100644 --- a/wallet/Cargo.toml +++ b/wallet/Cargo.toml @@ -29,7 +29,7 @@ solana-budget-api = { path = "../programs/budget_api", version = "0.18.0-pre1" } solana-client = { path = "../client", version = "0.18.0-pre1" } solana-drone = { path = "../drone", version = "0.18.0-pre1" } solana-logger = { path = "../logger", version = "0.18.0-pre1" } -solana-netutil = { path = "../netutil", version = "0.18.0-pre1" } +solana-netutil = { path = "../utils/netutil", version = "0.18.0-pre1" } solana-runtime = { path = "../runtime", version = "0.18.0-pre1" } solana-sdk = { path = "../sdk", version = "0.18.0-pre1" } solana-stake-api = { path = "../programs/stake_api", version = "0.18.0-pre1" }