From 0fef8479be9d4a7fb878aac6ee4412a0c3b92296 Mon Sep 17 00:00:00 2001
From: Sebastian Falbesoner <sebastian.falbesoner@gmail.com>
Date: Mon, 27 May 2024 02:22:45 +0200
Subject: [PATCH] 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.
---
 src/tests.c | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/tests.c b/src/tests.c
index 4a1c6c51..5fb2a285 100644
--- a/src/tests.c
+++ b/src/tests.c
@@ -96,7 +96,7 @@ static void uncounting_illegal_callback_fn(const char* str, void* data) {
     (*p)--;
 }
 
-static void random_field_element_magnitude(secp256k1_fe *fe, int m) {
+static void random_fe_magnitude(secp256k1_fe *fe, int m) {
     secp256k1_fe zero;
     int n = secp256k1_testrand_int(m + 1);
     secp256k1_fe_normalize(fe);
@@ -128,28 +128,24 @@ static void random_fe_non_zero_test(secp256k1_fe *fe) {
     } while(secp256k1_fe_is_zero(fe));
 }
 
-static void random_fe_magnitude(secp256k1_fe *fe) {
-    random_field_element_magnitude(fe, 8);
-}
-
 static void random_ge_x_magnitude(secp256k1_ge *ge) {
-    random_field_element_magnitude(&ge->x, SECP256K1_GE_X_MAGNITUDE_MAX);
+    random_fe_magnitude(&ge->x, SECP256K1_GE_X_MAGNITUDE_MAX);
 }
 
 static void random_ge_y_magnitude(secp256k1_ge *ge) {
-    random_field_element_magnitude(&ge->y, SECP256K1_GE_Y_MAGNITUDE_MAX);
+    random_fe_magnitude(&ge->y, SECP256K1_GE_Y_MAGNITUDE_MAX);
 }
 
 static void random_gej_x_magnitude(secp256k1_gej *gej) {
-    random_field_element_magnitude(&gej->x, SECP256K1_GEJ_X_MAGNITUDE_MAX);
+    random_fe_magnitude(&gej->x, SECP256K1_GEJ_X_MAGNITUDE_MAX);
 }
 
 static void random_gej_y_magnitude(secp256k1_gej *gej) {
-    random_field_element_magnitude(&gej->y, SECP256K1_GEJ_Y_MAGNITUDE_MAX);
+    random_fe_magnitude(&gej->y, SECP256K1_GEJ_Y_MAGNITUDE_MAX);
 }
 
 static void random_gej_z_magnitude(secp256k1_gej *gej) {
-    random_field_element_magnitude(&gej->z, SECP256K1_GEJ_Z_MAGNITUDE_MAX);
+    random_fe_magnitude(&gej->z, SECP256K1_GEJ_Z_MAGNITUDE_MAX);
 }
 
 static void random_ge_test(secp256k1_ge *ge) {
@@ -3269,13 +3265,13 @@ static void run_fe_mul(void) {
     for (i = 0; i < 100 * COUNT; ++i) {
         secp256k1_fe a, b, c, d;
         random_fe(&a);
-        random_fe_magnitude(&a);
+        random_fe_magnitude(&a, 8);
         random_fe(&b);
-        random_fe_magnitude(&b);
+        random_fe_magnitude(&b, 8);
         random_fe_test(&c);
-        random_fe_magnitude(&c);
+        random_fe_magnitude(&c, 8);
         random_fe_test(&d);
-        random_fe_magnitude(&d);
+        random_fe_magnitude(&d, 8);
         test_fe_mul(&a, &a, 1);
         test_fe_mul(&c, &c, 1);
         test_fe_mul(&a, &b, 0);
@@ -3829,7 +3825,7 @@ static void test_ge(void) {
 
     /* Generate random zf, and zfi2 = 1/zf^2, zfi3 = 1/zf^3 */
     random_fe_non_zero_test(&zf);
-    random_fe_magnitude(&zf);
+    random_fe_magnitude(&zf, 8);
     secp256k1_fe_inv_var(&zfi3, &zf);
     secp256k1_fe_sqr(&zfi2, &zfi3);
     secp256k1_fe_mul(&zfi3, &zfi3, &zfi2);