From d89041c6b12f18d3a5a0f84fbaec6704ef3950bf Mon Sep 17 00:00:00 2001 From: Mathieu Baudet Date: Tue, 25 May 2021 13:21:19 -0700 Subject: [PATCH] [nit] remove intermediate directory "rust" --- Cargo.lock | 64 +++++++++++++++++++ Cargo.toml | 4 +- {rust/fastpay => fastpay}/Cargo.toml | 0 {rust/fastpay => fastpay}/src/bench.rs | 0 {rust/fastpay => fastpay}/src/client.rs | 0 {rust/fastpay => fastpay}/src/config.rs | 0 {rust/fastpay => fastpay}/src/lib.rs | 0 {rust/fastpay => fastpay}/src/network.rs | 0 {rust/fastpay => fastpay}/src/server.rs | 0 {rust/fastpay => fastpay}/src/transport.rs | 0 .../src/unit_tests/transport_tests.rs | 0 .../fastpay_core => fastpay_core}/Cargo.toml | 0 .../src/authority.rs | 0 .../src/base_types.rs | 0 .../src/client.rs | 0 .../src/committee.rs | 0 .../src/downloader.rs | 0 .../src/error.rs | 0 .../src/fastpay_smart_contract.rs | 0 .../fastpay_core => fastpay_core}/src/lib.rs | 0 .../src/messages.rs | 0 .../src/serialize.rs | 0 .../src/unit_tests/authority_tests.rs | 0 .../src/unit_tests/base_types_tests.rs | 0 .../src/unit_tests/client_tests.rs | 0 .../src/unit_tests/downloader_tests.rs | 0 .../fastpay_smart_contract_tests.rs | 0 .../src/unit_tests/messages_tests.rs | 0 .../src/unit_tests/serialize_tests.rs | 0 29 files changed, 66 insertions(+), 2 deletions(-) rename {rust/fastpay => fastpay}/Cargo.toml (100%) rename {rust/fastpay => fastpay}/src/bench.rs (100%) rename {rust/fastpay => fastpay}/src/client.rs (100%) rename {rust/fastpay => fastpay}/src/config.rs (100%) rename {rust/fastpay => fastpay}/src/lib.rs (100%) rename {rust/fastpay => fastpay}/src/network.rs (100%) rename {rust/fastpay => fastpay}/src/server.rs (100%) rename {rust/fastpay => fastpay}/src/transport.rs (100%) rename {rust/fastpay => fastpay}/src/unit_tests/transport_tests.rs (100%) rename {rust/fastpay_core => fastpay_core}/Cargo.toml (100%) rename {rust/fastpay_core => fastpay_core}/src/authority.rs (100%) rename {rust/fastpay_core => fastpay_core}/src/base_types.rs (100%) rename {rust/fastpay_core => fastpay_core}/src/client.rs (100%) rename {rust/fastpay_core => fastpay_core}/src/committee.rs (100%) rename {rust/fastpay_core => fastpay_core}/src/downloader.rs (100%) rename {rust/fastpay_core => fastpay_core}/src/error.rs (100%) rename {rust/fastpay_core => fastpay_core}/src/fastpay_smart_contract.rs (100%) rename {rust/fastpay_core => fastpay_core}/src/lib.rs (100%) rename {rust/fastpay_core => fastpay_core}/src/messages.rs (100%) rename {rust/fastpay_core => fastpay_core}/src/serialize.rs (100%) rename {rust/fastpay_core => fastpay_core}/src/unit_tests/authority_tests.rs (100%) rename {rust/fastpay_core => fastpay_core}/src/unit_tests/base_types_tests.rs (100%) rename {rust/fastpay_core => fastpay_core}/src/unit_tests/client_tests.rs (100%) rename {rust/fastpay_core => fastpay_core}/src/unit_tests/downloader_tests.rs (100%) rename {rust/fastpay_core => fastpay_core}/src/unit_tests/fastpay_smart_contract_tests.rs (100%) rename {rust/fastpay_core => fastpay_core}/src/unit_tests/messages_tests.rs (100%) rename {rust/fastpay_core => fastpay_core}/src/unit_tests/serialize_tests.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 0072cc0c777c3..68edc6712e344 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -228,6 +228,7 @@ dependencies = [ "net2", "serde", "serde_json", + "structopt", "tokio", ] @@ -384,6 +385,15 @@ dependencies = [ "wasi", ] +[[package]] +name = "heck" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "hermit-abi" version = "0.1.11" @@ -607,6 +617,30 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + [[package]] name = "proc-macro-hack" version = "0.5.15" @@ -804,6 +838,30 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +[[package]] +name = "structopt" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5277acd7ee46e63e5168a80734c9f6ee81b1367a7d8772a2d765df2a3705d28c" +dependencies = [ + "clap", + "lazy_static", + "structopt-derive", +] + +[[package]] +name = "structopt-derive" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ba9cdfda491b814720b6b06e0cac513d922fc407582032e8706e9f137976f90" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "subtle" version = "2.2.2" @@ -901,6 +959,12 @@ version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" +[[package]] +name = "unicode-segmentation" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" + [[package]] name = "unicode-width" version = "0.1.7" diff --git a/Cargo.toml b/Cargo.toml index 1c0c6bddec5f5..40633937449d0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [workspace] members = [ - "rust/fastpay_core", - "rust/fastpay", + "fastpay_core", + "fastpay", ] [profile.release] diff --git a/rust/fastpay/Cargo.toml b/fastpay/Cargo.toml similarity index 100% rename from rust/fastpay/Cargo.toml rename to fastpay/Cargo.toml diff --git a/rust/fastpay/src/bench.rs b/fastpay/src/bench.rs similarity index 100% rename from rust/fastpay/src/bench.rs rename to fastpay/src/bench.rs diff --git a/rust/fastpay/src/client.rs b/fastpay/src/client.rs similarity index 100% rename from rust/fastpay/src/client.rs rename to fastpay/src/client.rs diff --git a/rust/fastpay/src/config.rs b/fastpay/src/config.rs similarity index 100% rename from rust/fastpay/src/config.rs rename to fastpay/src/config.rs diff --git a/rust/fastpay/src/lib.rs b/fastpay/src/lib.rs similarity index 100% rename from rust/fastpay/src/lib.rs rename to fastpay/src/lib.rs diff --git a/rust/fastpay/src/network.rs b/fastpay/src/network.rs similarity index 100% rename from rust/fastpay/src/network.rs rename to fastpay/src/network.rs diff --git a/rust/fastpay/src/server.rs b/fastpay/src/server.rs similarity index 100% rename from rust/fastpay/src/server.rs rename to fastpay/src/server.rs diff --git a/rust/fastpay/src/transport.rs b/fastpay/src/transport.rs similarity index 100% rename from rust/fastpay/src/transport.rs rename to fastpay/src/transport.rs diff --git a/rust/fastpay/src/unit_tests/transport_tests.rs b/fastpay/src/unit_tests/transport_tests.rs similarity index 100% rename from rust/fastpay/src/unit_tests/transport_tests.rs rename to fastpay/src/unit_tests/transport_tests.rs diff --git a/rust/fastpay_core/Cargo.toml b/fastpay_core/Cargo.toml similarity index 100% rename from rust/fastpay_core/Cargo.toml rename to fastpay_core/Cargo.toml diff --git a/rust/fastpay_core/src/authority.rs b/fastpay_core/src/authority.rs similarity index 100% rename from rust/fastpay_core/src/authority.rs rename to fastpay_core/src/authority.rs diff --git a/rust/fastpay_core/src/base_types.rs b/fastpay_core/src/base_types.rs similarity index 100% rename from rust/fastpay_core/src/base_types.rs rename to fastpay_core/src/base_types.rs diff --git a/rust/fastpay_core/src/client.rs b/fastpay_core/src/client.rs similarity index 100% rename from rust/fastpay_core/src/client.rs rename to fastpay_core/src/client.rs diff --git a/rust/fastpay_core/src/committee.rs b/fastpay_core/src/committee.rs similarity index 100% rename from rust/fastpay_core/src/committee.rs rename to fastpay_core/src/committee.rs diff --git a/rust/fastpay_core/src/downloader.rs b/fastpay_core/src/downloader.rs similarity index 100% rename from rust/fastpay_core/src/downloader.rs rename to fastpay_core/src/downloader.rs diff --git a/rust/fastpay_core/src/error.rs b/fastpay_core/src/error.rs similarity index 100% rename from rust/fastpay_core/src/error.rs rename to fastpay_core/src/error.rs diff --git a/rust/fastpay_core/src/fastpay_smart_contract.rs b/fastpay_core/src/fastpay_smart_contract.rs similarity index 100% rename from rust/fastpay_core/src/fastpay_smart_contract.rs rename to fastpay_core/src/fastpay_smart_contract.rs diff --git a/rust/fastpay_core/src/lib.rs b/fastpay_core/src/lib.rs similarity index 100% rename from rust/fastpay_core/src/lib.rs rename to fastpay_core/src/lib.rs diff --git a/rust/fastpay_core/src/messages.rs b/fastpay_core/src/messages.rs similarity index 100% rename from rust/fastpay_core/src/messages.rs rename to fastpay_core/src/messages.rs diff --git a/rust/fastpay_core/src/serialize.rs b/fastpay_core/src/serialize.rs similarity index 100% rename from rust/fastpay_core/src/serialize.rs rename to fastpay_core/src/serialize.rs diff --git a/rust/fastpay_core/src/unit_tests/authority_tests.rs b/fastpay_core/src/unit_tests/authority_tests.rs similarity index 100% rename from rust/fastpay_core/src/unit_tests/authority_tests.rs rename to fastpay_core/src/unit_tests/authority_tests.rs diff --git a/rust/fastpay_core/src/unit_tests/base_types_tests.rs b/fastpay_core/src/unit_tests/base_types_tests.rs similarity index 100% rename from rust/fastpay_core/src/unit_tests/base_types_tests.rs rename to fastpay_core/src/unit_tests/base_types_tests.rs diff --git a/rust/fastpay_core/src/unit_tests/client_tests.rs b/fastpay_core/src/unit_tests/client_tests.rs similarity index 100% rename from rust/fastpay_core/src/unit_tests/client_tests.rs rename to fastpay_core/src/unit_tests/client_tests.rs diff --git a/rust/fastpay_core/src/unit_tests/downloader_tests.rs b/fastpay_core/src/unit_tests/downloader_tests.rs similarity index 100% rename from rust/fastpay_core/src/unit_tests/downloader_tests.rs rename to fastpay_core/src/unit_tests/downloader_tests.rs diff --git a/rust/fastpay_core/src/unit_tests/fastpay_smart_contract_tests.rs b/fastpay_core/src/unit_tests/fastpay_smart_contract_tests.rs similarity index 100% rename from rust/fastpay_core/src/unit_tests/fastpay_smart_contract_tests.rs rename to fastpay_core/src/unit_tests/fastpay_smart_contract_tests.rs diff --git a/rust/fastpay_core/src/unit_tests/messages_tests.rs b/fastpay_core/src/unit_tests/messages_tests.rs similarity index 100% rename from rust/fastpay_core/src/unit_tests/messages_tests.rs rename to fastpay_core/src/unit_tests/messages_tests.rs diff --git a/rust/fastpay_core/src/unit_tests/serialize_tests.rs b/fastpay_core/src/unit_tests/serialize_tests.rs similarity index 100% rename from rust/fastpay_core/src/unit_tests/serialize_tests.rs rename to fastpay_core/src/unit_tests/serialize_tests.rs