Skip to content

Commit fc70c3e

Browse files
committed
Remove error checks about empty pairing equality
1 parent 246ce02 commit fc70c3e

File tree

4 files changed

+5
-61
lines changed

4 files changed

+5
-61
lines changed

packages/core/src/errors/verification_error.rs

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ pub enum AggregationError {
1818
#[derive(Display, Debug, PartialEq)]
1919
#[cfg_attr(feature = "std", derive(thiserror::Error))]
2020
pub enum PairingEqualityError {
21-
#[display("List of G1 points is empty")]
22-
EmptyG1,
23-
#[display("List of G2 points is empty")]
24-
EmptyG2,
2521
#[display("List is not a multiple of 48")]
2622
NotMultipleG1,
2723
#[display("List is not a multiple of 96")]
@@ -125,18 +121,6 @@ impl From<CryptoError> for VerificationError {
125121
} => VerificationError::Aggregation {
126122
source: AggregationError::NotMultiple,
127123
},
128-
CryptoError::PairingEquality {
129-
source: cosmwasm_crypto::PairingEqualityError::EmptyG1,
130-
..
131-
} => VerificationError::PairingEquality {
132-
source: PairingEqualityError::EmptyG1,
133-
},
134-
CryptoError::PairingEquality {
135-
source: cosmwasm_crypto::PairingEqualityError::EmptyG2,
136-
..
137-
} => VerificationError::PairingEquality {
138-
source: PairingEqualityError::EmptyG2,
139-
},
140124
CryptoError::PairingEquality {
141125
source: cosmwasm_crypto::PairingEqualityError::NotMultipleG1 { .. },
142126
..

packages/crypto/src/bls12_318/pairing.rs

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@ pub fn bls12_381_pairing_equality(
2020
r: &[u8],
2121
s: &[u8],
2222
) -> Result<bool, CryptoError> {
23-
if ps.is_empty() {
24-
return Err(PairingEquality::EmptyG1.into());
25-
} else if qs.is_empty() {
26-
return Err(PairingEquality::EmptyG2.into());
27-
} else if ps.len() % BLS12_381_G1_POINT_LEN != 0 {
23+
if ps.len() % BLS12_381_G1_POINT_LEN != 0 {
2824
return Err(PairingEquality::NotMultipleG1 {
2925
remainder: ps.len() % BLS12_381_G1_POINT_LEN,
3026
}
@@ -159,24 +155,6 @@ mod test {
159155

160156
#[test]
161157
fn pairing_equality_error_cases_work() {
162-
let result = bls12_381_pairing_equality(&[], &[12], &[12], &[12]);
163-
assert!(matches!(
164-
result,
165-
Err(CryptoError::PairingEquality {
166-
source: PairingEqualityError::EmptyG1,
167-
..
168-
})
169-
));
170-
171-
let result = bls12_381_pairing_equality(&[12], &[], &[12], &[12]);
172-
assert!(matches!(
173-
result,
174-
Err(CryptoError::PairingEquality {
175-
source: PairingEqualityError::EmptyG2,
176-
..
177-
})
178-
));
179-
180158
let result = bls12_381_pairing_equality(&[12], &[0; 96], &[12], &[12]);
181159
assert!(matches!(
182160
result,

packages/crypto/src/errors.rs

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ pub enum Aggregation {
2121
#[derive(Debug, Display)]
2222
#[cfg_attr(feature = "std", derive(thiserror::Error))]
2323
pub enum PairingEquality {
24-
#[display("List of G1 points is empty")]
25-
EmptyG1,
26-
#[display("List of G2 points is empty")]
27-
EmptyG2,
2824
#[display("List is not a multiple of 48. Remainder: {remainder}")]
2925
NotMultipleG1 { remainder: usize },
3026
#[display("List is not a multiple of 96. Remainder: {remainder}")]
@@ -139,22 +135,14 @@ impl CryptoError {
139135
source: PairingEquality::UnequalPointAmount { .. },
140136
..
141137
} => 13,
142-
CryptoError::PairingEquality {
143-
source: PairingEquality::EmptyG1 { .. },
144-
..
145-
} => 14,
146-
CryptoError::PairingEquality {
147-
source: PairingEquality::EmptyG2 { .. },
148-
..
149-
} => 15,
150138
CryptoError::Aggregation {
151139
source: Aggregation::Empty,
152140
..
153-
} => 16,
141+
} => 14,
154142
CryptoError::Aggregation {
155143
source: Aggregation::NotMultiple { .. },
156144
..
157-
} => 17,
145+
} => 15,
158146
}
159147
}
160148
}

packages/std/src/imports.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -428,10 +428,10 @@ impl Api for ExternalApi {
428428
match result {
429429
0 => Ok(point),
430430
8 => Err(VerificationError::InvalidPoint),
431-
16 => Err(VerificationError::Aggregation {
431+
14 => Err(VerificationError::Aggregation {
432432
source: AggregationError::Empty,
433433
}),
434-
17 => Err(VerificationError::Aggregation {
434+
15 => Err(VerificationError::Aggregation {
435435
source: AggregationError::NotMultiple,
436436
}),
437437
error_code => Err(VerificationError::unknown_err(error_code)),
@@ -471,12 +471,6 @@ impl Api for ExternalApi {
471471
13 => Err(VerificationError::PairingEquality {
472472
source: PairingEqualityError::UnequalPointAmount,
473473
}),
474-
14 => Err(VerificationError::PairingEquality {
475-
source: PairingEqualityError::EmptyG1,
476-
}),
477-
15 => Err(VerificationError::PairingEquality {
478-
source: PairingEqualityError::EmptyG2,
479-
}),
480474
error_code => Err(VerificationError::unknown_err(error_code)),
481475
}
482476
}

0 commit comments

Comments
 (0)