use mc-rand, delete mc-crypto-rand (#3291)

* use mc-rand, delete mc-crypto-rand * bump to 1.1, fix cargo sort issue * Update common/Cargo.toml Co-authored-by: Varsha <102332078+varsha888@users.noreply.github.com> --------- Co-authored-by: Varsha <102332078+varsha888@users.noreply.github.com>
mobilecoinfoundation · Mar 27, 2023 · 1a9f649 · 1a9f649
1 parent 6c0735b
commit 1a9f649
Show file tree

Hide file tree

Showing 61 changed files with 164 additions and 407 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -46,7 +46,6 @@ members = [
     "crypto/message-cipher",
     "crypto/multisig",
     "crypto/noise",
-    "crypto/rand",
     "crypto/ring-signature",
     "crypto/ring-signature/signer",
     "crypto/sig",

diff --git a/common/Cargo.toml b/common/Cargo.toml
@@ -38,7 +38,7 @@ loggers = [
 [dependencies]
 mc-crypto-digestible = { path = "../crypto/digestible" }
 mc-crypto-keys = { path = "../crypto/keys", default-features = false, features = [ "serde", "alloc", "prost" ] }
-mc-crypto-rand = { path = "../crypto/rand" }
+mc-rand = "1.0"
 # loggers-only dependencies
 mc-util-build-info = { path = "../util/build/info", optional = true }
 # log- and loggers-only dependencies

diff --git a/common/src/hasher_builder.rs b/common/src/hasher_builder.rs
@@ -1,10 +1,10 @@
-// Copyright (c) 2018-2022 The MobileCoin Foundation
+// Copyright (c) 2018-2023 The MobileCoin Foundation
 
 //! This file provides [HasherBuilder], used in `mc_common::HashMap`
 //! in and out of the enclave.
 
 use core::hash::BuildHasher;
-use mc_crypto_rand::McRng;
+use mc_rand::McRng;
 use rand_core::RngCore;
 use siphasher::sip::SipHasher13;
 

diff --git a/connection/Cargo.toml b/connection/Cargo.toml
@@ -17,7 +17,6 @@ mc-common = { path = "../common" }
 mc-consensus-api = { path = "../consensus/api" }
 mc-crypto-keys = { path = "../crypto/keys" }
 mc-crypto-noise = { path = "../crypto/noise" }
-mc-crypto-rand = { path = "../crypto/rand" }
 mc-transaction-core = { path = "../transaction/core" }
 mc-util-grpc = { path = "../util/grpc" }
 mc-util-serial = { path = "../util/serial" }
@@ -27,6 +26,7 @@ aes-gcm = "0.10.1"
 cookie = "0.17"
 displaydoc = "0.2"
 grpcio = "0.12.1"
+mc-rand = "1"
 retry = "2.0"
 secrecy = "0.8"
 serde = "1.0"

diff --git a/connection/src/thick.rs b/connection/src/thick.rs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2022 The MobileCoin Foundation
+// Copyright (c) 2018-2023 The MobileCoin Foundation
 
 //! Connection implementations required for the thick client.
 //! The attested client implementation.
@@ -38,7 +38,7 @@ use mc_consensus_api::{
 };
 use mc_crypto_keys::X25519;
 use mc_crypto_noise::CipherError;
-use mc_crypto_rand::McRng;
+use mc_rand::McRng;
 use mc_transaction_core::tx::Tx;
 use mc_util_grpc::{ConnectionUriGrpcioChannel, GrpcCookieStore, CHAIN_ID_GRPC_HEADER};
 use mc_util_serial::encode;

diff --git a/consensus/enclave/Cargo.toml b/consensus/enclave/Cargo.toml
@@ -37,9 +37,9 @@ pkg-config = "0.3"
 mc-attest-ake = { path = "../../attest/ake" }
 mc-attest-api = { path = "../../attest/api" }
 mc-attest-net = { path = "../../attest/net" }
-mc-crypto-rand = { path = "../../crypto/rand" }
 mc-fog-test-infra = { path = "../../fog/test_infra" }
 mc-ledger-db = { path = "../../ledger/db", features = ["test_utils"] }
+mc-rand = "1.0"
 mc-sgx-report-cache-untrusted = { path = "../../sgx/report-cache/untrusted" }
 mc-transaction-core-test-utils = { path = "../../transaction/core/test-utils" }
 mc-util-metrics = { path = "../../util/metrics" }

diff --git a/consensus/enclave/impl/Cargo.toml b/consensus/enclave/impl/Cargo.toml
@@ -39,7 +39,7 @@ mc-crypto-ake-enclave = { path = "../../../crypto/ake/enclave" }
 mc-crypto-digestible = { path = "../../../crypto/digestible" }
 mc-crypto-keys = { path = "../../../crypto/keys", default-features = false }
 mc-crypto-message-cipher = { path = "../../../crypto/message-cipher" }
-mc-crypto-rand = { path = "../../../crypto/rand" }
+mc-rand = "1.0"
 mc-sgx-compat = { path = "../../../sgx/compat" }
 mc-sgx-report-cache-api = { path = "../../../sgx/report-cache/api" }
 mc-transaction-core = { path = "../../../transaction/core" }

diff --git a/consensus/enclave/impl/src/identity.rs b/consensus/enclave/impl/src/identity.rs
@@ -1,9 +1,9 @@
-// Copyright (c) 2018-2022 The MobileCoin Foundation
+// Copyright (c) 2018-2023 The MobileCoin Foundation
 
 /// Implementation of ed25519 signer identity for report
 use mc_crypto_ake_enclave::EnclaveIdentity;
 use mc_crypto_keys::{Ed25519Pair, Ed25519Public};
-use mc_crypto_rand::McRng;
+use mc_rand::McRng;
 use mc_sgx_compat::sync::Mutex;
 use mc_util_from_random::FromRandom;
 

diff --git a/consensus/enclave/impl/src/lib.rs b/consensus/enclave/impl/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2022 The MobileCoin Foundation
+// Copyright (c) 2018-2023 The MobileCoin Foundation
 
 //! MobileNode Internal Enclave Implementation
 //!
@@ -55,7 +55,7 @@ use mc_crypto_ake_enclave::AkeEnclaveState;
 use mc_crypto_digestible::{DigestTranscript, Digestible, MerlinTranscript};
 use mc_crypto_keys::{Ed25519Pair, Ed25519Public, RistrettoPrivate, RistrettoPublic, X25519Public};
 use mc_crypto_message_cipher::{AesMessageCipher, MessageCipher};
-use mc_crypto_rand::McRng;
+use mc_rand::McRng;
 use mc_sgx_compat::sync::Mutex;
 use mc_sgx_report_cache_api::{ReportableEnclave, Result as ReportableEnclaveResult};
 use mc_transaction_core::{

diff --git a/consensus/enclave/mock/Cargo.toml b/consensus/enclave/mock/Cargo.toml
@@ -16,7 +16,7 @@ mc-common = { path = "../../../common" }
 mc-consensus-enclave-api = { path = "../api" }
 mc-crypto-keys = { path = "../../../crypto/keys" }
 mc-crypto-multisig = { path = "../../../crypto/multisig" }
-mc-crypto-rand = { path = "../../../crypto/rand" }
+mc-rand = "1.0"
 mc-sgx-report-cache-api = { path = "../../../sgx/report-cache/api" }
 mc-transaction-core = { path = "../../../transaction/core" }
 mc-transaction-core-test-utils = { path = "../../../transaction/core/test-utils" }