Skip to content

Commit b969bec

Browse files
fspreissfspreiss
committed
refactor(crypto): CRP-2451 rename PreSignatureQuadruple to EcdsaPreSignatureQuadruple
1 parent 26a91d1 commit b969bec

File tree

10 files changed

+89
-89
lines changed

10 files changed

+89
-89
lines changed

‎rs/consensus/src/ecdsa/payload_builder/errors.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ use ic_types::{
44
consensus::ecdsa,
55
crypto::canister_threshold_sig::{
66
error::{
7-
IDkgParamsValidationError, IDkgTranscriptIdError, PresignatureQuadrupleCreationError,
8-
ThresholdEcdsaSigInputsCreationError,
7+
EcdsaPresignatureQuadrupleCreationError, IDkgParamsValidationError,
8+
IDkgTranscriptIdError, ThresholdEcdsaSigInputsCreationError,
99
},
1010
idkg::InitialIDkgDealings,
1111
},
@@ -22,7 +22,7 @@ pub(crate) enum EcdsaPayloadError {
2222
ConsensusSummaryBlockNotFound(Height),
2323
StateManagerError(StateManagerError),
2424
SubnetWithNoNodes(SubnetId, RegistryVersion),
25-
PreSignatureError(PresignatureQuadrupleCreationError),
25+
PreSignatureError(EcdsaPresignatureQuadrupleCreationError),
2626
IDkgParamsValidationError(IDkgParamsValidationError),
2727
IDkgTranscriptIdError(IDkgTranscriptIdError),
2828
ThresholdEcdsaSigInputsCreationError(ThresholdEcdsaSigInputsCreationError),
@@ -50,8 +50,8 @@ impl From<StateManagerError> for EcdsaPayloadError {
5050
}
5151
}
5252

53-
impl From<PresignatureQuadrupleCreationError> for EcdsaPayloadError {
54-
fn from(err: PresignatureQuadrupleCreationError) -> Self {
53+
impl From<EcdsaPresignatureQuadrupleCreationError> for EcdsaPayloadError {
54+
fn from(err: EcdsaPresignatureQuadrupleCreationError) -> Self {
5555
EcdsaPayloadError::PreSignatureError(err)
5656
}
5757
}

‎rs/crypto/benches/idkg.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use criterion::{criterion_group, criterion_main, BenchmarkGroup, Criterion, Samp
44
use ic_crypto_test_utils_canister_threshold_sigs::node::{Node, Nodes};
55
use ic_crypto_test_utils_canister_threshold_sigs::{
66
build_params_from_previous, create_transcript_or_panic,
7-
generate_and_verify_openings_for_complaint, generate_presig_quadruple,
7+
generate_and_verify_openings_for_complaint, generate_ecdsa_presig_quadruple,
88
load_previous_transcripts_for_all_dealers, load_transcript_or_panic, random_transcript_id,
99
run_idkg_without_complaint, setup_masked_random_params, CanisterThresholdSigTestEnvironment,
1010
IDkgMode, IDkgModeTestContext, IDkgParticipants, IDkgTestContextForComplaint,
@@ -15,7 +15,7 @@ use ic_types::crypto::canister_threshold_sig::idkg::{
1515
IDkgDealers, IDkgReceivers, IDkgTranscript, IDkgTranscriptOperation, IDkgTranscriptParams,
1616
InitialIDkgDealings, SignedIDkgDealing,
1717
};
18-
use ic_types::crypto::canister_threshold_sig::PreSignatureQuadruple;
18+
use ic_types::crypto::canister_threshold_sig::EcdsaPreSignatureQuadruple;
1919
use ic_types::crypto::AlgorithmId;
2020
use rand::{CryptoRng, RngCore};
2121
use std::cell::OnceCell;
@@ -446,8 +446,8 @@ fn bench_retain_active_transcripts<M: Measurement, R: RngCore + CryptoRng>(
446446
receiver
447447
});
448448
for _ in 0..num_pre_sig_quadruples {
449-
let pre_sig_quadruple = {
450-
generate_presig_quadruple(
449+
let ecdsa_pre_sig_quadruple = {
450+
generate_ecdsa_presig_quadruple(
451451
env,
452452
dealers,
453453
receivers,
@@ -457,7 +457,7 @@ fn bench_retain_active_transcripts<M: Measurement, R: RngCore + CryptoRng>(
457457
rng,
458458
)
459459
};
460-
load_pre_signature_quadruple(receiver_ref, &pre_sig_quadruple);
460+
load_ecdsa_pre_signature_quadruple(receiver_ref, &ecdsa_pre_sig_quadruple);
461461
}
462462
},
463463
|()| {
@@ -723,7 +723,7 @@ fn verify_transcript_or_panic(
723723
})
724724
}
725725

726-
fn load_pre_signature_quadruple(receiver: &Node, quadruple: &PreSignatureQuadruple) {
726+
fn load_ecdsa_pre_signature_quadruple(receiver: &Node, quadruple: &EcdsaPreSignatureQuadruple) {
727727
assert_eq!(
728728
load_transcript_or_panic(receiver, quadruple.kappa_unmasked()),
729729
vec![]

‎rs/crypto/test_utils/canister_threshold_sigs/src/lib.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use ic_types::crypto::canister_threshold_sig::idkg::{
1919
IDkgUnmaskedTranscriptOrigin, SignedIDkgDealing,
2020
};
2121
use ic_types::crypto::canister_threshold_sig::{
22-
ExtendedDerivationPath, PreSignatureQuadruple, ThresholdEcdsaSigShare,
22+
EcdsaPreSignatureQuadruple, ExtendedDerivationPath, ThresholdEcdsaSigShare,
2323
};
2424
use ic_types::crypto::canister_threshold_sig::{
2525
ThresholdEcdsaCombinedSignature, ThresholdEcdsaSigInputs,
@@ -213,15 +213,15 @@ pub fn generate_key_transcript<R: RngCore + CryptoRng>(
213213
.run_idkg_and_create_and_verify_transcript(&unmasked_key_params, rng)
214214
}
215215

216-
pub fn generate_presig_quadruple<R: RngCore + CryptoRng>(
216+
pub fn generate_ecdsa_presig_quadruple<R: RngCore + CryptoRng>(
217217
env: &CanisterThresholdSigTestEnvironment,
218218
dealers: &IDkgDealers,
219219
receivers: &IDkgReceivers,
220220
alg: AlgorithmId,
221221
key_transcript: &IDkgTranscript,
222222
random_unmasked_kappa: bool,
223223
rng: &mut R,
224-
) -> PreSignatureQuadruple {
224+
) -> EcdsaPreSignatureQuadruple {
225225
let lambda_params = setup_masked_random_params(env, alg, dealers, receivers, rng);
226226
let lambda_transcript = env
227227
.nodes
@@ -276,7 +276,7 @@ pub fn generate_presig_quadruple<R: RngCore + CryptoRng>(
276276
.run_idkg_and_create_and_verify_transcript(&key_times_lambda_params, rng)
277277
};
278278

279-
PreSignatureQuadruple::new(
279+
EcdsaPreSignatureQuadruple::new(
280280
kappa_transcript,
281281
lambda_transcript,
282282
kappa_times_lambda_transcript,
@@ -1840,7 +1840,7 @@ pub fn generate_tecdsa_protocol_inputs<R: RngCore + CryptoRng>(
18401840
random_unmasked_kappa: bool,
18411841
rng: &mut R,
18421842
) -> ThresholdEcdsaSigInputs {
1843-
let quadruple = generate_presig_quadruple(
1843+
let quadruple = generate_ecdsa_presig_quadruple(
18441844
env,
18451845
dealers,
18461846
receivers,
@@ -2268,7 +2268,7 @@ pub struct ThresholdEcdsaSigInputsBuilder {
22682268
derivation_path: ExtendedDerivationPath,
22692269
hashed_message: Vec<u8>,
22702270
nonce: Randomness,
2271-
presig_quadruple: PreSignatureQuadruple,
2271+
presig_quadruple: EcdsaPreSignatureQuadruple,
22722272
key_transcript: IDkgTranscript,
22732273
}
22742274

‎rs/crypto/tests/canister_threshold_sigs.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ use ic_crypto_test_utils_canister_threshold_sigs::node::Nodes;
1414
use ic_crypto_test_utils_canister_threshold_sigs::{
1515
build_params_from_previous, copy_dealing_in_transcript,
1616
corrupt_dealings_and_generate_complaints_for_random_complainer,
17-
corrupt_random_dealing_and_generate_complaint, generate_key_transcript,
18-
generate_presig_quadruple, node_id, random_crypto_component_not_in_receivers, random_dealer_id,
17+
corrupt_random_dealing_and_generate_complaint, generate_ecdsa_presig_quadruple,
18+
generate_key_transcript, node_id, random_crypto_component_not_in_receivers, random_dealer_id,
1919
random_dealer_id_excluding, random_node_id_excluding, random_receiver_for_inputs,
2020
random_receiver_id, random_receiver_id_excluding, run_tecdsa_protocol,
2121
sig_share_from_each_receiver, swap_two_dealings_in_transcript,
@@ -189,7 +189,7 @@ mod create_dealing {
189189
let unmasked_key_transcript = env
190190
.nodes
191191
.run_idkg_and_create_and_verify_transcript(&unmasked_key_params, rng);
192-
let quadruple = generate_presig_quadruple(
192+
let quadruple = generate_ecdsa_presig_quadruple(
193193
&env,
194194
&dealers,
195195
&receivers,
@@ -458,7 +458,7 @@ mod create_dealing {
458458
config.unmasked_key,
459459
);
460460

461-
let quadruple = generate_presig_quadruple(
461+
let quadruple = generate_ecdsa_presig_quadruple(
462462
&env,
463463
&dealers,
464464
&receivers,
@@ -1621,7 +1621,7 @@ mod verify_transcript {
16211621
for alg in AlgorithmId::all_threshold_ecdsa_algorithms() {
16221622
for use_random_unmasked_kappa in [false, true] {
16231623
let key_transcript = generate_key_transcript(&env, &dealers, &receivers, alg, rng);
1624-
generate_presig_quadruple(
1624+
generate_ecdsa_presig_quadruple(
16251625
&env,
16261626
&dealers,
16271627
&receivers,
@@ -2101,7 +2101,7 @@ mod sign_share {
21012101
for alg in AlgorithmId::all_threshold_ecdsa_algorithms() {
21022102
for use_random_unmasked_kappa in [false, true] {
21032103
let key_transcript = generate_key_transcript(&env, &dealers, &receivers, alg, rng);
2104-
let quadruple = generate_presig_quadruple(
2104+
let quadruple = generate_ecdsa_presig_quadruple(
21052105
&env,
21062106
&dealers,
21072107
&receivers,
@@ -2151,7 +2151,7 @@ mod sign_share {
21512151
.choose_dealers_and_receivers(&IDkgParticipants::RandomForThresholdSignature, rng);
21522152

21532153
let key_transcript = generate_key_transcript(&env, &dealers, &receivers, alg, rng);
2154-
let quadruple = generate_presig_quadruple(
2154+
let quadruple = generate_ecdsa_presig_quadruple(
21552155
&env,
21562156
&dealers,
21572157
&receivers,
@@ -2204,7 +2204,7 @@ mod sign_share {
22042204
for alg in AlgorithmId::all_threshold_ecdsa_algorithms() {
22052205
for use_random_unmasked_kappa in [false, true] {
22062206
let key_transcript = generate_key_transcript(&env, &dealers, &receivers, alg, rng);
2207-
let quadruple = generate_presig_quadruple(
2207+
let quadruple = generate_ecdsa_presig_quadruple(
22082208
&env,
22092209
&dealers,
22102210
&receivers,
@@ -2372,7 +2372,7 @@ mod sign_share {
23722372
alg,
23732373
&mut inner_rng,
23742374
);
2375-
let quadruple = generate_presig_quadruple(
2375+
let quadruple = generate_ecdsa_presig_quadruple(
23762376
&env,
23772377
&dealers,
23782378
&receivers,
@@ -2922,7 +2922,7 @@ mod load_transcript_with_openings {
29222922
complainer
29232923
.load_transcript_with_openings(&key_transcript, &complaint_with_openings)
29242924
.expect("failed to load transcript with openings");
2925-
let quadruple = generate_presig_quadruple(
2925+
let quadruple = generate_ecdsa_presig_quadruple(
29262926
&env,
29272927
&dealers,
29282928
&receivers,
@@ -5149,7 +5149,7 @@ where
51495149
env.choose_dealers_and_receivers(&IDkgParticipants::RandomForThresholdSignature, rng);
51505150

51515151
let key_transcript = generate_key_transcript(&env, &dealers, &receivers, alg, rng);
5152-
let quadruple = generate_presig_quadruple(
5152+
let quadruple = generate_ecdsa_presig_quadruple(
51535153
&env,
51545154
&dealers,
51555155
&receivers,

‎rs/interfaces/src/crypto/sign/canister_threshold_sig.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ use std::collections::{BTreeMap, HashSet};
143143
/// honest dealings.
144144
///
145145
/// [`InitialIDkgDealings`]: ic_types::crypto::canister_threshold_sig::idkg::InitialIDkgDealings
146-
/// [`PreSignatureQuadruple`]: ic_types::crypto::canister_threshold_sig::PreSignatureQuadruple
146+
/// [`EcdsaPreSignatureQuadruple`]: ic_types::crypto::canister_threshold_sig::PreSignatureQuadruple
147147
/// [`Random`]: ic_types::crypto::canister_threshold_sig::idkg::IDkgTranscriptOperation::Random
148148
/// [`ReshareOfMasked`]: ic_types::crypto::canister_threshold_sig::idkg::IDkgTranscriptOperation::ReshareOfMasked
149149
/// [`ReshareOfUnmasked`]: ic_types::crypto::canister_threshold_sig::idkg::IDkgTranscriptOperation::ReshareOfUnmasked

‎rs/types/types/src/consensus/ecdsa_refs.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
//! Threshold ECDSA transcript references related defines.
22
use crate::crypto::{
33
canister_threshold_sig::error::{
4-
IDkgParamsValidationError, PresignatureQuadrupleCreationError,
4+
EcdsaPresignatureQuadrupleCreationError, IDkgParamsValidationError,
55
ThresholdEcdsaSigInputsCreationError,
66
},
77
canister_threshold_sig::idkg::{
88
IDkgTranscript, IDkgTranscriptId, IDkgTranscriptOperation, IDkgTranscriptParams,
99
IDkgTranscriptType,
1010
},
1111
canister_threshold_sig::{
12-
ExtendedDerivationPath, PreSignatureQuadruple, ThresholdEcdsaSigInputs,
12+
EcdsaPreSignatureQuadruple, ExtendedDerivationPath, ThresholdEcdsaSigInputs,
1313
},
1414
AlgorithmId,
1515
};
@@ -1327,7 +1327,7 @@ pub enum PreSignatureQuadrupleError {
13271327
LambdaMasked(TranscriptLookupError),
13281328
KappaTimesLambda(TranscriptLookupError),
13291329
KeyTimesLambda(TranscriptLookupError),
1330-
Failed(PresignatureQuadrupleCreationError),
1330+
Failed(EcdsaPresignatureQuadrupleCreationError),
13311331
}
13321332

13331333
impl PreSignatureQuadrupleRef {
@@ -1351,7 +1351,7 @@ impl PreSignatureQuadrupleRef {
13511351
pub fn translate(
13521352
&self,
13531353
resolver: &dyn EcdsaBlockReader,
1354-
) -> Result<PreSignatureQuadruple, PreSignatureQuadrupleError> {
1354+
) -> Result<EcdsaPreSignatureQuadruple, PreSignatureQuadrupleError> {
13551355
let kappa_unmasked = resolver
13561356
.transcript(self.kappa_unmasked_ref.as_ref())
13571357
.map_err(PreSignatureQuadrupleError::KappaUnmasked)?;
@@ -1364,7 +1364,7 @@ impl PreSignatureQuadrupleRef {
13641364
let key_times_lambda = resolver
13651365
.transcript(self.key_times_lambda_ref.as_ref())
13661366
.map_err(PreSignatureQuadrupleError::KeyTimesLambda)?;
1367-
PreSignatureQuadruple::new(
1367+
EcdsaPreSignatureQuadruple::new(
13681368
kappa_unmasked,
13691369
lambda_masked,
13701370
kappa_times_lambda,

0 commit comments

Comments
 (0)