crates: move crypto crates to crates directory

sherry-x · Nov 17, 2021 · 9ad0597 · 9ad0597
1 parent 35bc6a6
commit 9ad0597
Show file tree

Hide file tree

Showing 116 changed files with 98 additions and 98 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → crates/diem-crypto-derive/Cargo.toml b/crypto/crypto-derive/Cargo.toml → crates/diem-crypto-derive/Cargo.toml
diff --git a/crypto/crypto-derive/src/hasher.rs → crates/diem-crypto-derive/src/hasher.rs b/crypto/crypto-derive/src/hasher.rs → crates/diem-crypto-derive/src/hasher.rs
diff --git a/crypto/crypto-derive/src/lib.rs → crates/diem-crypto-derive/src/lib.rs b/crypto/crypto-derive/src/lib.rs → crates/diem-crypto-derive/src/lib.rs
diff --git a/crypto/crypto-derive/src/unions.rs → crates/diem-crypto-derive/src/unions.rs b/crypto/crypto-derive/src/unions.rs → crates/diem-crypto-derive/src/unions.rs
diff --git a/crypto/crypto/Cargo.toml → crates/diem-crypto/Cargo.toml b/crypto/crypto/Cargo.toml → 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 → crates/diem-crypto/README.md b/crypto/crypto/README.md → crates/diem-crypto/README.md
diff --git a/crypto/crypto/benches/ed25519.rs → crates/diem-crypto/benches/ed25519.rs b/crypto/crypto/benches/ed25519.rs → crates/diem-crypto/benches/ed25519.rs
diff --git a/crypto/crypto/benches/noise.rs → crates/diem-crypto/benches/noise.rs b/crypto/crypto/benches/noise.rs → crates/diem-crypto/benches/noise.rs
diff --git a/crypto/crypto/src/compat.rs → crates/diem-crypto/src/compat.rs b/crypto/crypto/src/compat.rs → crates/diem-crypto/src/compat.rs
diff --git a/crypto/crypto/src/ed25519.rs → crates/diem-crypto/src/ed25519.rs b/crypto/crypto/src/ed25519.rs → crates/diem-crypto/src/ed25519.rs
diff --git a/crypto/crypto/src/error.rs → crates/diem-crypto/src/error.rs b/crypto/crypto/src/error.rs → crates/diem-crypto/src/error.rs
diff --git a/crypto/crypto/src/hash.rs → crates/diem-crypto/src/hash.rs b/crypto/crypto/src/hash.rs → crates/diem-crypto/src/hash.rs
diff --git a/crypto/crypto/src/hkdf.rs → crates/diem-crypto/src/hkdf.rs b/crypto/crypto/src/hkdf.rs → crates/diem-crypto/src/hkdf.rs
diff --git a/crypto/crypto/src/lib.rs → crates/diem-crypto/src/lib.rs b/crypto/crypto/src/lib.rs → crates/diem-crypto/src/lib.rs
diff --git a/crypto/crypto/src/multi_ed25519.rs → crates/diem-crypto/src/multi_ed25519.rs b/crypto/crypto/src/multi_ed25519.rs → crates/diem-crypto/src/multi_ed25519.rs
diff --git a/crypto/crypto/src/noise.rs → crates/diem-crypto/src/noise.rs b/crypto/crypto/src/noise.rs → crates/diem-crypto/src/noise.rs
diff --git a/crypto/crypto/src/tags.rs → crates/diem-crypto/src/tags.rs b/crypto/crypto/src/tags.rs → crates/diem-crypto/src/tags.rs
diff --git a/crypto/crypto/src/test_utils.rs → crates/diem-crypto/src/test_utils.rs b/crypto/crypto/src/test_utils.rs → crates/diem-crypto/src/test_utils.rs
diff --git a/crypto/crypto/src/traits.rs → crates/diem-crypto/src/traits.rs b/crypto/crypto/src/traits.rs → crates/diem-crypto/src/traits.rs
diff --git a/crypto/crypto/src/unit_tests/bcs_test.rs → ...es/diem-crypto/src/unit_tests/bcs_test.rs b/crypto/crypto/src/unit_tests/bcs_test.rs → ...es/diem-crypto/src/unit_tests/bcs_test.rs
diff --git a/crypto/crypto/src/unit_tests/compat_test.rs → ...diem-crypto/src/unit_tests/compat_test.rs b/crypto/crypto/src/unit_tests/compat_test.rs → ...diem-crypto/src/unit_tests/compat_test.rs
diff --git a/.../src/unit_tests/compilation/cross_test.rs → .../src/unit_tests/compilation/cross_test.rs b/.../src/unit_tests/compilation/cross_test.rs → .../src/unit_tests/compilation/cross_test.rs
diff --git a/...tests/compilation/cross_test_trait_obj.rs → ...tests/compilation/cross_test_trait_obj.rs b/...tests/compilation/cross_test_trait_obj.rs → ...tests/compilation/cross_test_trait_obj.rs
diff --git a/...s/compilation/cross_test_trait_obj_pub.rs → ...s/compilation/cross_test_trait_obj_pub.rs b/...s/compilation/cross_test_trait_obj_pub.rs → ...s/compilation/cross_test_trait_obj_pub.rs
diff --git a/...s/compilation/cross_test_trait_obj_sig.rs → ...s/compilation/cross_test_trait_obj_sig.rs b/...s/compilation/cross_test_trait_obj_sig.rs → ...s/compilation/cross_test_trait_obj_sig.rs
diff --git a/...o/src/unit_tests/compilation/small_kdf.rs → ...o/src/unit_tests/compilation/small_kdf.rs b/...o/src/unit_tests/compilation/small_kdf.rs → ...o/src/unit_tests/compilation/small_kdf.rs
diff --git a/crypto/crypto/src/unit_tests/cross_test.rs → .../diem-crypto/src/unit_tests/cross_test.rs b/crypto/crypto/src/unit_tests/cross_test.rs → .../diem-crypto/src/unit_tests/cross_test.rs
diff --git a/crypto/crypto/src/unit_tests/cryptohasher.rs → ...iem-crypto/src/unit_tests/cryptohasher.rs b/crypto/crypto/src/unit_tests/cryptohasher.rs → ...iem-crypto/src/unit_tests/cryptohasher.rs
diff --git a/crypto/crypto/src/unit_tests/ed25519_test.rs → ...iem-crypto/src/unit_tests/ed25519_test.rs b/crypto/crypto/src/unit_tests/ed25519_test.rs → ...iem-crypto/src/unit_tests/ed25519_test.rs
diff --git a/crypto/crypto/src/unit_tests/hash_test.rs → ...s/diem-crypto/src/unit_tests/hash_test.rs b/crypto/crypto/src/unit_tests/hash_test.rs → ...s/diem-crypto/src/unit_tests/hash_test.rs
diff --git a/crypto/crypto/src/unit_tests/hkdf_test.rs → ...s/diem-crypto/src/unit_tests/hkdf_test.rs b/crypto/crypto/src/unit_tests/hkdf_test.rs → ...s/diem-crypto/src/unit_tests/hkdf_test.rs
diff --git a/crypto/crypto/src/unit_tests/mod.rs → crates/diem-crypto/src/unit_tests/mod.rs b/crypto/crypto/src/unit_tests/mod.rs → crates/diem-crypto/src/unit_tests/mod.rs
diff --git a/...ypto/src/unit_tests/multi_ed25519_test.rs → ...ypto/src/unit_tests/multi_ed25519_test.rs b/...ypto/src/unit_tests/multi_ed25519_test.rs → ...ypto/src/unit_tests/multi_ed25519_test.rs
diff --git a/crypto/crypto/src/unit_tests/noise_test.rs → .../diem-crypto/src/unit_tests/noise_test.rs b/crypto/crypto/src/unit_tests/noise_test.rs → .../diem-crypto/src/unit_tests/noise_test.rs
diff --git a/crypto/crypto/src/validatable.rs → crates/diem-crypto/src/validatable.rs b/crypto/crypto/src/validatable.rs → crates/diem-crypto/src/validatable.rs
diff --git a/crypto/crypto/src/x25519.rs → crates/diem-crypto/src/x25519.rs b/crypto/crypto/src/x25519.rs → crates/diem-crypto/src/x25519.rs
diff --git a/...o/crypto/test_vectors/noise_cacophony.txt → ...m-crypto/test_vectors/noise_cacophony.txt b/...o/crypto/test_vectors/noise_cacophony.txt → ...m-crypto/test_vectors/noise_cacophony.txt
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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" }