diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml index 210b420daa..765068040f 100644 --- a/.github/workflows/ci-test.yml +++ b/.github/workflows/ci-test.yml @@ -819,8 +819,8 @@ jobs: key: ${{ needs.prepare.outputs.changes-target-branch }} - name: run crypto unit tests run: | - $pre_command && cd crypto/crypto && cargo test --features='u64' --no-default-features - $pre_command && cd crypto/crypto && cargo test --features='u32' --no-default-features + $pre_command && cd crates/diem-crypto && cargo test --features='u64' --no-default-features + $pre_command && cd crates/diem-crypto && cargo test --features='u32' --no-default-features - uses: ./.github/actions/build-teardown - name: Early terminate workflow if: ${{ failure() }} diff --git a/Cargo.toml b/Cargo.toml index cbb82a3876..57870e2ff0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,12 +39,12 @@ members = [ "consensus/consensus-types", "consensus/safety-rules", "crates/diem-assets-proof", + "crates/diem-crypto", + "crates/diem-crypto-derive", "crates/diem-faucet", "crates/diem-json-rpc-client", "crates/swiss-knife", "crates/transaction-emitter", - "crypto/crypto", - "crypto/crypto-derive", "devtools/x", "devtools/x-core", "devtools/x-lint", diff --git a/api/Cargo.toml b/api/Cargo.toml index 611150b0b9..b27c604047 100644 --- a/api/Cargo.toml +++ b/api/Cargo.toml @@ -24,7 +24,7 @@ tokio = { version = "1.8.1", features = ["full"] } warp = { version = "0.3.0", features = ["default"] } diem-config = { path = "../config" } -diem-crypto = { path = "../crypto/crypto" } +diem-crypto = { path = "../crates/diem-crypto" } diem-json-rpc = { path = "../json-rpc" } diem-logger = { path = "../common/logger" } diem-mempool = { path = "../mempool"} @@ -42,7 +42,7 @@ reqwest = { version = "0.11.2", features = ["blocking", "json"], default_feature mempool-notifications = { path = "../state-sync/inter-component/mempool-notifications" } diemdb = { path = "../storage/diemdb", features = ["fuzzing"] } -diem-crypto = { path = "../crypto/crypto" } +diem-crypto = { path = "../crates/diem-crypto" } diem-global-constants = { path = "../config/global-constants" } diem-mempool = { path = "../mempool", features = ["fuzzing"] } diem-secure-storage = { path = "../secure/storage" } diff --git a/api/types/Cargo.toml b/api/types/Cargo.toml index 0679113333..87e1549928 100644 --- a/api/types/Cargo.toml +++ b/api/types/Cargo.toml @@ -17,7 +17,7 @@ serde = { version = "1.0.124", default-features = false } serde_json = "1.0.64" warp = { version = "0.3.0", features = ["default"] } -diem-crypto = { path = "../../crypto/crypto" } +diem-crypto = { path = "../../crates/diem-crypto" } diem-transaction-builder = { path = "../../sdk/transaction-builder" } diem-types = { path = "../../types" } diem-workspace-hack = { path = "../../common/workspace-hack" } diff --git a/config/Cargo.toml b/config/Cargo.toml index fd58d01fde..1765564b36 100644 --- a/config/Cargo.toml +++ b/config/Cargo.toml @@ -19,8 +19,8 @@ serde_yaml = "0.8.17" thiserror = "1.0.24" bcs = "0.1.2" -diem-crypto = { path = "../crypto/crypto" } -diem-crypto-derive = { path = "../crypto/crypto-derive" } +diem-crypto = { path = "../crates/diem-crypto" } +diem-crypto-derive = { path = "../crates/diem-crypto-derive" } diem-global-constants = { path = "./global-constants"} diem-logger = { path = "../common/logger" } diem-network-address-encryption = { path = "management/network-address-encryption" } @@ -31,7 +31,7 @@ diem-workspace-hack = { path = "../common/workspace-hack" } short-hex-str = { path = "../common/short-hex-str" } [dev-dependencies] -diem-crypto = { path = "../crypto/crypto", features = ["fuzzing"] } +diem-crypto = { path = "../crates/diem-crypto", features = ["fuzzing"] } [features] default = [] diff --git a/config/generate-key/Cargo.toml b/config/generate-key/Cargo.toml index da36119bff..5f59c2f172 100644 --- a/config/generate-key/Cargo.toml +++ b/config/generate-key/Cargo.toml @@ -13,6 +13,6 @@ edition = "2018" rand = "0.8.3" bcs = "0.1.2" -diem-crypto = { path = "../../crypto/crypto/"} +diem-crypto = { path = "../../crates/diem-crypto/"} diem-temppath = { path = "../../common/temppath" } diem-workspace-hack = { path = "../../common/workspace-hack" } diff --git a/config/management/Cargo.toml b/config/management/Cargo.toml index 7056c28aa8..bbd6d1f346 100644 --- a/config/management/Cargo.toml +++ b/config/management/Cargo.toml @@ -20,7 +20,7 @@ toml = { version = "0.5.8", default-features = false } bcs = "0.1.2" diem-config = { path = ".."} -diem-crypto = { path = "../../crypto/crypto" } +diem-crypto = { path = "../../crates/diem-crypto" } diem-global-constants = { path = "../global-constants"} diem-network-address-encryption = {path = "network-address-encryption"} diem-secure-storage = { path = "../../secure/storage" } diff --git a/config/management/genesis/Cargo.toml b/config/management/genesis/Cargo.toml index ffb9d8748c..28ca1e2c8a 100644 --- a/config/management/genesis/Cargo.toml +++ b/config/management/genesis/Cargo.toml @@ -22,7 +22,7 @@ executor = { path = "../../../execution/executor" } generate-key = { path = "../../generate-key" } bcs = "0.1.2" diem-config = { path = "../.."} -diem-crypto = { path = "../../../crypto/crypto" } +diem-crypto = { path = "../../../crates/diem-crypto" } diem-framework-releases = { path = "../../../diem-move/diem-framework/DPN/releases"} diem-global-constants = { path = "../../global-constants" } diem-management = { path = ".." } diff --git a/config/management/operational/Cargo.toml b/config/management/operational/Cargo.toml index 6819f6bc16..84d05b61ae 100644 --- a/config/management/operational/Cargo.toml +++ b/config/management/operational/Cargo.toml @@ -28,7 +28,7 @@ toml = { version = "0.5.8", default-features = false } bcs = "0.1.2" diem-client = { path = "../../../sdk/client", features = ["blocking"], default-features = false } diem-config = { path = "../.."} -diem-crypto = { path = "../../../crypto/crypto" } +diem-crypto = { path = "../../../crates/diem-crypto" } diem-global-constants = { path = "../../global-constants" } diem-infallible = { path = "../../../common/infallible" } diem-management = { path = ".." } diff --git a/config/seed-peer-generator/Cargo.toml b/config/seed-peer-generator/Cargo.toml index 4d4a3166f0..b9be87b775 100644 --- a/config/seed-peer-generator/Cargo.toml +++ b/config/seed-peer-generator/Cargo.toml @@ -19,7 +19,7 @@ thiserror = "1.0.24" bcs = "0.1.2" diem-config = { path = ".." } -diem-crypto = { path = "../../crypto/crypto" } +diem-crypto = { path = "../../crates/diem-crypto" } diem-client = { path = "../../sdk/client", features = ["blocking"], default-features = false } diem-logger = { path = "../../common/logger" } diem-temppath = { path = "../../common/temppath" } diff --git a/consensus/Cargo.toml b/consensus/Cargo.toml index b81ae6ee06..e1c868986c 100644 --- a/consensus/Cargo.toml +++ b/consensus/Cargo.toml @@ -39,7 +39,7 @@ executor-types = { path = "../execution/executor-types" } fallible = { path = "../common/fallible" } bcs = "0.1.2" diem-config = { path = "../config" } -diem-crypto = { path = "../crypto/crypto" } +diem-crypto = { path = "../crates/diem-crypto" } diem-logger = { path = "../common/logger" } diem-mempool = { path = "../mempool" } diem-metrics = { path = "../common/metrics" } diff --git a/consensus/consensus-types/Cargo.toml b/consensus/consensus-types/Cargo.toml index 77f70f25a3..618f208caf 100644 --- a/consensus/consensus-types/Cargo.toml +++ b/consensus/consensus-types/Cargo.toml @@ -15,8 +15,8 @@ serde = { version = "1.0.124", default-features = false } executor-types = { path = "../../execution/executor-types" } bcs = "0.1.2" -diem-crypto = { path = "../../crypto/crypto" } -diem-crypto-derive = { path = "../../crypto/crypto-derive" } +diem-crypto = { path = "../../crates/diem-crypto" } +diem-crypto-derive = { path = "../../crates/diem-crypto-derive" } diem-infallible = { path = "../../common/infallible" } diem-types = { path = "../../types" } diem-workspace-hack = { path = "../../common/workspace-hack" } diff --git a/consensus/safety-rules/Cargo.toml b/consensus/safety-rules/Cargo.toml index 6d1e703633..c2105810a2 100644 --- a/consensus/safety-rules/Cargo.toml +++ b/consensus/safety-rules/Cargo.toml @@ -15,7 +15,7 @@ rand_core = "0.6.2" crash-handler = { path = "../../common/crash-handler" } consensus-types = { path = "../consensus-types" } diem-config = { path = "../../config" } -diem-crypto = { path = "../../crypto/crypto" } +diem-crypto = { path = "../../crates/diem-crypto" } diem-global-constants = { path = "../../config/global-constants"} diem-infallible = { path = "../../common/infallible" } diem-logger = { path = "../../common/logger" } diff --git a/crates/diem-assets-proof/Cargo.toml b/crates/diem-assets-proof/Cargo.toml index 2ad9fca215..470c303ae7 100644 --- a/crates/diem-assets-proof/Cargo.toml +++ b/crates/diem-assets-proof/Cargo.toml @@ -17,7 +17,7 @@ structopt = "0.3.21" bcs = "0.1.2" diem-client = { path = "../../sdk/client", features = ["blocking"], default-features = false } -diem-crypto = { path = "../../crypto/crypto" } +diem-crypto = { path = "../../crates/diem-crypto" } diem-types = { path = "../../types" } move-core-types = { path = "../../language/move-core/types" } diff --git a/crypto/crypto-derive/Cargo.toml b/crates/diem-crypto-derive/Cargo.toml similarity index 100% rename from crypto/crypto-derive/Cargo.toml rename to crates/diem-crypto-derive/Cargo.toml diff --git a/crypto/crypto-derive/src/hasher.rs b/crates/diem-crypto-derive/src/hasher.rs similarity index 100% rename from crypto/crypto-derive/src/hasher.rs rename to crates/diem-crypto-derive/src/hasher.rs diff --git a/crypto/crypto-derive/src/lib.rs b/crates/diem-crypto-derive/src/lib.rs similarity index 100% rename from crypto/crypto-derive/src/lib.rs rename to crates/diem-crypto-derive/src/lib.rs diff --git a/crypto/crypto-derive/src/unions.rs b/crates/diem-crypto-derive/src/unions.rs similarity index 100% rename from crypto/crypto-derive/src/unions.rs rename to crates/diem-crypto-derive/src/unions.rs diff --git a/crypto/crypto/Cargo.toml b/crates/diem-crypto/Cargo.toml similarity index 96% rename from crypto/crypto/Cargo.toml rename to crates/diem-crypto/Cargo.toml index 730753ee5e..eabfa5bc6b 100644 --- a/crypto/crypto/Cargo.toml +++ b/crates/diem-crypto/Cargo.toml @@ -32,7 +32,7 @@ thiserror = "1.0.24" tiny-keccak = { version = "2.0.2", features = ["sha3"] } x25519-dalek = { version = "0.1.0", package = "x25519-dalek-fiat", default-features = false, features = ["std"] } aes-gcm = "0.8.0" -diem-crypto-derive = { path = "../crypto-derive", version = "0.0.3" } +diem-crypto-derive = { path = "../diem-crypto-derive", version = "0.0.3" } bcs = "0.1.2" [dev-dependencies] diff --git a/crypto/crypto/README.md b/crates/diem-crypto/README.md similarity index 100% rename from crypto/crypto/README.md rename to crates/diem-crypto/README.md diff --git a/crypto/crypto/benches/ed25519.rs b/crates/diem-crypto/benches/ed25519.rs similarity index 100% rename from crypto/crypto/benches/ed25519.rs rename to crates/diem-crypto/benches/ed25519.rs diff --git a/crypto/crypto/benches/noise.rs b/crates/diem-crypto/benches/noise.rs similarity index 100% rename from crypto/crypto/benches/noise.rs rename to crates/diem-crypto/benches/noise.rs diff --git a/crypto/crypto/src/compat.rs b/crates/diem-crypto/src/compat.rs similarity index 100% rename from crypto/crypto/src/compat.rs rename to crates/diem-crypto/src/compat.rs diff --git a/crypto/crypto/src/ed25519.rs b/crates/diem-crypto/src/ed25519.rs similarity index 100% rename from crypto/crypto/src/ed25519.rs rename to crates/diem-crypto/src/ed25519.rs diff --git a/crypto/crypto/src/error.rs b/crates/diem-crypto/src/error.rs similarity index 100% rename from crypto/crypto/src/error.rs rename to crates/diem-crypto/src/error.rs diff --git a/crypto/crypto/src/hash.rs b/crates/diem-crypto/src/hash.rs similarity index 100% rename from crypto/crypto/src/hash.rs rename to crates/diem-crypto/src/hash.rs diff --git a/crypto/crypto/src/hkdf.rs b/crates/diem-crypto/src/hkdf.rs similarity index 100% rename from crypto/crypto/src/hkdf.rs rename to crates/diem-crypto/src/hkdf.rs diff --git a/crypto/crypto/src/lib.rs b/crates/diem-crypto/src/lib.rs similarity index 100% rename from crypto/crypto/src/lib.rs rename to crates/diem-crypto/src/lib.rs diff --git a/crypto/crypto/src/multi_ed25519.rs b/crates/diem-crypto/src/multi_ed25519.rs similarity index 100% rename from crypto/crypto/src/multi_ed25519.rs rename to crates/diem-crypto/src/multi_ed25519.rs diff --git a/crypto/crypto/src/noise.rs b/crates/diem-crypto/src/noise.rs similarity index 100% rename from crypto/crypto/src/noise.rs rename to crates/diem-crypto/src/noise.rs diff --git a/crypto/crypto/src/tags.rs b/crates/diem-crypto/src/tags.rs similarity index 100% rename from crypto/crypto/src/tags.rs rename to crates/diem-crypto/src/tags.rs diff --git a/crypto/crypto/src/test_utils.rs b/crates/diem-crypto/src/test_utils.rs similarity index 100% rename from crypto/crypto/src/test_utils.rs rename to crates/diem-crypto/src/test_utils.rs diff --git a/crypto/crypto/src/traits.rs b/crates/diem-crypto/src/traits.rs similarity index 100% rename from crypto/crypto/src/traits.rs rename to crates/diem-crypto/src/traits.rs diff --git a/crypto/crypto/src/unit_tests/bcs_test.rs b/crates/diem-crypto/src/unit_tests/bcs_test.rs similarity index 100% rename from crypto/crypto/src/unit_tests/bcs_test.rs rename to crates/diem-crypto/src/unit_tests/bcs_test.rs diff --git a/crypto/crypto/src/unit_tests/compat_test.rs b/crates/diem-crypto/src/unit_tests/compat_test.rs similarity index 100% rename from crypto/crypto/src/unit_tests/compat_test.rs rename to crates/diem-crypto/src/unit_tests/compat_test.rs diff --git a/crypto/crypto/src/unit_tests/compilation/cross_test.rs b/crates/diem-crypto/src/unit_tests/compilation/cross_test.rs similarity index 100% rename from crypto/crypto/src/unit_tests/compilation/cross_test.rs rename to crates/diem-crypto/src/unit_tests/compilation/cross_test.rs diff --git a/crypto/crypto/src/unit_tests/compilation/cross_test_trait_obj.rs b/crates/diem-crypto/src/unit_tests/compilation/cross_test_trait_obj.rs similarity index 100% rename from crypto/crypto/src/unit_tests/compilation/cross_test_trait_obj.rs rename to crates/diem-crypto/src/unit_tests/compilation/cross_test_trait_obj.rs diff --git a/crypto/crypto/src/unit_tests/compilation/cross_test_trait_obj_pub.rs b/crates/diem-crypto/src/unit_tests/compilation/cross_test_trait_obj_pub.rs similarity index 100% rename from crypto/crypto/src/unit_tests/compilation/cross_test_trait_obj_pub.rs rename to crates/diem-crypto/src/unit_tests/compilation/cross_test_trait_obj_pub.rs diff --git a/crypto/crypto/src/unit_tests/compilation/cross_test_trait_obj_sig.rs b/crates/diem-crypto/src/unit_tests/compilation/cross_test_trait_obj_sig.rs similarity index 100% rename from crypto/crypto/src/unit_tests/compilation/cross_test_trait_obj_sig.rs rename to crates/diem-crypto/src/unit_tests/compilation/cross_test_trait_obj_sig.rs diff --git a/crypto/crypto/src/unit_tests/compilation/small_kdf.rs b/crates/diem-crypto/src/unit_tests/compilation/small_kdf.rs similarity index 100% rename from crypto/crypto/src/unit_tests/compilation/small_kdf.rs rename to crates/diem-crypto/src/unit_tests/compilation/small_kdf.rs diff --git a/crypto/crypto/src/unit_tests/cross_test.rs b/crates/diem-crypto/src/unit_tests/cross_test.rs similarity index 100% rename from crypto/crypto/src/unit_tests/cross_test.rs rename to crates/diem-crypto/src/unit_tests/cross_test.rs diff --git a/crypto/crypto/src/unit_tests/cryptohasher.rs b/crates/diem-crypto/src/unit_tests/cryptohasher.rs similarity index 100% rename from crypto/crypto/src/unit_tests/cryptohasher.rs rename to crates/diem-crypto/src/unit_tests/cryptohasher.rs diff --git a/crypto/crypto/src/unit_tests/ed25519_test.rs b/crates/diem-crypto/src/unit_tests/ed25519_test.rs similarity index 100% rename from crypto/crypto/src/unit_tests/ed25519_test.rs rename to crates/diem-crypto/src/unit_tests/ed25519_test.rs diff --git a/crypto/crypto/src/unit_tests/hash_test.rs b/crates/diem-crypto/src/unit_tests/hash_test.rs similarity index 100% rename from crypto/crypto/src/unit_tests/hash_test.rs rename to crates/diem-crypto/src/unit_tests/hash_test.rs diff --git a/crypto/crypto/src/unit_tests/hkdf_test.rs b/crates/diem-crypto/src/unit_tests/hkdf_test.rs similarity index 100% rename from crypto/crypto/src/unit_tests/hkdf_test.rs rename to crates/diem-crypto/src/unit_tests/hkdf_test.rs diff --git a/crypto/crypto/src/unit_tests/mod.rs b/crates/diem-crypto/src/unit_tests/mod.rs similarity index 100% rename from crypto/crypto/src/unit_tests/mod.rs rename to crates/diem-crypto/src/unit_tests/mod.rs diff --git a/crypto/crypto/src/unit_tests/multi_ed25519_test.rs b/crates/diem-crypto/src/unit_tests/multi_ed25519_test.rs similarity index 100% rename from crypto/crypto/src/unit_tests/multi_ed25519_test.rs rename to crates/diem-crypto/src/unit_tests/multi_ed25519_test.rs diff --git a/crypto/crypto/src/unit_tests/noise_test.rs b/crates/diem-crypto/src/unit_tests/noise_test.rs similarity index 100% rename from crypto/crypto/src/unit_tests/noise_test.rs rename to crates/diem-crypto/src/unit_tests/noise_test.rs diff --git a/crypto/crypto/src/validatable.rs b/crates/diem-crypto/src/validatable.rs similarity index 100% rename from crypto/crypto/src/validatable.rs rename to crates/diem-crypto/src/validatable.rs diff --git a/crypto/crypto/src/x25519.rs b/crates/diem-crypto/src/x25519.rs similarity index 100% rename from crypto/crypto/src/x25519.rs rename to crates/diem-crypto/src/x25519.rs diff --git a/crypto/crypto/test_vectors/noise_cacophony.txt b/crates/diem-crypto/test_vectors/noise_cacophony.txt similarity index 100% rename from crypto/crypto/test_vectors/noise_cacophony.txt rename to crates/diem-crypto/test_vectors/noise_cacophony.txt diff --git a/crates/diem-json-rpc-client/Cargo.toml b/crates/diem-json-rpc-client/Cargo.toml index 04333283b9..3a5904d858 100644 --- a/crates/diem-json-rpc-client/Cargo.toml +++ b/crates/diem-json-rpc-client/Cargo.toml @@ -13,7 +13,7 @@ edition = "2018" futures = "0.3.12" rand = "0.8.3" -diem-crypto = { path = "../../crypto/crypto" } +diem-crypto = { path = "../../crates/diem-crypto" } diem-json-rpc-types = { path = "../../json-rpc/types" } diem-types = { path = "../../types" } diem-workspace-hack = { path = "../../common/workspace-hack" } diff --git a/crates/swiss-knife/Cargo.toml b/crates/swiss-knife/Cargo.toml index 9412c1eefa..bd2bd58c06 100644 --- a/crates/swiss-knife/Cargo.toml +++ b/crates/swiss-knife/Cargo.toml @@ -18,7 +18,7 @@ serde = { version = "1.0.124", features = ["derive"] } bcs = "0.1.2" diem-types = { path = "../../types" } -diem-crypto = { path = "../../crypto/crypto" } +diem-crypto = { path = "../../crates/diem-crypto" } diem-workspace-hack = { path = "../../common/workspace-hack" } move-core-types = { path = "../../language/move-core/types" } diem-transaction-builder = { path = "../../sdk/transaction-builder" } diff --git a/crates/transaction-emitter/Cargo.toml b/crates/transaction-emitter/Cargo.toml index 9776c8c2d7..21ec92293b 100644 --- a/crates/transaction-emitter/Cargo.toml +++ b/crates/transaction-emitter/Cargo.toml @@ -22,7 +22,7 @@ tokio = { version = "1.8.1", features = ["full"] } diem-client = { path = "../../sdk/client"} diem-config = { path = "../../config" } -diem-crypto = { path = "../../crypto/crypto" } +diem-crypto = { path = "../../crates/diem-crypto" } diem-logger = { path = "../../common/logger" } diem-sdk = { path = "../../sdk" } diem-workspace-hack = { path = "../../common/workspace-hack" } diff --git a/diem-move/diem-framework/Cargo.toml b/diem-move/diem-framework/Cargo.toml index 656cdfc4c9..91316db86c 100644 --- a/diem-move/diem-framework/Cargo.toml +++ b/diem-move/diem-framework/Cargo.toml @@ -17,7 +17,7 @@ move-command-line-common = { path = "../../language/move-command-line-common" } errmapgen = { path = "../../language/move-prover/errmapgen" } move-lang = { path = "../../language/move-lang" } move-prover = { path = "../../language/move-prover" } -diem-crypto = { path = "../../crypto/crypto" } +diem-crypto = { path = "../../crates/diem-crypto" } diem-types = { path = "../../types" } diem-workspace-hack = { path = "../../common/workspace-hack" } move-binary-format = { path = "../../language/move-binary-format" } diff --git a/diem-move/diem-framework/DPN/releases/Cargo.toml b/diem-move/diem-framework/DPN/releases/Cargo.toml index 0657c45594..f5f8bf06ae 100644 --- a/diem-move/diem-framework/DPN/releases/Cargo.toml +++ b/diem-move/diem-framework/DPN/releases/Cargo.toml @@ -12,7 +12,7 @@ publish = false [dependencies] move-command-line-common = { path = "../../../../language/move-command-line-common" } -diem-crypto = { path = "../../../../crypto/crypto" } +diem-crypto = { path = "../../../../crates/diem-crypto" } diem-types = { path = "../../../../types" } diem-workspace-hack = { path = "../../../../common/workspace-hack" } move-binary-format = { path = "../../../../language/move-binary-format" } diff --git a/diem-move/diem-keygen/Cargo.toml b/diem-move/diem-keygen/Cargo.toml index 4f7d316f43..220abf7f62 100644 --- a/diem-move/diem-keygen/Cargo.toml +++ b/diem-move/diem-keygen/Cargo.toml @@ -14,6 +14,6 @@ rand = "0.8.3" sha3 = "0.9.1" hex = "0.4.3" -diem-crypto = { path = "../../crypto/crypto" } +diem-crypto = { path = "../../crates/diem-crypto" } diem-types = { path = "../../types" } diem-workspace-hack = { path = "../../common/workspace-hack" } diff --git a/diem-move/diem-vm/Cargo.toml b/diem-move/diem-vm/Cargo.toml index a695d49710..4b812015ad 100644 --- a/diem-move/diem-vm/Cargo.toml +++ b/diem-move/diem-vm/Cargo.toml @@ -18,7 +18,7 @@ mirai-annotations = "1.10.1" tracing = "0.1.16" bcs = "0.1.2" -diem-crypto = { path = "../../crypto/crypto" } +diem-crypto = { path = "../../crates/diem-crypto" } diem-logger = { path = "../../common/logger" } diem-metrics = { path = "../../common/metrics" } diem-state-view = { path = "../../storage/state-view" } diff --git a/diem-move/vm-genesis/Cargo.toml b/diem-move/vm-genesis/Cargo.toml index 907e7de245..65290f214e 100644 --- a/diem-move/vm-genesis/Cargo.toml +++ b/diem-move/vm-genesis/Cargo.toml @@ -17,7 +17,7 @@ rand = "0.8.3" bytecode-verifier = { path = "../../language/bytecode-verifier" } bcs = "0.1.2" diem-config = { path = "../../config" } -diem-crypto = { path = "../../crypto/crypto" } +diem-crypto = { path = "../../crates/diem-crypto" } diem-state-view = { path = "../../storage/state-view" } diem-types = { path = "../../types" } diem-workspace-hack = { path = "../../common/workspace-hack" } diff --git a/diem-move/writeset-transaction-generator/Cargo.toml b/diem-move/writeset-transaction-generator/Cargo.toml index 4ee6443655..5d750a927a 100644 --- a/diem-move/writeset-transaction-generator/Cargo.toml +++ b/diem-move/writeset-transaction-generator/Cargo.toml @@ -23,8 +23,8 @@ once_cell = "1.7.2" bytecode-verifier = { path = "../../language/bytecode-verifier" } diem-workspace-hack = { path = "../../common/workspace-hack" } -diem-crypto-derive = { path = "../../crypto/crypto-derive" } -diem-crypto = { path = "../../crypto/crypto" } +diem-crypto-derive = { path = "../../crates/diem-crypto-derive" } +diem-crypto = { path = "../../crates/diem-crypto" } diem-types = { path = "../../types" } diem-framework-releases = { path = "../../diem-move/diem-framework/DPN/releases" } diem-framework = { path = "../../diem-move/diem-framework" } diff --git a/diem-node/Cargo.toml b/diem-node/Cargo.toml index ea0dd98dee..f555a69d9c 100644 --- a/diem-node/Cargo.toml +++ b/diem-node/Cargo.toml @@ -31,7 +31,7 @@ executor = { path = "../execution/executor" } executor-types = { path = "../execution/executor-types" } diem-api = { path = "../api" } diem-config = { path = "../config" } -diem-crypto = { path = "../crypto/crypto" } +diem-crypto = { path = "../crates/diem-crypto" } diem-data-client = { path = "../state-sync/diem-data-client" } diem-framework-releases = { path = "../diem-move/diem-framework/DPN/releases" } diem-genesis-tool = {path = "../config/management/genesis", features = ["testing"] } diff --git a/execution/db-bootstrapper/Cargo.toml b/execution/db-bootstrapper/Cargo.toml index 4e8f66ede5..8edea37b21 100644 --- a/execution/db-bootstrapper/Cargo.toml +++ b/execution/db-bootstrapper/Cargo.toml @@ -17,7 +17,7 @@ executor = { path = "../executor" } bcs = "0.1.2" diemdb = { path = "../../storage/diemdb" } diem-config = { path = "../../config" } -diem-crypto = { path = "../../crypto/crypto" } +diem-crypto = { path = "../../crates/diem-crypto" } diem-temppath = { path = "../../common/temppath" } diem-types = { path = "../../types" } diem-vm = { path = "../../diem-move/diem-vm" } diff --git a/execution/execution-correctness/Cargo.toml b/execution/execution-correctness/Cargo.toml index b62591a239..596c64317b 100644 --- a/execution/execution-correctness/Cargo.toml +++ b/execution/execution-correctness/Cargo.toml @@ -15,7 +15,7 @@ executor = { path = "../executor" } executor-types = { path = "../executor-types" } bcs = "0.1.2" diem-config = { path = "../../config" } -diem-crypto = { path = "../../crypto/crypto" } +diem-crypto = { path = "../../crates/diem-crypto" } diem-global-constants = { path = "../../config/global-constants"} diem-logger = { path = "../../common/logger" } diem-infallible = { path = "../../common/infallible" } diff --git a/execution/executor-benchmark/Cargo.toml b/execution/executor-benchmark/Cargo.toml index 309d43a3ac..cf2d49b0c6 100644 --- a/execution/executor-benchmark/Cargo.toml +++ b/execution/executor-benchmark/Cargo.toml @@ -24,7 +24,7 @@ executor = { path = "../executor" } executor-types = { path = "../executor-types" } diemdb = { path = "../../storage/diemdb" } diem-config = { path = "../../config" } -diem-crypto = { path = "../../crypto/crypto" } +diem-crypto = { path = "../../crates/diem-crypto" } diem-genesis-tool = {path = "../../config/management/genesis", features = ["testing"] } diem-infallible = { path = "../../common/infallible" } diem-jellyfish-merkle = { path = "../../storage/jellyfish-merkle" } diff --git a/execution/executor-test-helpers/Cargo.toml b/execution/executor-test-helpers/Cargo.toml index 7e47d77504..c3ae212968 100644 --- a/execution/executor-test-helpers/Cargo.toml +++ b/execution/executor-test-helpers/Cargo.toml @@ -18,7 +18,7 @@ executor = { path = "../executor" } executor-types = { path = "../executor-types" } diemdb = { path = "../../storage/diemdb", features = ["fuzzing"] } diem-config = { path = "../../config" } -diem-crypto = { path = "../../crypto/crypto" } +diem-crypto = { path = "../../crates/diem-crypto" } diem-genesis-tool = {path = "../../config/management/genesis", features = ["testing"] } diem-temppath = { path = "../../common/temppath" } diem-types = { path = "../../types", features = ["fuzzing"] } diff --git a/execution/executor-types/Cargo.toml b/execution/executor-types/Cargo.toml index cdd0b73c28..80d9cea1bc 100644 --- a/execution/executor-types/Cargo.toml +++ b/execution/executor-types/Cargo.toml @@ -15,7 +15,7 @@ serde = { version = "1.0.124", default-features = false } thiserror = "1.0.24" bcs = "0.1.2" -diem-crypto = { path = "../../crypto/crypto" } +diem-crypto = { path = "../../crates/diem-crypto" } diem-secure-net = { path = "../../secure/net" } diem-types = { path = "../../types" } diem-workspace-hack = { path = "../../common/workspace-hack" } diff --git a/execution/executor/Cargo.toml b/execution/executor/Cargo.toml index d308b03661..226a206468 100644 --- a/execution/executor/Cargo.toml +++ b/execution/executor/Cargo.toml @@ -20,7 +20,7 @@ serde = { version = "1.0.124", features = ["derive"] } consensus-types = { path = "../../consensus/consensus-types"} executor-types = { path = "../executor-types" } bcs = "0.1.2" -diem-crypto = { path = "../../crypto/crypto" } +diem-crypto = { path = "../../crates/diem-crypto" } diem-logger = { path = "../../common/logger" } diem-metrics = { path = "../../common/metrics" } diem-infallible = { path = "../../common/infallible" } diff --git a/json-rpc/Cargo.toml b/json-rpc/Cargo.toml index 304fee12a0..25ba52b4fc 100644 --- a/json-rpc/Cargo.toml +++ b/json-rpc/Cargo.toml @@ -32,7 +32,7 @@ bcs = "0.1.2" diem-framework-releases= { path = "../diem-move/diem-framework/DPN/releases" } diem-client = { path = "../sdk/client", optional = true } diem-config = { path = "../config" } -diem-crypto = { path = "../crypto/crypto" } +diem-crypto = { path = "../crates/diem-crypto" } diemdb = { path = "../storage/diemdb", optional = true } diem-id-generator = { path = "../common/id-generator" } diem-json-rpc-types = { path = "./types", package = "diem-json-rpc-types" } diff --git a/json-rpc/types/Cargo.toml b/json-rpc/types/Cargo.toml index bdf009cb63..e8e6653a1d 100644 --- a/json-rpc/types/Cargo.toml +++ b/json-rpc/types/Cargo.toml @@ -16,7 +16,7 @@ serde = { version = "1.0.124", default-features = false } serde_json = "1.0.64" bcs = "0.1.2" -diem-crypto = { path = "../../crypto/crypto", version = "0.0.3" } +diem-crypto = { path = "../../crates/diem-crypto", version = "0.0.3" } diem-transaction-builder = { path = "../../sdk/transaction-builder", version = "0.0.3" } diem-types = { path = "../../types", version = "0.0.3" } move-core-types = { path = "../../language/move-core/types", version = "0.0.3" } diff --git a/json-rpc/types/proto/Cargo.toml b/json-rpc/types/proto/Cargo.toml index 483d7b6517..5708e3aa55 100644 --- a/json-rpc/types/proto/Cargo.toml +++ b/json-rpc/types/proto/Cargo.toml @@ -14,7 +14,7 @@ prost = "0.8.0" serde = { version = "1.0.124", default-features = false } serde_json = "1.0.64" -diem-crypto = { path = "../../../crypto/crypto" } +diem-crypto = { path = "../../../crates/diem-crypto" } diem-types = { path = "../../../types" } diem-json-rpc-types = { path = ".." } diem-workspace-hack = { path = "../../../common/workspace-hack" } diff --git a/language/e2e-testsuite/Cargo.toml b/language/e2e-testsuite/Cargo.toml index 167a354728..2a59cc1d32 100644 --- a/language/e2e-testsuite/Cargo.toml +++ b/language/e2e-testsuite/Cargo.toml @@ -17,7 +17,7 @@ bytecode-verifier = { path = "../bytecode-verifier" } bcs = "0.1.2" compiler = { path = "../compiler" } diem-keygen = { path = "../../diem-move/diem-keygen" } -diem-crypto = { path = "../../crypto/crypto", features = ["fuzzing"] } +diem-crypto = { path = "../../crates/diem-crypto", features = ["fuzzing"] } diem-types = { path = "../../types", features = ["fuzzing"] } move-core-types = { path = "../move-core/types" } move-vm-runtime = { path = "../move-vm/runtime" } diff --git a/language/testing-infra/diem-transactional-test-harness/Cargo.toml b/language/testing-infra/diem-transactional-test-harness/Cargo.toml index a68024dd64..f33419d533 100644 --- a/language/testing-infra/diem-transactional-test-harness/Cargo.toml +++ b/language/testing-infra/diem-transactional-test-harness/Cargo.toml @@ -26,7 +26,7 @@ move-core-types = { path = "../../move-core/types" } diem-vm = { path = "../../../diem-move/diem-vm" } diem-types = { path = "../../../types", features = ["fuzzing"] } diem-transaction-builder = { path = "../../../sdk/transaction-builder" } -diem-crypto = { path = "../../../crypto/crypto" } +diem-crypto = { path = "../../../crates/diem-crypto" } diem-framework = { path = "../../../diem-move/diem-framework" } diem-keygen = { path = "../../../diem-move/diem-keygen" } diem-state-view = { path = "../../../storage/state-view" } diff --git a/language/testing-infra/e2e-tests/Cargo.toml b/language/testing-infra/e2e-tests/Cargo.toml index 38d0422caa..6e12c0e196 100644 --- a/language/testing-infra/e2e-tests/Cargo.toml +++ b/language/testing-infra/e2e-tests/Cargo.toml @@ -15,7 +15,7 @@ goldenfile = "1.1.0" bcs = "0.1.2" compiler = { path = "../../compiler" } once_cell = "1.7.2" -diem-crypto = { path = "../../../crypto/crypto", features = ["fuzzing"] } +diem-crypto = { path = "../../../crates/diem-crypto", features = ["fuzzing"] } rand = "0.8.3" serde = { version = "1.0.124", default-features = false } diem-state-view = { path = "../../../storage/state-view" } diff --git a/language/testing-infra/functional-tests/Cargo.toml b/language/testing-infra/functional-tests/Cargo.toml index 91c2172233..38bb968850 100644 --- a/language/testing-infra/functional-tests/Cargo.toml +++ b/language/testing-infra/functional-tests/Cargo.toml @@ -21,7 +21,7 @@ bytecode-verifier = { path = "../../bytecode-verifier" } language-e2e-tests = { path = "../e2e-tests" } diem-keygen = { path = "../../../diem-move/diem-keygen" } diem-config = { path = "../../../config", features = ["fuzzing"] } -diem-crypto = { path = "../../../crypto/crypto" } +diem-crypto = { path = "../../../crates/diem-crypto" } diem-workspace-hack = { path = "../../../common/workspace-hack" } once_cell = "1.7.2" regex = { version = "1.4.3", default-features = false, features = ["std", "perf"] } diff --git a/mempool/Cargo.toml b/mempool/Cargo.toml index 7d917f094d..5ead1007e9 100644 --- a/mempool/Cargo.toml +++ b/mempool/Cargo.toml @@ -27,7 +27,7 @@ bounded-executor = { path = "../common/bounded-executor" } channel = { path = "../common/channel" } bcs = "0.1.2" diem-config = { path = "../config" } -diem-crypto = { path = "../crypto/crypto" } +diem-crypto = { path = "../crates/diem-crypto" } diem-logger = { path = "../common/logger" } diem-metrics = { path = "../common/metrics" } diem-infallible = { path = "../common/infallible" } diff --git a/network/Cargo.toml b/network/Cargo.toml index 1e5740088a..9dbd0f072a 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -36,8 +36,8 @@ bitvec = { path = "../common/bitvec", package = "diem-bitvec" } channel = { path = "../common/channel" } bcs = "0.1.2" diem-config = { path = "../config" } -diem-crypto = { path = "../crypto/crypto" } -diem-crypto-derive = { path = "../crypto/crypto-derive" } +diem-crypto = { path = "../crates/diem-crypto" } +diem-crypto-derive = { path = "../crates/diem-crypto-derive" } diem-id-generator = { path = "../common/id-generator" } diem-infallible = { path = "../common/infallible" } diem-logger = { path = "../common/logger" } diff --git a/network/builder/Cargo.toml b/network/builder/Cargo.toml index 2b2cc79bd0..707342802b 100644 --- a/network/builder/Cargo.toml +++ b/network/builder/Cargo.toml @@ -21,7 +21,7 @@ tokio = { version = "1.8.1", features = ["full"] } channel = { path = "../../common/channel" } bcs = "0.1.2" diem-config = { path = "../../config" } -diem-crypto = { path = "../../crypto/crypto" } +diem-crypto = { path = "../../crates/diem-crypto" } diem-infallible = { path = "../../common/infallible" } diem-logger = { path = "../../common/logger" } diem-network-address-encryption = {path = "../../config/management/network-address-encryption"} diff --git a/network/discovery/Cargo.toml b/network/discovery/Cargo.toml index 5144bde779..ab1d66cf96 100644 --- a/network/discovery/Cargo.toml +++ b/network/discovery/Cargo.toml @@ -20,7 +20,7 @@ channel = {path = "../../common/channel"} bcs = "0.1.2" event-notifications = { path = "../../state-sync/inter-component/event-notifications" } diem-config = { path = "../../config"} -diem-crypto = {path = "../../crypto/crypto"} +diem-crypto = {path = "../../crates/diem-crypto"} diem-logger = {path = "../../common/logger"} diem-metrics = {path = "../../common/metrics"} diem-time-service = {path = "../../common/time-service"} diff --git a/network/socket-bench-server/Cargo.toml b/network/socket-bench-server/Cargo.toml index db88104f34..8a40dcfcd8 100644 --- a/network/socket-bench-server/Cargo.toml +++ b/network/socket-bench-server/Cargo.toml @@ -14,7 +14,7 @@ futures = "0.3.12" tokio = { version = "1.8.1", features = ["full"] } tokio-util = { version = "0.6.4", features = ["compat", "codec"] } -diem-crypto = { path = "../../crypto/crypto" } +diem-crypto = { path = "../../crates/diem-crypto" } diem-config = { path = "../../config" } diem-logger = { path = "../../common/logger" } diem-types = { path = "../../types" } diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml index 7ecf37dfbb..406c38cd3e 100644 --- a/sdk/Cargo.toml +++ b/sdk/Cargo.toml @@ -18,7 +18,7 @@ bcs = "0.1" rand_core = "0.6.2" serde = { version = "1.0.124", features = ["derive"] } -diem-crypto = { path = "../crypto/crypto", version = "0.0.3" } +diem-crypto = { path = "../crates/diem-crypto", version = "0.0.3" } diem-types = { path = "../types", version = "0.0.3"} move-core-types = { path = "../language/move-core/types", version = "0.0.3" } diem-transaction-builder = { path = "./transaction-builder", version = "0.0.3" } diff --git a/sdk/client/Cargo.toml b/sdk/client/Cargo.toml index f9207e3e0f..abfb227101 100644 --- a/sdk/client/Cargo.toml +++ b/sdk/client/Cargo.toml @@ -24,7 +24,7 @@ serde = { version = "1.0.124", features = ["derive"] } serde_json = "1.0.64" tracing = "0.1.26" -diem-crypto = { path = "../../crypto/crypto", version = "0.0.3" } +diem-crypto = { path = "../../crates/diem-crypto", version = "0.0.3" } diem-json-rpc-types = { path = "../../json-rpc/types", version = "0.0.3" } move-core-types = { path = "../../language/move-core/types", version = "0.0.3" } diem-types = { path = "../../types", version = "0.0.3" } diff --git a/secure/key-manager/Cargo.toml b/secure/key-manager/Cargo.toml index 817282bde7..77184014cc 100644 --- a/secure/key-manager/Cargo.toml +++ b/secure/key-manager/Cargo.toml @@ -18,7 +18,7 @@ thiserror = "1.0.24" crash-handler = { path = "../../common/crash-handler" } diem-config = { path = "../../config"} -diem-crypto = { path = "../../crypto/crypto" } +diem-crypto = { path = "../../crates/diem-crypto" } diem-global-constants = { path = "../../config/global-constants"} diem-logger = { path = "../../common/logger" } diem-client = { path = "../../sdk/client", features = ["blocking"], default-features = false } diff --git a/secure/storage/Cargo.toml b/secure/storage/Cargo.toml index a5d9d6f92e..a929cda876 100644 --- a/secure/storage/Cargo.toml +++ b/secure/storage/Cargo.toml @@ -19,7 +19,7 @@ serde_json = "1.0.64" thiserror = "1.0.24" bcs = "0.1.2" -diem-crypto = { path = "../../crypto/crypto" } +diem-crypto = { path = "../../crates/diem-crypto" } diem-github-client = { path = "github" } diem-infallible = { path = "../../common/infallible" } diem-logger = { path = "../../common/logger" } @@ -29,8 +29,8 @@ diem-vault-client = { path = "vault" } diem-workspace-hack = { path = "../../common/workspace-hack" } [dev-dependencies] -diem-crypto = { path = "../../crypto/crypto", features = ["fuzzing"] } -diem-crypto-derive = { path = "../../crypto/crypto-derive" } +diem-crypto = { path = "../../crates/diem-crypto", features = ["fuzzing"] } +diem-crypto-derive = { path = "../../crates/diem-crypto-derive" } rand = "0.8.3" [features] diff --git a/secure/storage/vault/Cargo.toml b/secure/storage/vault/Cargo.toml index 6113ed1a47..e5799f2bc6 100644 --- a/secure/storage/vault/Cargo.toml +++ b/secure/storage/vault/Cargo.toml @@ -20,7 +20,7 @@ serde_json = "1.0.64" thiserror = "1.0.24" ureq = { version = "1.5.4", features = ["json", "native-tls"], default-features = false } -diem-crypto = { path = "../../../crypto/crypto" } +diem-crypto = { path = "../../../crates/diem-crypto" } diem-proptest-helpers = { path = "../../../common/proptest-helpers", optional = true } diem-types = { path = "../../../types", optional = true } diem-workspace-hack = { path = "../../../common/workspace-hack" } diff --git a/shuffle/cli/Cargo.toml b/shuffle/cli/Cargo.toml index 7db71ea9a2..941b391797 100644 --- a/shuffle/cli/Cargo.toml +++ b/shuffle/cli/Cargo.toml @@ -27,7 +27,7 @@ url = { version = "2.2.2" } abigen = { path = "../../language/move-prover/abigen" } diem-api-types = { path = "../../api/types" } diem-config = { path = "../../config" } -diem-crypto = { path = "../../crypto/crypto" } +diem-crypto = { path = "../../crates/diem-crypto" } diem-framework-releases = { path = "../../diem-move/diem-framework/DPN/releases" } diem-genesis-tool = { path = "../../config/management/genesis" } diem-infallible = { path = "../../common/infallible"} diff --git a/state-sync/diem-data-client/Cargo.toml b/state-sync/diem-data-client/Cargo.toml index 66288f371a..e18567b2f9 100644 --- a/state-sync/diem-data-client/Cargo.toml +++ b/state-sync/diem-data-client/Cargo.toml @@ -17,7 +17,7 @@ serde = { version = "1.0.124", default-features = false } thiserror = "1.0.24" diem-config = { path = "../../config" } -diem-crypto = { path = "../../crypto/crypto" } +diem-crypto = { path = "../../crates/diem-crypto" } diem-id-generator = { path = "../../common/id-generator" } diem-infallible = { path = "../../common/infallible" } diem-logger = { path = "../../common/logger" } diff --git a/state-sync/inter-component/consensus-notifications/Cargo.toml b/state-sync/inter-component/consensus-notifications/Cargo.toml index 72fb19fcb9..2a8aaa7ebe 100644 --- a/state-sync/inter-component/consensus-notifications/Cargo.toml +++ b/state-sync/inter-component/consensus-notifications/Cargo.toml @@ -16,7 +16,7 @@ serde = { version = "1.0.124", default-features = false } thiserror = "1.0.24" tokio = { version = "1.8.1" } -diem-crypto = { path = "../../../crypto/crypto" } +diem-crypto = { path = "../../../crates/diem-crypto" } diem-types = { path = "../../../types" } diem-workspace-hack = { path = "../../../common/workspace-hack" } diff --git a/state-sync/inter-component/event-notifications/Cargo.toml b/state-sync/inter-component/event-notifications/Cargo.toml index b12541ec5d..d46aaaef34 100644 --- a/state-sync/inter-component/event-notifications/Cargo.toml +++ b/state-sync/inter-component/event-notifications/Cargo.toml @@ -29,7 +29,7 @@ storage-interface = { path = "../../../storage/storage-interface" } bcs = "0.1.2" claim = "0.5.0" -diem-crypto = { path = "../../../crypto/crypto" } +diem-crypto = { path = "../../../crates/diem-crypto" } diem-temppath = { path = "../../../common/temppath" } diem-vm = { path = "../../../diem-move/diem-vm" } diemdb = { path = "../../../storage/diemdb" } diff --git a/state-sync/inter-component/mempool-notifications/Cargo.toml b/state-sync/inter-component/mempool-notifications/Cargo.toml index 600614cd6a..5cf6a3c141 100644 --- a/state-sync/inter-component/mempool-notifications/Cargo.toml +++ b/state-sync/inter-component/mempool-notifications/Cargo.toml @@ -22,4 +22,4 @@ diem-workspace-hack = { path = "../../../common/workspace-hack" } [dev-dependencies] claim = "0.5.0" -diem-crypto = { path = "../../../crypto/crypto" } +diem-crypto = { path = "../../../crates/diem-crypto" } diff --git a/state-sync/state-sync-v1/Cargo.toml b/state-sync/state-sync-v1/Cargo.toml index b506a88b6c..77bf297f99 100644 --- a/state-sync/state-sync-v1/Cargo.toml +++ b/state-sync/state-sync-v1/Cargo.toml @@ -26,7 +26,7 @@ tokio-stream = "0.1.4" consensus-notifications = { path = "../inter-component/consensus-notifications" } channel = { path = "../../common/channel" } diem-config = { path = "../../config" } -diem-crypto = { path = "../../crypto/crypto" } +diem-crypto = { path = "../../crates/diem-crypto" } diem-infallible = { path = "../../common/infallible" } diem-logger = { path = "../../common/logger" } diem-mempool = { path = "../../mempool"} @@ -56,7 +56,7 @@ proptest = "1.0.0" channel = { path = "../../common/channel" } diem-framework-releases= { path = "../../diem-move/diem-framework/DPN/releases" } -diem-crypto = { path = "../../crypto/crypto" } +diem-crypto = { path = "../../crates/diem-crypto" } diem-genesis-tool = {path = "../../config/management/genesis", features = ["testing"] } diem-mempool = { path = "../../mempool", features = ["fuzzing"] } diem-proptest-helpers = { path = "../../common/proptest-helpers" } diff --git a/state-sync/state-sync-v2/data-streaming-service/Cargo.toml b/state-sync/state-sync-v2/data-streaming-service/Cargo.toml index b3ffc38bb5..e80aa20df2 100644 --- a/state-sync/state-sync-v2/data-streaming-service/Cargo.toml +++ b/state-sync/state-sync-v2/data-streaming-service/Cargo.toml @@ -22,7 +22,7 @@ tokio-stream = "0.1.4" channel = { path = "../../../common/channel" } diem-config = { path = "../../../config" } -diem-crypto = { path = "../../../crypto/crypto" } +diem-crypto = { path = "../../../crates/diem-crypto" } diem-data-client = { path = "../../diem-data-client" } diem-id-generator = { path = "../../../common/id-generator" } diem-infallible = { path = "../../../common/infallible" } diff --git a/state-sync/state-sync-v2/state-sync-multiplexer/Cargo.toml b/state-sync/state-sync-v2/state-sync-multiplexer/Cargo.toml index 7cd6a6d91a..cf18dea471 100644 --- a/state-sync/state-sync-v2/state-sync-multiplexer/Cargo.toml +++ b/state-sync/state-sync-v2/state-sync-multiplexer/Cargo.toml @@ -24,7 +24,7 @@ state-sync-v1 = { path = "../../../state-sync/state-sync-v1" } storage-interface = { path = "../../../storage/storage-interface" } [dev-dependencies] -diem-crypto = { path = "../../../crypto/crypto" } +diem-crypto = { path = "../../../crates/diem-crypto" } diem-genesis-tool = {path = "../../../config/management/genesis", features = ["testing"] } diem-infallible = { path = "../../../common/infallible" } diem-temppath = { path = "../../../common/temppath" } diff --git a/state-sync/storage-service/server/Cargo.toml b/state-sync/storage-service/server/Cargo.toml index 7d32594798..5a08a99782 100644 --- a/state-sync/storage-service/server/Cargo.toml +++ b/state-sync/storage-service/server/Cargo.toml @@ -33,7 +33,7 @@ storage-service-types = { path = "../types" } anyhow = "1.0.38" claim = "0.5.0" -diem-crypto = { path = "../../../crypto/crypto" } +diem-crypto = { path = "../../../crates/diem-crypto" } diem-types = { path = "../../../types" } move-core-types = { path = "../../../language/move-core/types" } storage-interface = { path = "../../../storage/storage-interface" } diff --git a/state-sync/storage-service/types/Cargo.toml b/state-sync/storage-service/types/Cargo.toml index fd4847fd8f..2b34dc0917 100644 --- a/state-sync/storage-service/types/Cargo.toml +++ b/state-sync/storage-service/types/Cargo.toml @@ -14,7 +14,7 @@ num-traits = { version = "0.2.14", default-features = false } serde = { version = "1.0.124", default-features = false } thiserror = "1.0.24" -diem-crypto = { path = "../../../crypto/crypto" } +diem-crypto = { path = "../../../crates/diem-crypto" } diem-types = { path = "../../../types" } diem-workspace-hack = { path = "../../../common/workspace-hack" } diff --git a/storage/accumulator/Cargo.toml b/storage/accumulator/Cargo.toml index 1b72181156..72e8d5bbd7 100644 --- a/storage/accumulator/Cargo.toml +++ b/storage/accumulator/Cargo.toml @@ -11,7 +11,7 @@ edition = "2018" [dependencies] anyhow = "1.0.38" -diem-crypto = { path = "../../crypto/crypto" } +diem-crypto = { path = "../../crates/diem-crypto" } mirai-annotations = "1.10.1" diem-types = { path = "../../types" } diem-workspace-hack = { path = "../../common/workspace-hack" } @@ -21,7 +21,7 @@ proptest = { version = "1.0.0", optional = true } rand = "0.8.3" proptest = "1.0.0" -diem-crypto = { path = "../../crypto/crypto", features = ["fuzzing"] } +diem-crypto = { path = "../../crates/diem-crypto", features = ["fuzzing"] } [features] default = [] diff --git a/storage/backup/backup-cli/Cargo.toml b/storage/backup/backup-cli/Cargo.toml index 70bb8c0fac..ba4ecfc7cc 100644 --- a/storage/backup/backup-cli/Cargo.toml +++ b/storage/backup/backup-cli/Cargo.toml @@ -36,7 +36,7 @@ executor-types = { path = "../../../execution/executor-types" } diem-jellyfish-merkle = { path = "../../jellyfish-merkle" } bcs = "0.1.2" diem-config = { path = "../../../config" } -diem-crypto = { path = "../../../crypto/crypto" } +diem-crypto = { path = "../../../crates/diem-crypto" } diem-infallible = { path = "../../../common/infallible" } diem-logger = { path = "../../../common/logger" } diem-secure-push-metrics = { path = "../../../secure/push-metrics" } diff --git a/storage/backup/backup-service/Cargo.toml b/storage/backup/backup-service/Cargo.toml index 832cfd6637..f185905f42 100644 --- a/storage/backup/backup-service/Cargo.toml +++ b/storage/backup/backup-service/Cargo.toml @@ -19,7 +19,7 @@ tokio = { version = "1.8.1", features = ["full"] } warp = "0.3.0" bcs = "0.1.2" -diem-crypto = { path = "../../../crypto/crypto" } +diem-crypto = { path = "../../../crates/diem-crypto" } diem-logger = { path = "../../../common/logger" } diem-metrics = { path = "../../../common/metrics" } diem-types = { path = "../../../types" } diff --git a/storage/diemdb/Cargo.toml b/storage/diemdb/Cargo.toml index b59d710785..12e759e72e 100644 --- a/storage/diemdb/Cargo.toml +++ b/storage/diemdb/Cargo.toml @@ -25,7 +25,7 @@ thiserror = "1.0.24" accumulator = { path = "../accumulator" } bcs = "0.1.2" diem-config = { path = "../../config" } -diem-crypto = { path = "../../crypto/crypto" } +diem-crypto = { path = "../../crates/diem-crypto" } diem-jellyfish-merkle = { path = "../jellyfish-merkle" } diem-logger = { path = "../../common/logger" } diem-metrics = { path = "../../common/metrics" } diff --git a/storage/diemsum/Cargo.toml b/storage/diemsum/Cargo.toml index ab849fa3dd..e35eede96a 100644 --- a/storage/diemsum/Cargo.toml +++ b/storage/diemsum/Cargo.toml @@ -16,7 +16,7 @@ serde = "1.0.124" serde_json = "1.0.64" diemdb = { path = "../diemdb", features = ["diemsum"] } -diem-crypto = { path = "../../crypto/crypto" } +diem-crypto = { path = "../../crates/diem-crypto" } diem-types = { path = "../../types" } diem-workspace-hack = { path = "../../common/workspace-hack" } storage-interface = { path = "../storage-interface" } diff --git a/storage/inspector/Cargo.toml b/storage/inspector/Cargo.toml index 39ca9605ad..b1be9f244f 100644 --- a/storage/inspector/Cargo.toml +++ b/storage/inspector/Cargo.toml @@ -16,7 +16,7 @@ tempfile = "3.2.0" diem-framework-releases = { path = "../../diem-move/diem-framework/DPN/releases" } diemdb = { path = "../diemdb" } diem-config = { path = "../../config" } -diem-crypto = { path = "../../crypto/crypto" } +diem-crypto = { path = "../../crates/diem-crypto" } diem-types = { path = "../../types" } diem-logger = { path = "../../common/logger" } diem-workspace-hack = { path = "../../common/workspace-hack" } diff --git a/storage/jellyfish-merkle/Cargo.toml b/storage/jellyfish-merkle/Cargo.toml index 06a2e93786..9aafd8ee9f 100644 --- a/storage/jellyfish-merkle/Cargo.toml +++ b/storage/jellyfish-merkle/Cargo.toml @@ -24,8 +24,8 @@ serde = { version = "1.0.124", features = ["derive"] } thiserror = "1.0.24" bcs = "0.1.2" -diem-crypto = { path = "../../crypto/crypto" } -diem-crypto-derive = { path = "../../crypto/crypto-derive" } +diem-crypto = { path = "../../crates/diem-crypto" } +diem-crypto-derive = { path = "../../crates/diem-crypto-derive" } diem-infallible = { path = "../../common/infallible" } diem-metrics = { path = "../../common/metrics" } diem-types = { path = "../../types" } @@ -37,7 +37,7 @@ rand = "0.8.3" proptest = "1.0.0" proptest-derive = "0.3.0" -diem-crypto = { path = "../../crypto/crypto", features = ["fuzzing"] } +diem-crypto = { path = "../../crates/diem-crypto", features = ["fuzzing"] } diem-types = { path = "../../types", features = ["fuzzing"] } [features] diff --git a/storage/scratchpad-benchmark/Cargo.toml b/storage/scratchpad-benchmark/Cargo.toml index 32d4dcfbcc..2a93fee374 100644 --- a/storage/scratchpad-benchmark/Cargo.toml +++ b/storage/scratchpad-benchmark/Cargo.toml @@ -19,7 +19,7 @@ structopt = "0.3.21" diemdb = { path = "../diemdb" } diem-config = { path = "../../config" } -diem-crypto = { path = "../../crypto/crypto" } +diem-crypto = { path = "../../crates/diem-crypto" } diem-genesis-tool = {path = "../../config/management/genesis", features = ["testing"] } diem-infallible = { path = "../../common/infallible" } diem-logger = { path = "../../common/logger" } diff --git a/storage/scratchpad/Cargo.toml b/storage/scratchpad/Cargo.toml index 5dca65ee32..5714b861a0 100644 --- a/storage/scratchpad/Cargo.toml +++ b/storage/scratchpad/Cargo.toml @@ -16,7 +16,7 @@ itertools = "0.10.0" proptest = { version = "1.0.0", optional = true } rayon = "1.5.0" -diem-crypto = { path = "../../crypto/crypto" } +diem-crypto = { path = "../../crates/diem-crypto" } diem-infallible = { path = "../../common/infallible" } diem-types = { path = "../../types" } diem-workspace-hack = { path = "../../common/workspace-hack" } diff --git a/storage/state-view/Cargo.toml b/storage/state-view/Cargo.toml index 578efa0a9e..2ca3c2af95 100644 --- a/storage/state-view/Cargo.toml +++ b/storage/state-view/Cargo.toml @@ -11,7 +11,7 @@ edition = "2018" [dependencies] anyhow = "1.0.38" -diem-crypto = { path = "../../crypto/crypto" } +diem-crypto = { path = "../../crates/diem-crypto" } diem-types = { path = "../../types" } diem-workspace-hack = { path = "../../common/workspace-hack" } diff --git a/storage/storage-client/Cargo.toml b/storage/storage-client/Cargo.toml index 758c2bb73a..4629aa0be5 100644 --- a/storage/storage-client/Cargo.toml +++ b/storage/storage-client/Cargo.toml @@ -14,7 +14,7 @@ anyhow = "1.0.38" serde = "1.0.124" bcs = "0.1.2" -diem-crypto = { path = "../../crypto/crypto" } +diem-crypto = { path = "../../crates/diem-crypto" } diem-logger = { path = "../../common/logger" } diem-infallible = { path = "../../common/infallible" } diem-secure-net = { path = "../../secure/net" } diff --git a/storage/storage-interface/Cargo.toml b/storage/storage-interface/Cargo.toml index 0dc34a58ff..f1645c457a 100644 --- a/storage/storage-interface/Cargo.toml +++ b/storage/storage-interface/Cargo.toml @@ -17,7 +17,7 @@ thiserror = "1.0.24" parking_lot = "0.11.1" bcs = "0.1.2" -diem-crypto = { path = "../../crypto/crypto" } +diem-crypto = { path = "../../crates/diem-crypto" } diem-secure-net = { path = "../../secure/net" } diem-state-view = { path = "../state-view" } diem-types = { path = "../../types" } diff --git a/storage/storage-service/Cargo.toml b/storage/storage-service/Cargo.toml index c31a02ca84..5ac21637b1 100644 --- a/storage/storage-service/Cargo.toml +++ b/storage/storage-service/Cargo.toml @@ -16,7 +16,7 @@ futures = "0.3.12" bcs = "0.1.2" diem-config = { path = "../../config" } -diem-crypto = { path = "../../crypto/crypto" } +diem-crypto = { path = "../../crates/diem-crypto" } diemdb = { path = "../diemdb" } diem-logger = { path = "../../common/logger" } diem-metrics = { path = "../../common/metrics" } diff --git a/testsuite/cli/Cargo.toml b/testsuite/cli/Cargo.toml index f508285bf4..542dbc170a 100644 --- a/testsuite/cli/Cargo.toml +++ b/testsuite/cli/Cargo.toml @@ -27,7 +27,7 @@ walkdir = "2.3.1" diem-config = { path = "../../config" } generate-key = { path = "../../config/generate-key" } crash-handler = { path = "../../common/crash-handler" } -diem-crypto = { path = "../../crypto/crypto" } +diem-crypto = { path = "../../crates/diem-crypto" } bcs = "0.1.2" diem-wallet = { path = "diem-wallet" } diem-client = { path = "../../sdk/client" } diff --git a/testsuite/cli/diem-wallet/Cargo.toml b/testsuite/cli/diem-wallet/Cargo.toml index 06783a932a..5e5ea92669 100644 --- a/testsuite/cli/diem-wallet/Cargo.toml +++ b/testsuite/cli/diem-wallet/Cargo.toml @@ -20,7 +20,7 @@ serde = "1.0.124" sha2 = "0.9.3" thiserror = "1.0.24" ed25519-dalek = { version = "0.1.0", package = "ed25519-dalek-fiat", default-features = false, features = ["std", "fiat_u64_backend"] } -diem-crypto = { path = "../../../crypto/crypto", features = ["fuzzing"] } +diem-crypto = { path = "../../../crates/diem-crypto", features = ["fuzzing"] } diem-temppath = { path = "../../../common/temppath/" } diem-types = { path = "../../../types" } diem-workspace-hack = { path = "../../../common/workspace-hack" } diff --git a/testsuite/cluster-test/Cargo.toml b/testsuite/cluster-test/Cargo.toml index 943afda2b1..f029c6ffd6 100644 --- a/testsuite/cluster-test/Cargo.toml +++ b/testsuite/cluster-test/Cargo.toml @@ -38,7 +38,7 @@ num_cpus = "1.13.0" consensus-types = { path = "../../consensus/consensus-types" } generate-key = { path = "../../config/generate-key" } bcs = "0.1.2" -diem-crypto = { path = "../../crypto/crypto" } +diem-crypto = { path = "../../crates/diem-crypto" } diem-config = { path = "../../config" } diem-framework-releases = { path = "../../diem-move/diem-framework/DPN/releases" } diem-genesis-tool = { path = "../../config/management/genesis", features = ["testing"] } diff --git a/testsuite/diem-fuzzer/Cargo.toml b/testsuite/diem-fuzzer/Cargo.toml index 4bf64e7b9b..929d0fe198 100644 --- a/testsuite/diem-fuzzer/Cargo.toml +++ b/testsuite/diem-fuzzer/Cargo.toml @@ -35,7 +35,7 @@ consensus-types = { path = "../../consensus/consensus-types", features = ["fuzzi executor = { path = "../../execution/executor", features = ["fuzzing"] } executor-types = { path = "../../execution/executor-types", features = ["fuzzing"] } language-e2e-tests = { path = "../../language/testing-infra/e2e-tests" } -diem-crypto = { path = "../../crypto/crypto", features = ["fuzzing"]} +diem-crypto = { path = "../../crates/diem-crypto", features = ["fuzzing"]} diem-jellyfish-merkle = { path = "../../storage/jellyfish-merkle", features = ["fuzzing"] } diem-json-rpc = { path = "../../json-rpc", features = ["fuzzing"] } diem-mempool = { path = "../../mempool" } diff --git a/testsuite/generate-format/Cargo.toml b/testsuite/generate-format/Cargo.toml index 33b18b6aec..0c46345226 100644 --- a/testsuite/generate-format/Cargo.toml +++ b/testsuite/generate-format/Cargo.toml @@ -20,8 +20,8 @@ consensus = { path = "../../consensus", features=["fuzzing"] } consensus-types = { path = "../../consensus/consensus-types", features=["fuzzing"] } bcs = "0.1.2" diem-config = { path = "../../config" } -diem-crypto = { path = "../../crypto/crypto", features=["fuzzing"] } -diem-crypto-derive = { path = "../../crypto/crypto-derive"} +diem-crypto = { path = "../../crates/diem-crypto", features=["fuzzing"] } +diem-crypto-derive = { path = "../../crates/diem-crypto-derive"} diem-types = { path = "../../types", features=["fuzzing"] } diem-workspace-hack = { path = "../../common/workspace-hack" } network = { path = "../../network" } diff --git a/testsuite/smoke-test/Cargo.toml b/testsuite/smoke-test/Cargo.toml index cad5d58475..8f3d350d58 100644 --- a/testsuite/smoke-test/Cargo.toml +++ b/testsuite/smoke-test/Cargo.toml @@ -41,7 +41,7 @@ futures = "0.3.12" backup-cli = { path = "../../storage/backup/backup-cli" } debug-interface = { path = "../../common/debug-interface" } generate-key = { path = "../../config/generate-key" } -diem-crypto = { path = "../../crypto/crypto" } +diem-crypto = { path = "../../crates/diem-crypto" } diem-genesis-tool = {path = "../../config/management/genesis", features = ["testing"] } diem-global-constants = { path = "../../config/global-constants" } diem-infallible = { path = "../../common/infallible" } diff --git a/types/Cargo.toml b/types/Cargo.toml index e453a68b53..e5f0f34852 100644 --- a/types/Cargo.toml +++ b/types/Cargo.toml @@ -28,8 +28,8 @@ thiserror = "1.0.24" tiny-keccak = { version = "2.0.2", default-features = false, features = ["sha3"] } bcs = "0.1.2" -diem-crypto = { path = "../crypto/crypto", version = "0.0.3" } -diem-crypto-derive = { path = "../crypto/crypto-derive", version = "0.0.3" } +diem-crypto = { path = "../crates/diem-crypto", version = "0.0.3" } +diem-crypto-derive = { path = "../crates/diem-crypto-derive", version = "0.0.3" } move-core-types = { path = "../language/move-core/types", version = "0.0.3" } move-read-write-set-types = { path = "../language/tools/read-write-set/types" } @@ -39,7 +39,7 @@ proptest = "1.0.0" proptest-derive = "0.3.0" serde_json = "1.0.64" -diem-crypto = { path = "../crypto/crypto", features = ["fuzzing"] } +diem-crypto = { path = "../crates/diem-crypto", features = ["fuzzing"] } move-core-types = { path = "../language/move-core/types", features = ["fuzzing"] } diem-workspace-hack = { path = "../common/workspace-hack" } diff --git a/vm-validator/Cargo.toml b/vm-validator/Cargo.toml index 66c83c4191..4555ac4cbf 100644 --- a/vm-validator/Cargo.toml +++ b/vm-validator/Cargo.toml @@ -25,7 +25,7 @@ rand = "0.8.3" executor = { path = "../execution/executor" } executor-test-helpers = { path = "../execution/executor-test-helpers" } -diem-crypto = { path = "../crypto/crypto", features = ["fuzzing"] } +diem-crypto = { path = "../crates/diem-crypto", features = ["fuzzing"] } diem-temppath = { path = "../common/temppath" } diem-types = { path = "../types", features = ["fuzzing"] } diem-vm = { path = "../diem-move/diem-vm" } diff --git a/x.toml b/x.toml index 2d6f134ad5..e61ca616e8 100644 --- a/x.toml +++ b/x.toml @@ -71,12 +71,12 @@ target-features = "unknown" [[hakari.omitted-packages]] name = "diem-crypto" version = "0.1.0" -workspace-path = "crypto/crypto" +workspace-path = "crates/diem-crypto" [[hakari.omitted-packages]] name = "diem-crypto-derive" version = "0.1.0" -workspace-path = "crypto/crypto-derive" +workspace-path = "crates/diem-crypto-derive" [[hakari.omitted-packages]] name = "bytecode-interpreter-crypto"