Make the world flat again; remove utils/ subdirectory (#5752)

automerge
2019-08-30 11:57:39 -07:00 · 2019-08-30 11:57:39 -07:00 · 643d0b0868
parent 3cc5d8df7f
commit 643d0b0868
19 changed files with 12 additions and 12 deletions
--- 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",
 ]
--- 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"
--- 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"]
--- 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" }
--- 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" }
--- 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]
--- 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" }
--- a/utils/fixed-buf/.gitignore
+++ b/utils/fixed-buf/.gitignore
--- a/utils/fixed-buf/Cargo.toml
+++ b/utils/fixed-buf/Cargo.toml
--- a/utils/fixed-buf/src/lib.rs
+++ b/utils/fixed-buf/src/lib.rs
--- 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]
--- a/utils/netutil/.gitignore
+++ b/utils/netutil/.gitignore
--- a/utils/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.19.0-pre0" }
+solana-logger = { path = "../logger", version = "0.19.0-pre0" }
 tokio = "0.1"

 [lib]
--- a/utils/netutil/src/bin/ip_address.rs
+++ b/utils/netutil/src/bin/ip_address.rs
--- a/utils/netutil/src/bin/ip_address_server.rs
+++ b/utils/netutil/src/bin/ip_address_server.rs
--- a/utils/netutil/src/ip_echo_server.rs
+++ b/utils/netutil/src/ip_echo_server.rs
--- a/utils/netutil/src/lib.rs
+++ b/utils/netutil/src/lib.rs
--- 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]
--- 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" }