Skip to content

Commit 0fef847

Browse files
committed
tests: refactor: rename random_field_element_magnitude -> random_fe_magnitude
Note that the already existing function `random_fe_magnitude` is removed and the call-sites are adapted to pass the magnitude range of 8 (the maximum for secp256k1_fe_mul and secp256k1_fe_sqr) explicitly.
1 parent 59db007 commit 0fef847

File tree

1 file changed

+11
-15
lines changed

1 file changed

+11
-15
lines changed

src/tests.c

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ static void uncounting_illegal_callback_fn(const char* str, void* data) {
9696
(*p)--;
9797
}
9898

99-
static void random_field_element_magnitude(secp256k1_fe *fe, int m) {
99+
static void random_fe_magnitude(secp256k1_fe *fe, int m) {
100100
secp256k1_fe zero;
101101
int n = secp256k1_testrand_int(m + 1);
102102
secp256k1_fe_normalize(fe);
@@ -128,28 +128,24 @@ static void random_fe_non_zero_test(secp256k1_fe *fe) {
128128
} while(secp256k1_fe_is_zero(fe));
129129
}
130130

131-
static void random_fe_magnitude(secp256k1_fe *fe) {
132-
random_field_element_magnitude(fe, 8);
133-
}
134-
135131
static void random_ge_x_magnitude(secp256k1_ge *ge) {
136-
random_field_element_magnitude(&ge->x, SECP256K1_GE_X_MAGNITUDE_MAX);
132+
random_fe_magnitude(&ge->x, SECP256K1_GE_X_MAGNITUDE_MAX);
137133
}
138134

139135
static void random_ge_y_magnitude(secp256k1_ge *ge) {
140-
random_field_element_magnitude(&ge->y, SECP256K1_GE_Y_MAGNITUDE_MAX);
136+
random_fe_magnitude(&ge->y, SECP256K1_GE_Y_MAGNITUDE_MAX);
141137
}
142138

143139
static void random_gej_x_magnitude(secp256k1_gej *gej) {
144-
random_field_element_magnitude(&gej->x, SECP256K1_GEJ_X_MAGNITUDE_MAX);
140+
random_fe_magnitude(&gej->x, SECP256K1_GEJ_X_MAGNITUDE_MAX);
145141
}
146142

147143
static void random_gej_y_magnitude(secp256k1_gej *gej) {
148-
random_field_element_magnitude(&gej->y, SECP256K1_GEJ_Y_MAGNITUDE_MAX);
144+
random_fe_magnitude(&gej->y, SECP256K1_GEJ_Y_MAGNITUDE_MAX);
149145
}
150146

151147
static void random_gej_z_magnitude(secp256k1_gej *gej) {
152-
random_field_element_magnitude(&gej->z, SECP256K1_GEJ_Z_MAGNITUDE_MAX);
148+
random_fe_magnitude(&gej->z, SECP256K1_GEJ_Z_MAGNITUDE_MAX);
153149
}
154150

155151
static void random_ge_test(secp256k1_ge *ge) {
@@ -3269,13 +3265,13 @@ static void run_fe_mul(void) {
32693265
for (i = 0; i < 100 * COUNT; ++i) {
32703266
secp256k1_fe a, b, c, d;
32713267
random_fe(&a);
3272-
random_fe_magnitude(&a);
3268+
random_fe_magnitude(&a, 8);
32733269
random_fe(&b);
3274-
random_fe_magnitude(&b);
3270+
random_fe_magnitude(&b, 8);
32753271
random_fe_test(&c);
3276-
random_fe_magnitude(&c);
3272+
random_fe_magnitude(&c, 8);
32773273
random_fe_test(&d);
3278-
random_fe_magnitude(&d);
3274+
random_fe_magnitude(&d, 8);
32793275
test_fe_mul(&a, &a, 1);
32803276
test_fe_mul(&c, &c, 1);
32813277
test_fe_mul(&a, &b, 0);
@@ -3829,7 +3825,7 @@ static void test_ge(void) {
38293825

38303826
/* Generate random zf, and zfi2 = 1/zf^2, zfi3 = 1/zf^3 */
38313827
random_fe_non_zero_test(&zf);
3832-
random_fe_magnitude(&zf);
3828+
random_fe_magnitude(&zf, 8);
38333829
secp256k1_fe_inv_var(&zfi3, &zf);
38343830
secp256k1_fe_sqr(&zfi2, &zfi3);
38353831
secp256k1_fe_mul(&zfi3, &zfi3, &zfi2);

0 commit comments

Comments
 (0)