Merge branch 'alex/crp-2023' into 'master'

chore(crypto): CRP-2023 implement instantiation of TempCryptoComponent with a custom vault RNG

Implement instantiation of TempCryptoComponent with a custom vault RNG to allow for reproducible tests that require a (Temp)CryptoComponent. 

See merge request dfinity-lab/public/ic!12487

Author: altkdf

Cargo.lock

@@ -1,43 +1,73 @@
 use super::*;
 
 pub struct CspBuilder<V> {
-    vault: Box<dyn FnOnce() -> V>,
+    vault: Box<dyn FnOnce() -> Arc<V>>,
     logger: ReplicaLogger,
     metrics: Arc<CryptoMetrics>,
 }
 
 impl<V: CspVault + 'static> CspBuilder<V> {
-    pub fn with_vault<W: CspVault + 'static>(self, vault: W) -> CspBuilder<W> {
+    pub fn with_vault<I, W>(self, vault: I) -> CspBuilder<W>
+    where
+        I: VaultIntoArc<Item = W> + 'static,
+        W: CspVault + 'static,
+    {
         CspBuilder {
-            vault: Box::new(|| vault),
+            vault: Box::new(|| vault.into_arc()),
             logger: self.logger,
             metrics: self.metrics,
         }
     }
 
     pub fn build(self) -> Csp {
         Csp {
-            csp_vault: Arc::new((self.vault)()),
+            csp_vault: (self.vault)(),
             logger: self.logger,
             metrics: self.metrics,
         }
     }
 }
 
 impl Csp {
-    pub fn builder<V: CspVault + 'static>(
-        vault: V,
+    pub fn builder<I, V>(
+        vault: I,
         logger: ReplicaLogger,
         metrics: Arc<CryptoMetrics>,
-    ) -> CspBuilder<V> {
+    ) -> CspBuilder<V>
+    where
+        I: VaultIntoArc<Item = V> + 'static,
+        V: CspVault + 'static,
+    {
         CspBuilder {
-            vault: Box::new(|| vault),
+            vault: Box::new(|| vault.into_arc()),
             logger,
             metrics,
         }
     }
 }
 
+pub trait VaultIntoArc {
+    type Item;
+
+    fn into_arc(self) -> Arc<Self::Item>;
+}
+
+impl<V: CspVault> VaultIntoArc for Arc<V> {
+    type Item = V;
+
+    fn into_arc(self) -> Arc<Self::Item> {
+        self
+    }
+}
+
+impl<V: CspVault> VaultIntoArc for V {
+    type Item = V;
+
+    fn into_arc(self) -> Arc<Self::Item> {
+        Arc::new(self)
+    }
+}
+
 #[cfg(test)]
 mod test_utils {
     use super::*;
@@ -55,7 +85,7 @@ mod test_utils {
             >,
         > {
             CspBuilder {
-                vault: Box::new(|| LocalCspVault::builder_for_test().build()),
+                vault: Box::new(|| LocalCspVault::builder_for_test().build_into_arc()),
                 logger: no_op_logger(),
                 metrics: Arc::new(CryptoMetrics::none()),
             }

rs/crypto/internal/crypto_service_provider/src/builder/mod.rs

@@ -30,6 +30,38 @@ impl ProdLocalCspVault {
             logger,
         }
     }
+
+    pub fn builder_in_dir(
+        key_store_dir: &Path,
+        metrics: Arc<CryptoMetrics>,
+        logger: ReplicaLogger,
+    ) -> LocalCspVaultBuilder<OsRng, ProtoSecretKeyStore, ProtoSecretKeyStore, ProtoPublicKeyStore>
+    {
+        const SKS_DATA_FILENAME: &str = "sks_data.pb";
+        const PUBLIC_KEY_STORE_DATA_FILENAME: &str = "public_keys.pb";
+        const CANISTER_SKS_DATA_FILENAME: &str = "canister_sks_data.pb";
+
+        let node_secret_key_store =
+            ProtoSecretKeyStore::open(key_store_dir, SKS_DATA_FILENAME, Some(new_logger!(logger)));
+        let canister_secret_key_store = ProtoSecretKeyStore::open(
+            key_store_dir,
+            CANISTER_SKS_DATA_FILENAME,
+            Some(new_logger!(logger)),
+        );
+        let public_key_store = ProtoPublicKeyStore::open(
+            key_store_dir,
+            PUBLIC_KEY_STORE_DATA_FILENAME,
+            new_logger!(logger),
+        );
+
+        Self::builder(
+            node_secret_key_store,
+            canister_secret_key_store,
+            public_key_store,
+            metrics,
+            logger,
+        )
+    }
 }
 
 impl<R, S, C, P> LocalCspVaultBuilder<R, S, C, P>
@@ -129,15 +161,7 @@ where
             logger: self.logger,
         }
     }
