refactor(crypto): CRP-2451 rename PreSignatureQuadruple to EcdsaPreSi…

…gnatureQuadruple
dfinity · Mar 12, 2024 · b969bec · b969bec
1 parent 26a91d1
commit b969bec
Show file tree

Hide file tree

Showing 10 changed files with 89 additions and 89 deletions.
diff --git a/rs/consensus/src/ecdsa/payload_builder/errors.rs b/rs/consensus/src/ecdsa/payload_builder/errors.rs
@@ -4,8 +4,8 @@ use ic_types::{
     consensus::ecdsa,
     crypto::canister_threshold_sig::{
         error::{
-            IDkgParamsValidationError, IDkgTranscriptIdError, PresignatureQuadrupleCreationError,
-            ThresholdEcdsaSigInputsCreationError,
+            EcdsaPresignatureQuadrupleCreationError, IDkgParamsValidationError,
+            IDkgTranscriptIdError, ThresholdEcdsaSigInputsCreationError,
         },
         idkg::InitialIDkgDealings,
     },
@@ -22,7 +22,7 @@ pub(crate) enum EcdsaPayloadError {
     ConsensusSummaryBlockNotFound(Height),
     StateManagerError(StateManagerError),
     SubnetWithNoNodes(SubnetId, RegistryVersion),
-    PreSignatureError(PresignatureQuadrupleCreationError),
+    PreSignatureError(EcdsaPresignatureQuadrupleCreationError),
     IDkgParamsValidationError(IDkgParamsValidationError),
     IDkgTranscriptIdError(IDkgTranscriptIdError),
     ThresholdEcdsaSigInputsCreationError(ThresholdEcdsaSigInputsCreationError),
@@ -50,8 +50,8 @@ impl From<StateManagerError> for EcdsaPayloadError {
     }
 }
 
-impl From<PresignatureQuadrupleCreationError> for EcdsaPayloadError {
-    fn from(err: PresignatureQuadrupleCreationError) -> Self {
+impl From<EcdsaPresignatureQuadrupleCreationError> for EcdsaPayloadError {
+    fn from(err: EcdsaPresignatureQuadrupleCreationError) -> Self {
         EcdsaPayloadError::PreSignatureError(err)
     }
 }

diff --git a/rs/crypto/benches/idkg.rs b/rs/crypto/benches/idkg.rs
@@ -4,7 +4,7 @@ use criterion::{criterion_group, criterion_main, BenchmarkGroup, Criterion, Samp
 use ic_crypto_test_utils_canister_threshold_sigs::node::{Node, Nodes};
 use ic_crypto_test_utils_canister_threshold_sigs::{
     build_params_from_previous, create_transcript_or_panic,
-    generate_and_verify_openings_for_complaint, generate_presig_quadruple,
+    generate_and_verify_openings_for_complaint, generate_ecdsa_presig_quadruple,
     load_previous_transcripts_for_all_dealers, load_transcript_or_panic, random_transcript_id,
     run_idkg_without_complaint, setup_masked_random_params, CanisterThresholdSigTestEnvironment,
     IDkgMode, IDkgModeTestContext, IDkgParticipants, IDkgTestContextForComplaint,
@@ -15,7 +15,7 @@ use ic_types::crypto::canister_threshold_sig::idkg::{
     IDkgDealers, IDkgReceivers, IDkgTranscript, IDkgTranscriptOperation, IDkgTranscriptParams,
     InitialIDkgDealings, SignedIDkgDealing,
 };
-use ic_types::crypto::canister_threshold_sig::PreSignatureQuadruple;
+use ic_types::crypto::canister_threshold_sig::EcdsaPreSignatureQuadruple;
 use ic_types::crypto::AlgorithmId;
 use rand::{CryptoRng, RngCore};
 use std::cell::OnceCell;
@@ -446,8 +446,8 @@ fn bench_retain_active_transcripts<M: Measurement, R: RngCore + CryptoRng>(
                         receiver
                     });
                     for _ in 0..num_pre_sig_quadruples {
-                        let pre_sig_quadruple = {
-                            generate_presig_quadruple(
+                        let ecdsa_pre_sig_quadruple = {
+                            generate_ecdsa_presig_quadruple(
                                 env,
                                 dealers,
                                 receivers,
@@ -457,7 +457,7 @@ fn bench_retain_active_transcripts<M: Measurement, R: RngCore + CryptoRng>(
                                 rng,
                             )
                         };
-                        load_pre_signature_quadruple(receiver_ref, &pre_sig_quadruple);
+                        load_ecdsa_pre_signature_quadruple(receiver_ref, &ecdsa_pre_sig_quadruple);
                     }
                 },
                 |()| {
@@ -723,7 +723,7 @@ fn verify_transcript_or_panic(
         })
 }
 
-fn load_pre_signature_quadruple(receiver: &Node, quadruple: &PreSignatureQuadruple) {
+fn load_ecdsa_pre_signature_quadruple(receiver: &Node, quadruple: &EcdsaPreSignatureQuadruple) {
     assert_eq!(
         load_transcript_or_panic(receiver, quadruple.kappa_unmasked()),
         vec![]

diff --git a/rs/crypto/test_utils/canister_threshold_sigs/src/lib.rs b/rs/crypto/test_utils/canister_threshold_sigs/src/lib.rs
@@ -19,7 +19,7 @@ use ic_types::crypto::canister_threshold_sig::idkg::{
     IDkgUnmaskedTranscriptOrigin, SignedIDkgDealing,
 };
 use ic_types::crypto::canister_threshold_sig::{
-    ExtendedDerivationPath, PreSignatureQuadruple, ThresholdEcdsaSigShare,
+    EcdsaPreSignatureQuadruple, ExtendedDerivationPath, ThresholdEcdsaSigShare,
 };
 use ic_types::crypto::canister_threshold_sig::{
     ThresholdEcdsaCombinedSignature, ThresholdEcdsaSigInputs,
@@ -213,15 +213,15 @@ pub fn generate_key_transcript<R: RngCore + CryptoRng>(
         .run_idkg_and_create_and_verify_transcript(&unmasked_key_params, rng)
 }
 
-pub fn generate_presig_quadruple<R: RngCore + CryptoRng>(
+pub fn generate_ecdsa_presig_quadruple<R: RngCore + CryptoRng>(
     env: &CanisterThresholdSigTestEnvironment,
     dealers: &IDkgDealers,
     receivers: &IDkgReceivers,
     alg: AlgorithmId,
     key_transcript: &IDkgTranscript,
     random_unmasked_kappa: bool,
     rng: &mut R,
-) -> PreSignatureQuadruple {
+) -> EcdsaPreSignatureQuadruple {
     let lambda_params = setup_masked_random_params(env, alg, dealers, receivers, rng);
     let lambda_transcript = env
         .nodes
@@ -276,7 +276,7 @@ pub fn generate_presig_quadruple<R: RngCore + CryptoRng>(
             .run_idkg_and_create_and_verify_transcript(&key_times_lambda_params, rng)
     };
 
-    PreSignatureQuadruple::new(
+    EcdsaPreSignatureQuadruple::new(
         kappa_transcript,
         lambda_transcript,
         kappa_times_lambda_transcript,
@@ -1840,7 +1840,7 @@ pub fn generate_tecdsa_protocol_inputs<R: RngCore + CryptoRng>(
     random_unmasked_kappa: bool,
     rng: &mut R,
 ) -> ThresholdEcdsaSigInputs {
-    let quadruple = generate_presig_quadruple(
+    let quadruple = generate_ecdsa_presig_quadruple(
         env,
         dealers,
         receivers,
@@ -2268,7 +2268,7 @@ pub struct ThresholdEcdsaSigInputsBuilder {
     derivation_path: ExtendedDerivationPath,
     hashed_message: Vec<u8>,
     nonce: Randomness,
-    presig_quadruple: PreSignatureQuadruple,
+    presig_quadruple: EcdsaPreSignatureQuadruple,
     key_transcript: IDkgTranscript,
 }
 

diff --git a/rs/crypto/tests/canister_threshold_sigs.rs b/rs/crypto/tests/canister_threshold_sigs.rs
@@ -14,8 +14,8 @@ use ic_crypto_test_utils_canister_threshold_sigs::node::Nodes;
 use ic_crypto_test_utils_canister_threshold_sigs::{
     build_params_from_previous, copy_dealing_in_transcript,
     corrupt_dealings_and_generate_complaints_for_random_complainer,
-    corrupt_random_dealing_and_generate_complaint, generate_key_transcript,
-    generate_presig_quadruple, node_id, random_crypto_component_not_in_receivers, random_dealer_id,
+    corrupt_random_dealing_and_generate_complaint, generate_ecdsa_presig_quadruple,
+    generate_key_transcript, node_id, random_crypto_component_not_in_receivers, random_dealer_id,
     random_dealer_id_excluding, random_node_id_excluding, random_receiver_for_inputs,
     random_receiver_id, random_receiver_id_excluding, run_tecdsa_protocol,
     sig_share_from_each_receiver, swap_two_dealings_in_transcript,
@@ -189,7 +189,7 @@ mod create_dealing {
                 let unmasked_key_transcript = env
                     .nodes
                     .run_idkg_and_create_and_verify_transcript(&unmasked_key_params, rng);
-                let quadruple = generate_presig_quadruple(
+                let quadruple = generate_ecdsa_presig_quadruple(
                     &env,
                     &dealers,
                     &receivers,
@@ -458,7 +458,7 @@ mod create_dealing {
                 config.unmasked_key,
             );
 
-            let quadruple = generate_presig_quadruple(
+            let quadruple = generate_ecdsa_presig_quadruple(
                 &env,
                 &dealers,
                 &receivers,
@@ -1621,7 +1621,7 @@ mod verify_transcript {
         for alg in AlgorithmId::all_threshold_ecdsa_algorithms() {
             for use_random_unmasked_kappa in [false, true] {
                 let key_transcript = generate_key_transcript(&env, &dealers, &receivers, alg, rng);
-                generate_presig_quadruple(
+                generate_ecdsa_presig_quadruple(
                     &env,
                     &dealers,
                     &receivers,
@@ -2101,7 +2101,7 @@ mod sign_share {
         for alg in AlgorithmId::all_threshold_ecdsa_algorithms() {
             for use_random_unmasked_kappa in [false, true] {
                 let key_transcript = generate_key_transcript(&env, &dealers, &receivers, alg, rng);
-                let quadruple = generate_presig_quadruple(
+                let quadruple = generate_ecdsa_presig_quadruple(
                     &env,
                     &dealers,
                     &receivers,
@@ -2151,7 +2151,7 @@ mod sign_share {
                 .choose_dealers_and_receivers(&IDkgParticipants::RandomForThresholdSignature, rng);
 
             let key_transcript = generate_key_transcript(&env, &dealers, &receivers, alg, rng);
-            let quadruple = generate_presig_quadruple(
+            let quadruple = generate_ecdsa_presig_quadruple(
                 &env,
                 &dealers,
                 &receivers,
@@ -2204,7 +2204,7 @@ mod sign_share {
         for alg in AlgorithmId::all_threshold_ecdsa_algorithms() {
             for use_random_unmasked_kappa in [false, true] {
                 let key_transcript = generate_key_transcript(&env, &dealers, &receivers, alg, rng);
-                let quadruple = generate_presig_quadruple(
+                let quadruple = generate_ecdsa_presig_quadruple(
                     &env,
                     &dealers,
                     &receivers,
@@ -2372,7 +2372,7 @@ mod sign_share {
                             alg,
                             &mut inner_rng,
                         );
-                        let quadruple = generate_presig_quadruple(
+                        let quadruple = generate_ecdsa_presig_quadruple(
                             &env,
                             &dealers,
                             &receivers,
@@ -2922,7 +2922,7 @@ mod load_transcript_with_openings {
                 complainer
                     .load_transcript_with_openings(&key_transcript, &complaint_with_openings)
                     .expect("failed to load transcript with openings");
-                let quadruple = generate_presig_quadruple(
+                let quadruple = generate_ecdsa_presig_quadruple(
                     &env,
                     &dealers,
                     &receivers,
@@ -5149,7 +5149,7 @@ where
         env.choose_dealers_and_receivers(&IDkgParticipants::RandomForThresholdSignature, rng);
 
     let key_transcript = generate_key_transcript(&env, &dealers, &receivers, alg, rng);
-    let quadruple = generate_presig_quadruple(
+    let quadruple = generate_ecdsa_presig_quadruple(
         &env,
         &dealers,
         &receivers,

diff --git a/rs/interfaces/src/crypto/sign/canister_threshold_sig.rs b/rs/interfaces/src/crypto/sign/canister_threshold_sig.rs
@@ -143,7 +143,7 @@ use std::collections::{BTreeMap, HashSet};
 /// honest dealings.
 ///
 /// [`InitialIDkgDealings`]: ic_types::crypto::canister_threshold_sig::idkg::InitialIDkgDealings
-/// [`PreSignatureQuadruple`]: ic_types::crypto::canister_threshold_sig::PreSignatureQuadruple
+/// [`EcdsaPreSignatureQuadruple`]: ic_types::crypto::canister_threshold_sig::PreSignatureQuadruple
 /// [`Random`]: ic_types::crypto::canister_threshold_sig::idkg::IDkgTranscriptOperation::Random
 /// [`ReshareOfMasked`]: ic_types::crypto::canister_threshold_sig::idkg::IDkgTranscriptOperation::ReshareOfMasked
 /// [`ReshareOfUnmasked`]: ic_types::crypto::canister_threshold_sig::idkg::IDkgTranscriptOperation::ReshareOfUnmasked

diff --git a/rs/types/types/src/consensus/ecdsa_refs.rs b/rs/types/types/src/consensus/ecdsa_refs.rs
@@ -1,15 +1,15 @@
 //! Threshold ECDSA transcript references related defines.
 use crate::crypto::{
     canister_threshold_sig::error::{
-        IDkgParamsValidationError, PresignatureQuadrupleCreationError,
+        EcdsaPresignatureQuadrupleCreationError, IDkgParamsValidationError,
         ThresholdEcdsaSigInputsCreationError,
     },
     canister_threshold_sig::idkg::{
         IDkgTranscript, IDkgTranscriptId, IDkgTranscriptOperation, IDkgTranscriptParams,
         IDkgTranscriptType,
     },
     canister_threshold_sig::{
-        ExtendedDerivationPath, PreSignatureQuadruple, ThresholdEcdsaSigInputs,
+        EcdsaPreSignatureQuadruple, ExtendedDerivationPath, ThresholdEcdsaSigInputs,
     },
     AlgorithmId,
 };
@@ -1327,7 +1327,7 @@ pub enum PreSignatureQuadrupleError {
     LambdaMasked(TranscriptLookupError),
     KappaTimesLambda(TranscriptLookupError),
     KeyTimesLambda(TranscriptLookupError),
-    Failed(PresignatureQuadrupleCreationError),
+    Failed(EcdsaPresignatureQuadrupleCreationError),
 }
 
 impl PreSignatureQuadrupleRef {
@@ -1351,7 +1351,7 @@ impl PreSignatureQuadrupleRef {
     pub fn translate(
         &self,
         resolver: &dyn EcdsaBlockReader,
-    ) -> Result<PreSignatureQuadruple, PreSignatureQuadrupleError> {
+    ) -> Result<EcdsaPreSignatureQuadruple, PreSignatureQuadrupleError> {
         let kappa_unmasked = resolver
             .transcript(self.kappa_unmasked_ref.as_ref())
             .map_err(PreSignatureQuadrupleError::KappaUnmasked)?;
@@ -1364,7 +1364,7 @@ impl PreSignatureQuadrupleRef {
         let key_times_lambda = resolver
             .transcript(self.key_times_lambda_ref.as_ref())
             .map_err(PreSignatureQuadrupleError::KeyTimesLambda)?;
-        PreSignatureQuadruple::new(
+        EcdsaPreSignatureQuadruple::new(
             kappa_unmasked,
             lambda_masked,
             kappa_times_lambda,