From 643d0b08681084b0f673a565001d70dd700b6fd9 Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Fri, 30 Aug 2019 11:57:39 -0700 Subject: [PATCH] Make the world flat again; remove utils/ subdirectory (#5752) automerge --- Cargo.toml | 4 ++-- bench-exchange/Cargo.toml | 2 +- bench-streamer/Cargo.toml | 2 +- bench-tps/Cargo.toml | 2 +- cli/Cargo.toml | 2 +- client/Cargo.toml | 2 +- core/Cargo.toml | 2 +- {utils/fixed-buf => fixed-buf}/.gitignore | 0 {utils/fixed-buf => fixed-buf}/Cargo.toml | 0 {utils/fixed-buf => fixed-buf}/src/lib.rs | 0 gossip/Cargo.toml | 2 +- {utils/netutil => netutil}/.gitignore | 0 {utils/netutil => netutil}/Cargo.toml | 2 +- {utils/netutil => netutil}/src/bin/ip_address.rs | 0 {utils/netutil => netutil}/src/bin/ip_address_server.rs | 0 {utils/netutil => netutil}/src/ip_echo_server.rs | 0 {utils/netutil => netutil}/src/lib.rs | 0 replicator/Cargo.toml | 2 +- validator/Cargo.toml | 2 +- 19 files changed, 12 insertions(+), 12 deletions(-) rename {utils/fixed-buf => fixed-buf}/.gitignore (100%) rename {utils/fixed-buf => fixed-buf}/Cargo.toml (100%) rename {utils/fixed-buf => fixed-buf}/src/lib.rs (100%) rename {utils/netutil => netutil}/.gitignore (100%) rename {utils/netutil => netutil}/Cargo.toml (89%) rename {utils/netutil => netutil}/src/bin/ip_address.rs (100%) rename {utils/netutil => netutil}/src/bin/ip_address_server.rs (100%) rename {utils/netutil => netutil}/src/ip_echo_server.rs (100%) rename {utils/netutil => netutil}/src/lib.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 9f3e64353d..b7d34558c6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -51,8 +51,8 @@ members = [ "sdk-c", "upload-perf", "validator-info", - "utils/netutil", - "utils/fixed-buf", + "netutil", + "fixed-buf", "vote-signer", "cli", ] diff --git a/bench-exchange/Cargo.toml b/bench-exchange/Cargo.toml index c5268b8e43..09317692ba 100644 --- a/bench-exchange/Cargo.toml +++ b/bench-exchange/Cargo.toml @@ -32,7 +32,7 @@ solana-exchange-api = { path = "../programs/exchange_api", version = "0.19.0-pre solana-exchange-program = { path = "../programs/exchange_program", version = "0.19.0-pre0" } solana-logger = { path = "../logger", version = "0.19.0-pre0" } solana-metrics = { path = "../metrics", version = "0.19.0-pre0" } -solana-netutil = { path = "../utils/netutil", version = "0.19.0-pre0" } +solana-netutil = { path = "../netutil", version = "0.19.0-pre0" } solana-runtime = { path = "../runtime", version = "0.19.0-pre0" } solana-sdk = { path = "../sdk", version = "0.19.0-pre0" } untrusted = "0.7.0" diff --git a/bench-streamer/Cargo.toml b/bench-streamer/Cargo.toml index 542602a97c..a073f19a73 100644 --- a/bench-streamer/Cargo.toml +++ b/bench-streamer/Cargo.toml @@ -11,7 +11,7 @@ homepage = "https://solana.com/" clap = "2.33.0" solana-core = { path = "../core", version = "0.19.0-pre0" } solana-logger = { path = "../logger", version = "0.19.0-pre0" } -solana-netutil = { path = "../utils/netutil", version = "0.19.0-pre0" } +solana-netutil = { path = "../netutil", version = "0.19.0-pre0" } [features] cuda = ["solana-core/cuda"] diff --git a/bench-tps/Cargo.toml b/bench-tps/Cargo.toml index 493f7a93e6..92fc628506 100644 --- a/bench-tps/Cargo.toml +++ b/bench-tps/Cargo.toml @@ -24,7 +24,7 @@ solana-librapay-api = { path = "../programs/librapay_api", version = "0.19.0-pre solana-logger = { path = "../logger", version = "0.19.0-pre0" } solana-metrics = { path = "../metrics", version = "0.19.0-pre0" } solana-measure = { path = "../measure", version = "0.19.0-pre0" } -solana-netutil = { path = "../utils/netutil", version = "0.19.0-pre0" } +solana-netutil = { path = "../netutil", version = "0.19.0-pre0" } solana-runtime = { path = "../runtime", version = "0.19.0-pre0" } solana-sdk = { path = "../sdk", version = "0.19.0-pre0" } solana-move-loader-program = { path = "../programs/move_loader_program", version = "0.19.0-pre0" } diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 9a2de12b2a..33a3c6a878 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -29,7 +29,7 @@ solana-budget-api = { path = "../programs/budget_api", version = "0.19.0-pre0" } solana-client = { path = "../client", version = "0.19.0-pre0" } solana-drone = { path = "../drone", version = "0.19.0-pre0" } solana-logger = { path = "../logger", version = "0.19.0-pre0" } -solana-netutil = { path = "../utils/netutil", version = "0.19.0-pre0" } +solana-netutil = { path = "../netutil", version = "0.19.0-pre0" } solana-runtime = { path = "../runtime", version = "0.19.0-pre0" } solana-sdk = { path = "../sdk", version = "0.19.0-pre0" } solana-stake-api = { path = "../programs/stake_api", version = "0.19.0-pre0" } diff --git a/client/Cargo.toml b/client/Cargo.toml index 1c46ee44e7..5cc7fd3b53 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -19,7 +19,7 @@ reqwest = "0.9.20" serde = "1.0.99" serde_derive = "1.0.99" serde_json = "1.0.40" -solana-netutil = { path = "../utils/netutil", version = "0.19.0-pre0" } +solana-netutil = { path = "../netutil", version = "0.19.0-pre0" } solana-sdk = { path = "../sdk", version = "0.19.0-pre0" } [dev-dependencies] diff --git a/core/Cargo.toml b/core/Cargo.toml index 68d62184f1..965902d6bd 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -58,7 +58,7 @@ solana-logger = { path = "../logger", version = "0.19.0-pre0" } solana-merkle-tree = { path = "../merkle-tree", version = "0.19.0-pre0" } solana-metrics = { path = "../metrics", version = "0.19.0-pre0" } solana-measure = { path = "../measure", version = "0.19.0-pre0" } -solana-netutil = { path = "../utils/netutil", version = "0.19.0-pre0" } +solana-netutil = { path = "../netutil", version = "0.19.0-pre0" } solana-runtime = { path = "../runtime", version = "0.19.0-pre0" } solana-sdk = { path = "../sdk", version = "0.19.0-pre0" } solana-stake-api = { path = "../programs/stake_api", version = "0.19.0-pre0" } diff --git a/utils/fixed-buf/.gitignore b/fixed-buf/.gitignore similarity index 100% rename from utils/fixed-buf/.gitignore rename to fixed-buf/.gitignore diff --git a/utils/fixed-buf/Cargo.toml b/fixed-buf/Cargo.toml similarity index 100% rename from utils/fixed-buf/Cargo.toml rename to fixed-buf/Cargo.toml diff --git a/utils/fixed-buf/src/lib.rs b/fixed-buf/src/lib.rs similarity index 100% rename from utils/fixed-buf/src/lib.rs rename to fixed-buf/src/lib.rs diff --git a/gossip/Cargo.toml b/gossip/Cargo.toml index 7b341351b5..0bb4684c42 100644 --- a/gossip/Cargo.toml +++ b/gossip/Cargo.toml @@ -13,7 +13,7 @@ clap = "2.33.0" solana-core = { path = "../core", version = "0.19.0-pre0" } solana-client = { path = "../client", version = "0.19.0-pre0" } solana-logger = { path = "../logger", version = "0.19.0-pre0" } -solana-netutil = { path = "../utils/netutil", version = "0.19.0-pre0" } +solana-netutil = { path = "../netutil", version = "0.19.0-pre0" } solana-sdk = { path = "../sdk", version = "0.19.0-pre0" } [features] diff --git a/utils/netutil/.gitignore b/netutil/.gitignore similarity index 100% rename from utils/netutil/.gitignore rename to netutil/.gitignore diff --git a/utils/netutil/Cargo.toml b/netutil/Cargo.toml similarity index 89% rename from utils/netutil/Cargo.toml rename to netutil/Cargo.toml index 320c2d9de0..631eb4586c 100644 --- a/utils/netutil/Cargo.toml +++ b/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.19.0-pre0" } +solana-logger = { path = "../logger", version = "0.19.0-pre0" } tokio = "0.1" [lib] diff --git a/utils/netutil/src/bin/ip_address.rs b/netutil/src/bin/ip_address.rs similarity index 100% rename from utils/netutil/src/bin/ip_address.rs rename to netutil/src/bin/ip_address.rs diff --git a/utils/netutil/src/bin/ip_address_server.rs b/netutil/src/bin/ip_address_server.rs similarity index 100% rename from utils/netutil/src/bin/ip_address_server.rs rename to netutil/src/bin/ip_address_server.rs diff --git a/utils/netutil/src/ip_echo_server.rs b/netutil/src/ip_echo_server.rs similarity index 100% rename from utils/netutil/src/ip_echo_server.rs rename to netutil/src/ip_echo_server.rs diff --git a/utils/netutil/src/lib.rs b/netutil/src/lib.rs similarity index 100% rename from utils/netutil/src/lib.rs rename to netutil/src/lib.rs diff --git a/replicator/Cargo.toml b/replicator/Cargo.toml index dc3c2aeb25..960c294296 100644 --- a/replicator/Cargo.toml +++ b/replicator/Cargo.toml @@ -11,7 +11,7 @@ homepage = "https://solana.com/" clap = "2.33.0" solana-core = { path = "../core", version = "0.19.0-pre0" } solana-logger = { path = "../logger", version = "0.19.0-pre0" } -solana-netutil = { path = "../utils/netutil", version = "0.19.0-pre0" } +solana-netutil = { path = "../netutil", version = "0.19.0-pre0" } solana-sdk = { path = "../sdk", version = "0.19.0-pre0" } [features] diff --git a/validator/Cargo.toml b/validator/Cargo.toml index a49a52ac71..272821b5bf 100644 --- a/validator/Cargo.toml +++ b/validator/Cargo.toml @@ -21,7 +21,7 @@ solana-core = { path = "../core", version = "0.19.0-pre0" } solana-drone = { path = "../drone", version = "0.19.0-pre0" } solana-logger = { path = "../logger", version = "0.19.0-pre0" } solana-metrics = { path = "../metrics", version = "0.19.0-pre0" } -solana-netutil = { path = "../utils/netutil", version = "0.19.0-pre0" } +solana-netutil = { path = "../netutil", version = "0.19.0-pre0" } solana-runtime = { path = "../runtime", version = "0.19.0-pre0" } solana-sdk = { path = "../sdk", version = "0.19.0-pre0" } solana-vote-api = { path = "../programs/vote_api", version = "0.19.0-pre0" }