-}
 
-impl<R, S, C, P> LocalCspVaultBuilder<R, S, C, P>
-where
-    R: Rng + CryptoRng + Send + Sync + 'static,
-    S: SecretKeyStore + 'static,
-    C: SecretKeyStore + 'static,
-    P: PublicKeyStore + 'static,
-{
     pub fn build_into_arc(self) -> Arc<LocalCspVault<R, S, C, P>> {
         Arc::new(self.build())
     }

rs/crypto/internal/crypto_service_provider/src/vault/local_csp_vault/builder/mod.rs

@@ -121,29 +121,7 @@ impl ProdLocalCspVault {
         metrics: Arc<CryptoMetrics>,
         logger: ReplicaLogger,
     ) -> Self {
-        const SKS_DATA_FILENAME: &str = "sks_data.pb";
-        const PUBLIC_KEY_STORE_DATA_FILENAME: &str = "public_keys.pb";
-        const CANISTER_SKS_DATA_FILENAME: &str = "canister_sks_data.pb";
-
-        let node_secret_key_store =
-            ProtoSecretKeyStore::open(key_store_dir, SKS_DATA_FILENAME, Some(new_logger!(logger)));
-        let canister_secret_key_store = ProtoSecretKeyStore::open(
-            key_store_dir,
-            CANISTER_SKS_DATA_FILENAME,
-            Some(new_logger!(logger)),
-        );
-        let public_key_store = ProtoPublicKeyStore::open(
-            key_store_dir,
-            PUBLIC_KEY_STORE_DATA_FILENAME,
-            new_logger!(logger),
-        );
-        Self::new(
-            node_secret_key_store,
-            canister_secret_key_store,
-            public_key_store,
-            metrics,
-            logger,
-        )
+        ProdLocalCspVault::builder_in_dir(key_store_dir, metrics, logger).build()
     }
 }
 

rs/crypto/internal/crypto_service_provider/src/vault/local_csp_vault/mod.rs

@@ -21,6 +21,7 @@ DEPENDENCIES = [
     "//rs/registry/proto_data_provider",
     "//rs/types/base_types",
     "//rs/types/types",
+    "@crate_index//:rand_0_8_4",
     "@crate_index//:tempfile",
     "@crate_index//:tokio",
 ]
@@ -31,7 +32,10 @@ MACRO_DEPENDENCIES = [
 
 DEV_DEPENDENCIES = [
     "//rs/crypto/test_utils",
+    "//rs/crypto/test_utils/reproducible_rng",
+    "//rs/test_utilities",
     "//rs/types/types_test_utils",
+    "@crate_index//:assert_matches",
 ]
 
 MACRO_DEV_DEPENDENCIES = []

rs/crypto/temp_crypto/BUILD.bazel

@@ -23,9 +23,13 @@ ic-registry-client-fake = { path = "../../registry/fake" }
 ic-registry-keys = { path = "../../registry/keys" }
 ic-registry-proto-data-provider = { path = "../../registry/proto_data_provider" }
 ic-types = { path = "../../types/types" }
+rand = "0.8"
 tempfile = "3.1.0"
 tokio = { version = "1.15.0", features = ["full"] }
 
 [dev-dependencies]
+assert_matches = "1.5.0"
 ic-crypto-test-utils = { path = "../test_utils" }
+ic-crypto-test-utils-reproducible-rng = { path = "../test_utils/reproducible_rng" }
+ic-test-utilities = { path = "../../test_utilities" }
 ic-types-test-utils = { path = "../../types/types_test_utils" }