From 2fd2140f64af40ae686703451cb967966265fd62 Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Tue, 12 Nov 2019 22:20:48 -0700 Subject: [PATCH] =?UTF-8?q?=F0=9F=8D=A2banking-bench/,=20genesis-programs/?= =?UTF-8?q?=20and=20local-cluster/=20(#6920)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * git mv genesis_programs genesis-programs * git mv local_cluster local-cluster * git mv banking_bench banking-bench --- Cargo.toml | 6 +++--- {banking_bench => banking-bench}/.gitignore | 0 {banking_bench => banking-bench}/Cargo.toml | 0 {banking_bench => banking-bench}/src/main.rs | 0 bench-exchange/Cargo.toml | 2 +- bench-tps/Cargo.toml | 2 +- ci/test-bench.sh | 2 +- {genesis_programs => genesis-programs}/.gitignore | 0 {genesis_programs => genesis-programs}/Cargo.toml | 0 {genesis_programs => genesis-programs}/src/lib.rs | 0 genesis/Cargo.toml | 2 +- ledger/Cargo.toml | 2 +- {local_cluster => local-cluster}/.gitignore | 0 {local_cluster => local-cluster}/Cargo.toml | 2 +- {local_cluster => local-cluster}/src/cluster.rs | 0 {local_cluster => local-cluster}/src/cluster_tests.rs | 0 {local_cluster => local-cluster}/src/lib.rs | 0 {local_cluster => local-cluster}/src/local_cluster.rs | 0 {local_cluster => local-cluster}/tests/archiver.rs | 0 {local_cluster => local-cluster}/tests/local_cluster.rs | 0 20 files changed, 9 insertions(+), 9 deletions(-) rename {banking_bench => banking-bench}/.gitignore (100%) rename {banking_bench => banking-bench}/Cargo.toml (100%) rename {banking_bench => banking-bench}/src/main.rs (100%) rename {genesis_programs => genesis-programs}/.gitignore (100%) rename {genesis_programs => genesis-programs}/Cargo.toml (100%) rename {genesis_programs => genesis-programs}/src/lib.rs (100%) rename {local_cluster => local-cluster}/.gitignore (100%) rename {local_cluster => local-cluster}/Cargo.toml (96%) rename {local_cluster => local-cluster}/src/cluster.rs (100%) rename {local_cluster => local-cluster}/src/cluster_tests.rs (100%) rename {local_cluster => local-cluster}/src/lib.rs (100%) rename {local_cluster => local-cluster}/src/local_cluster.rs (100%) rename {local_cluster => local-cluster}/tests/archiver.rs (100%) rename {local_cluster => local-cluster}/tests/local_cluster.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 83bb3436f8..4bb0a37f40 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ members = [ "bench-exchange", "bench-streamer", "bench-tps", - "banking_bench", + "banking-bench", "chacha-sys", "client", "core", @@ -11,13 +11,13 @@ members = [ "perf", "validator", "genesis", - "genesis_programs", + "genesis-programs", "gossip", "install", "keygen", "ledger", "ledger-tool", - "local_cluster", + "local-cluster", "logger", "log-analyzer", "merkle-tree", diff --git a/banking_bench/.gitignore b/banking-bench/.gitignore similarity index 100% rename from banking_bench/.gitignore rename to banking-bench/.gitignore diff --git a/banking_bench/Cargo.toml b/banking-bench/Cargo.toml similarity index 100% rename from banking_bench/Cargo.toml rename to banking-bench/Cargo.toml diff --git a/banking_bench/src/main.rs b/banking-bench/src/main.rs similarity index 100% rename from banking_bench/src/main.rs rename to banking-bench/src/main.rs diff --git a/bench-exchange/Cargo.toml b/bench-exchange/Cargo.toml index d4a250aa73..f7772c15cf 100644 --- a/bench-exchange/Cargo.toml +++ b/bench-exchange/Cargo.toml @@ -39,4 +39,4 @@ untrusted = "0.7.0" ws = "0.9.1" [dev-dependencies] -solana-local-cluster = { path = "../local_cluster", version = "0.21.0" } +solana-local-cluster = { path = "../local-cluster", version = "0.21.0" } diff --git a/bench-tps/Cargo.toml b/bench-tps/Cargo.toml index 674bab5c31..00216f9e93 100644 --- a/bench-tps/Cargo.toml +++ b/bench-tps/Cargo.toml @@ -33,7 +33,7 @@ solana-move-loader-api = { path = "../programs/move_loader_api", version = "0.21 [dev-dependencies] serial_test = "0.2.0" serial_test_derive = "0.2.0" -solana-local-cluster = { path = "../local_cluster", version = "0.21.0" } +solana-local-cluster = { path = "../local-cluster", version = "0.21.0" } [features] move = ["solana-librapay-api", "solana-move-loader-program", "solana-move-loader-api"] diff --git a/ci/test-bench.sh b/ci/test-bench.sh index 14f6810f5e..16087363d1 100755 --- a/ci/test-bench.sh +++ b/ci/test-bench.sh @@ -68,7 +68,7 @@ _ cargo +$rust_nightly bench --manifest-path programs/bpf/Cargo.toml ${V:+--verb -- -Z unstable-options --format=json --nocapture | tee -a "$BENCH_FILE" # Run banking bench. Doesn't require nightly, but use since it is already built. -_ cargo +$rust_nightly run --release --manifest-path banking_bench/Cargo.toml ${V:+--verbose} | tee -a "$BENCH_FILE" +_ cargo +$rust_nightly run --release --manifest-path banking-bench/Cargo.toml ${V:+--verbose} | tee -a "$BENCH_FILE" # `solana-upload-perf` disabled as it can take over 30 minutes to complete for some # reason diff --git a/genesis_programs/.gitignore b/genesis-programs/.gitignore similarity index 100% rename from genesis_programs/.gitignore rename to genesis-programs/.gitignore diff --git a/genesis_programs/Cargo.toml b/genesis-programs/Cargo.toml similarity index 100% rename from genesis_programs/Cargo.toml rename to genesis-programs/Cargo.toml diff --git a/genesis_programs/src/lib.rs b/genesis-programs/src/lib.rs similarity index 100% rename from genesis_programs/src/lib.rs rename to genesis-programs/src/lib.rs diff --git a/genesis/Cargo.toml b/genesis/Cargo.toml index 88815244c7..ae2b93c688 100644 --- a/genesis/Cargo.toml +++ b/genesis/Cargo.toml @@ -15,7 +15,7 @@ serde = "1.0.102" serde_derive = "1.0.102" serde_json = "1.0.41" serde_yaml = "0.8.11" -solana-genesis-programs = { path = "../genesis_programs", version = "0.21.0" } +solana-genesis-programs = { path = "../genesis-programs", version = "0.21.0" } solana-ledger = { path = "../ledger", version = "0.21.0" } solana-sdk = { path = "../sdk", version = "0.21.0" } solana-stake-api = { path = "../programs/stake_api", version = "0.21.0" } diff --git a/ledger/Cargo.toml b/ledger/Cargo.toml index cc6560c984..1bb5c9e9f6 100644 --- a/ledger/Cargo.toml +++ b/ledger/Cargo.toml @@ -28,7 +28,7 @@ rayon = "1.2.0" reed-solomon-erasure = { package = "solana-reed-solomon-erasure", version = "4.0.1-3", features = ["simd-accel"] } serde = "1.0.102" serde_derive = "1.0.102" -solana-genesis-programs = { path = "../genesis_programs", version = "0.21.0" } +solana-genesis-programs = { path = "../genesis-programs", version = "0.21.0" } solana-logger = { path = "../logger", version = "0.21.0" } solana-measure = { path = "../measure", version = "0.21.0" } solana-merkle-tree = { path = "../merkle-tree", version = "0.21.0" } diff --git a/local_cluster/.gitignore b/local-cluster/.gitignore similarity index 100% rename from local_cluster/.gitignore rename to local-cluster/.gitignore diff --git a/local_cluster/Cargo.toml b/local-cluster/Cargo.toml similarity index 96% rename from local_cluster/Cargo.toml rename to local-cluster/Cargo.toml index bc3e65ac50..26c5f30299 100644 --- a/local_cluster/Cargo.toml +++ b/local-cluster/Cargo.toml @@ -17,7 +17,7 @@ solana-client = { path = "../client", version = "0.21.0" } solana-drone = { path = "../drone", version = "0.21.0" } solana-exchange-api = { path = "../programs/exchange_api", version = "0.21.0" } solana-exchange-program = { path = "../programs/exchange_program", version = "0.21.0" } -solana-genesis-programs = { path = "../genesis_programs", version = "0.21.0" } +solana-genesis-programs = { path = "../genesis-programs", version = "0.21.0" } solana-ledger = { path = "../ledger", version = "0.21.0" } solana-logger = { path = "../logger", version = "0.21.0" } solana-runtime = { path = "../runtime", version = "0.21.0" } diff --git a/local_cluster/src/cluster.rs b/local-cluster/src/cluster.rs similarity index 100% rename from local_cluster/src/cluster.rs rename to local-cluster/src/cluster.rs diff --git a/local_cluster/src/cluster_tests.rs b/local-cluster/src/cluster_tests.rs similarity index 100% rename from local_cluster/src/cluster_tests.rs rename to local-cluster/src/cluster_tests.rs diff --git a/local_cluster/src/lib.rs b/local-cluster/src/lib.rs similarity index 100% rename from local_cluster/src/lib.rs rename to local-cluster/src/lib.rs diff --git a/local_cluster/src/local_cluster.rs b/local-cluster/src/local_cluster.rs similarity index 100% rename from local_cluster/src/local_cluster.rs rename to local-cluster/src/local_cluster.rs diff --git a/local_cluster/tests/archiver.rs b/local-cluster/tests/archiver.rs similarity index 100% rename from local_cluster/tests/archiver.rs rename to local-cluster/tests/archiver.rs diff --git a/local_cluster/tests/local_cluster.rs b/local-cluster/tests/local_cluster.rs similarity index 100% rename from local_cluster/tests/local_cluster.rs rename to local-cluster/tests/local_cluster.rs