Skip to content

Commit e7bdddd

Browse files
committed
refactor: rename check_fe_equal -> fe_equal
As this function doesn't do any checking, it's better to rename it, so that it's less likely to miss the needed `CHECK`.
1 parent 00111c9 commit e7bdddd

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

src/modules/ellswift/tests_impl.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,9 @@ void run_ellswift_tests(void) {
188188
CHECK(ret == ((testcase->enc_bitmap >> c) & 1));
189189
if (ret) {
190190
secp256k1_fe x2;
191-
CHECK(check_fe_equal(&t, &testcase->encs[c]));
191+
CHECK(fe_equal(&t, &testcase->encs[c]));
192192
secp256k1_ellswift_xswiftec_var(&x2, &testcase->u, &testcase->encs[c]);
193-
CHECK(check_fe_equal(&testcase->x, &x2));
193+
CHECK(fe_equal(&testcase->x, &x2));
194194
}
195195
}
196196
}
@@ -203,7 +203,7 @@ void run_ellswift_tests(void) {
203203
CHECK(ret);
204204
ret = secp256k1_pubkey_load(CTX, &ge, &pubkey);
205205
CHECK(ret);
206-
CHECK(check_fe_equal(&testcase->x, &ge.x));
206+
CHECK(fe_equal(&testcase->x, &ge.x));
207207
CHECK(secp256k1_fe_is_odd(&ge.y) == testcase->odd_y);
208208
}
209209
for (i = 0; (unsigned)i < sizeof(ellswift_xdh_tests_bip324) / sizeof(ellswift_xdh_tests_bip324[0]); ++i) {
@@ -290,7 +290,7 @@ void run_ellswift_tests(void) {
290290
secp256k1_ecmult(&resj, &decj, &sec, NULL);
291291
secp256k1_ge_set_gej(&res, &resj);
292292
/* Compare. */
293-
CHECK(check_fe_equal(&res.x, &share_x));
293+
CHECK(fe_equal(&res.x, &share_x));
294294
}
295295
/* Verify the joint behavior of secp256k1_ellswift_xdh */
296296
for (i = 0; i < 200 * COUNT; i++) {

src/tests.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2953,7 +2953,7 @@ static void random_fe_non_square(secp256k1_fe *ns) {
29532953
}
29542954
}
29552955

2956-
static int check_fe_equal(const secp256k1_fe *a, const secp256k1_fe *b) {
2956+
static int fe_equal(const secp256k1_fe *a, const secp256k1_fe *b) {
29572957
secp256k1_fe an = *a;
29582958
secp256k1_fe bn = *b;
29592959
secp256k1_fe_normalize_weak(&an);
@@ -3090,7 +3090,7 @@ static void run_field_half(void) {
30903090
#endif
30913091
secp256k1_fe_normalize_weak(&u);
30923092
secp256k1_fe_add(&u, &u);
3093-
CHECK(check_fe_equal(&t, &u));
3093+
CHECK(fe_equal(&t, &u));
30943094

30953095
/* Check worst-case input: ensure the LSB is 1 so that P will be added,
30963096
* which will also cause all carries to be 1, since all limbs that can
@@ -3109,7 +3109,7 @@ static void run_field_half(void) {
31093109
#endif
31103110
secp256k1_fe_normalize_weak(&u);
31113111
secp256k1_fe_add(&u, &u);
3112-
CHECK(check_fe_equal(&t, &u));
3112+
CHECK(fe_equal(&t, &u));
31133113
}
31143114
}
31153115

@@ -3136,7 +3136,7 @@ static void run_field_misc(void) {
31363136
secp256k1_fe_add(&z, &q); /* z = x+v */
31373137
q = x; /* q = x */
31383138
secp256k1_fe_add_int(&q, v); /* q = x+v */
3139-
CHECK(check_fe_equal(&q, &z));
3139+
CHECK(fe_equal(&q, &z));
31403140
/* Test the fe equality and comparison operations. */
31413141
CHECK(secp256k1_fe_cmp_var(&x, &x) == 0);
31423142
CHECK(secp256k1_fe_equal(&x, &x));
@@ -3196,27 +3196,27 @@ static void run_field_misc(void) {
31963196
secp256k1_fe_add(&y, &x);
31973197
z = x;
31983198
secp256k1_fe_mul_int(&z, 3);
3199-
CHECK(check_fe_equal(&y, &z));
3199+
CHECK(fe_equal(&y, &z));
32003200
secp256k1_fe_add(&y, &x);
32013201
secp256k1_fe_add(&z, &x);
3202-
CHECK(check_fe_equal(&z, &y));
3202+
CHECK(fe_equal(&z, &y));
32033203
z = x;
32043204
secp256k1_fe_mul_int(&z, 5);
32053205
secp256k1_fe_mul(&q, &x, &fe5);
3206-
CHECK(check_fe_equal(&z, &q));
3206+
CHECK(fe_equal(&z, &q));
32073207
secp256k1_fe_negate(&x, &x, 1);
32083208
secp256k1_fe_add(&z, &x);
32093209
secp256k1_fe_add(&q, &x);
3210-
CHECK(check_fe_equal(&y, &z));
3211-
CHECK(check_fe_equal(&q, &y));
3210+
CHECK(fe_equal(&y, &z));
3211+
CHECK(fe_equal(&q, &y));
32123212
/* Check secp256k1_fe_half. */
32133213
z = x;
32143214
secp256k1_fe_half(&z);
32153215
secp256k1_fe_add(&z, &z);
3216-
CHECK(check_fe_equal(&x, &z));
3216+
CHECK(fe_equal(&x, &z));
32173217
secp256k1_fe_add(&z, &z);
32183218
secp256k1_fe_half(&z);
3219-
CHECK(check_fe_equal(&x, &z));
3219+
CHECK(fe_equal(&x, &z));
32203220
}
32213221
}
32223222

@@ -3618,9 +3618,9 @@ static void run_inverse_tests(void)
36183618
for (i = 0; (size_t)i < sizeof(fe_cases)/sizeof(fe_cases[0]); ++i) {
36193619
for (var = 0; var <= 1; ++var) {
36203620
test_inverse_field(&x_fe, &fe_cases[i][0], var);
3621-
CHECK(check_fe_equal(&x_fe, &fe_cases[i][1]));
3621+
CHECK(fe_equal(&x_fe, &fe_cases[i][1]));
36223622
test_inverse_field(&x_fe, &fe_cases[i][1], var);
3623-
CHECK(check_fe_equal(&x_fe, &fe_cases[i][0]));
3623+
CHECK(fe_equal(&x_fe, &fe_cases[i][0]));
36243624
}
36253625
}
36263626
for (i = 0; (size_t)i < sizeof(scalar_cases)/sizeof(scalar_cases[0]); ++i) {
@@ -4556,7 +4556,7 @@ static void ecmult_const_mult_xonly(void) {
45564556
/* Check that resj's X coordinate corresponds with resx. */
45574557
secp256k1_fe_sqr(&v, &resj.z);
45584558
secp256k1_fe_mul(&v, &v, &resx);
4559-
CHECK(check_fe_equal(&v, &resj.x));
4559+
CHECK(fe_equal(&v, &resj.x));
45604560
}
45614561

45624562
/* Test that secp256k1_ecmult_const_xonly correctly rejects X coordinates not on curve. */

0 commit comments

Comments
 (0)