Skip to content

Commit 0ee7453

Browse files
committed
tests: refactor: add testutil_ prefix to testutil.h functions
1 parent 0c6bc76 commit 0ee7453

File tree

6 files changed

+138
-138
lines changed

6 files changed

+138
-138
lines changed

src/modules/ecdh/tests_impl.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ static void test_ecdh_generator_basepoint(void) {
5656
size_t point_ser_len = sizeof(point_ser);
5757
secp256k1_scalar s;
5858

59-
random_scalar_order(&s);
59+
testutil_random_scalar_order(&s);
6060
secp256k1_scalar_get_b32(s_b32, &s);
6161

6262
CHECK(secp256k1_ec_pubkey_create(CTX, &point[0], s_one) == 1);
@@ -95,7 +95,7 @@ static void test_bad_scalar(void) {
9595
secp256k1_pubkey point;
9696

9797
/* Create random point */
98-
random_scalar_order(&rand);
98+
testutil_random_scalar_order(&rand);
9999
secp256k1_scalar_get_b32(s_rand, &rand);
100100
CHECK(secp256k1_ec_pubkey_create(CTX, &point, s_rand) == 1);
101101

@@ -127,7 +127,7 @@ static void test_result_basepoint(void) {
127127
CHECK(secp256k1_ecdh(CTX, out_base, &point, s_one, NULL, NULL) == 1);
128128

129129
for (i = 0; i < 2 * COUNT; i++) {
130-
random_scalar_order(&rand);
130+
testutil_random_scalar_order(&rand);
131131
secp256k1_scalar_get_b32(s, &rand);
132132
secp256k1_scalar_inverse(&rand, &rand);
133133
secp256k1_scalar_get_b32(s_inv, &rand);

src/modules/ellswift/tests_impl.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ void run_ellswift_tests(void) {
229229
secp256k1_ge g, g2;
230230
secp256k1_pubkey pubkey, pubkey2;
231231
/* Generate random public key and random randomizer. */
232-
random_ge_test(&g);
232+
testutil_random_ge_test(&g);
233233
secp256k1_pubkey_save(&pubkey, &g);
234234
secp256k1_testrand256(rnd32);
235235
/* Convert the public key to ElligatorSwift and back. */
@@ -250,7 +250,7 @@ void run_ellswift_tests(void) {
250250
int ret;
251251
/* Generate random secret key and random randomizer. */
252252
if (i & 1) secp256k1_testrand256_test(auxrnd32);
253-
random_scalar_order_test(&sec);
253+
testutil_random_scalar_order_test(&sec);
254254
secp256k1_scalar_get_b32(sec32, &sec);
255255
/* Construct ElligatorSwift-encoded public keys for that key. */
256256
ret = secp256k1_ellswift_create(CTX, ell64, sec32, (i & 1) ? auxrnd32 : NULL);
@@ -271,7 +271,7 @@ void run_ellswift_tests(void) {
271271
secp256k1_pubkey pub;
272272
int ret;
273273
/* Generate random secret key. */
274-
random_scalar_order_test(&sec);
274+
testutil_random_scalar_order_test(&sec);
275275
secp256k1_scalar_get_b32(sec32, &sec);
276276
/* Generate random ElligatorSwift encoding for the remote key and decode it. */
277277
secp256k1_testrand256_test(ell64);
@@ -321,10 +321,10 @@ void run_ellswift_tests(void) {
321321
/* Generate random secret keys and random randomizers. */
322322
secp256k1_testrand256_test(auxrnd32a);
323323
secp256k1_testrand256_test(auxrnd32b);
324-
random_scalar_order_test(&seca);
324+
testutil_random_scalar_order_test(&seca);
325325
/* Draw secb uniformly at random to make sure that the secret keys
326326
* differ */
327-
random_scalar_order(&secb);
327+
testutil_random_scalar_order(&secb);
328328
secp256k1_scalar_get_b32(sec32a, &seca);
329329
secp256k1_scalar_get_b32(sec32b, &secb);
330330

src/modules/recovery/tests_impl.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ static void test_ecdsa_recovery_end_to_end(void) {
106106
/* Generate a random key and message. */
107107
{
108108
secp256k1_scalar msg, key;
109-
random_scalar_order_test(&msg);
110-
random_scalar_order_test(&key);
109+
testutil_random_scalar_order_test(&msg);
110+
testutil_random_scalar_order_test(&key);
111111
secp256k1_scalar_get_b32(privkey, &key);
112112
secp256k1_scalar_get_b32(message, &msg);
113113
}

0 commit comments

Comments
 (0)