diff options
| author | J08nY | 2017-10-14 13:25:47 +0200 |
|---|---|---|
| committer | J08nY | 2017-10-14 13:25:47 +0200 |
| commit | 80514f24dae8352f39f9a9e49c0d9afbd8edd432 (patch) | |
| tree | 77735babce3681a792bf5e05fea5b672091026fc /test/src/gen/test_point.c | |
| parent | 5a24bec70aa2614e847e866be514341dce10ff19 (diff) | |
| download | ecgen-80514f24dae8352f39f9a9e49c0d9afbd8edd432.tar.gz ecgen-80514f24dae8352f39f9a9e49c0d9afbd8edd432.tar.zst ecgen-80514f24dae8352f39f9a9e49c0d9afbd8edd432.zip | |
Make config_t *cfg a global variable.
The config is setup from parsing CLI options and then doesn't
change for the whole duration of running ecgen, so it makes sense
to make it a global variable.
Diffstat (limited to 'test/src/gen/test_point.c')
| -rw-r--r-- | test/src/gen/test_point.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/test/src/gen/test_point.c b/test/src/gen/test_point.c index d185e9a..86eede1 100644 --- a/test/src/gen/test_point.c +++ b/test/src/gen/test_point.c @@ -13,8 +13,7 @@ Test(point, test_point_random) { // curve = ellinit([1, 3], 23), order = 27 GEN e = ellinit(mkvec2s(1, 3), stoi(23), -1); curve_t curve = {.order = stoi(27), .curve = e}; - config_t cfg = {}; - int ret = point_gen_random(&curve, &cfg, NULL, OFFSET_POINTS); + int ret = point_gen_random(&curve, NULL, OFFSET_POINTS); cr_assert_eq(ret, 1, "Point wasn't generated."); cr_assert_eq(curve.npoints, 1, "Incorrect number of points."); @@ -31,10 +30,9 @@ Test(point, test_points_random) { // curve = ellinit([1, 3], 23), order = 27 GEN e = ellinit(mkvec2s(1, 3), stoi(23), -1); curve_t curve = {.order = stoi(27), .curve = e}; - config_t cfg = {}; size_t npoints = 3; arg_t arg = {.args = &npoints, .nargs = 1}; - int ret = points_gen_random(&curve, &cfg, &arg, OFFSET_POINTS); + int ret = points_gen_random(&curve, &arg, OFFSET_POINTS); cr_assert_eq(ret, 1, "Points weren't generated."); cr_assert_eq(curve.npoints, npoints, "Incorrect number of points."); @@ -59,10 +57,9 @@ Test(point, test_points_trial) { gens[0]->point = mkvec2(mkintmodu(15, 23), mkintmodu(14, 23)); curve_t curve = { .order = stoi(27), .curve = e, .ngens = 1, .generators = gens}; - config_t cfg = {}; pari_ulong prime = 3; arg_t arg = {.args = &prime, .nargs = 1}; - int ret = points_gen_trial(&curve, &cfg, &arg, OFFSET_POINTS); + int ret = points_gen_trial(&curve, &arg, OFFSET_POINTS); cr_assert_eq(ret, 1, "Points weren't generated."); cr_assert_eq(curve.npoints, 1, "Incorrect number of points."); @@ -88,9 +85,8 @@ Test(point, test_points_prime) { gens[0]->point = mkvec2(mkintmodu(15, 23), mkintmodu(14, 23)); curve_t curve = { .order = stoi(27), .curve = e, .ngens = 1, .generators = gens}; - config_t cfg = {}; pari_ulong prime = 3; - int ret = points_gen_prime(&curve, &cfg, NULL, OFFSET_POINTS); + int ret = points_gen_prime(&curve, NULL, OFFSET_POINTS); cr_assert_eq(ret, 1, "Points weren't generated."); cr_assert_eq(curve.npoints, 1, "Incorrect number of points."); @@ -116,10 +112,9 @@ Test(point, test_points_all) { gens[0]->point = mkvec2(mkintmodu(15, 23), mkintmodu(14, 23)); curve_t curve = { .order = stoi(27), .curve = e, .ngens = 1, .generators = gens}; - config_t cfg = {}; GEN orders = mkvec3s(3, 9, 27); size_t npoints = 3; - int ret = points_gen_allgroups(&curve, &cfg, NULL, OFFSET_POINTS); + int ret = points_gen_allgroups(&curve, NULL, OFFSET_POINTS); cr_assert_eq(ret, 1, "Points weren't generated."); cr_assert_eq(curve.npoints, npoints, "Incorrect number of points."); @@ -147,10 +142,9 @@ Test(point, test_points_nonprime) { gens[0]->point = mkvec2(mkintmodu(15, 23), mkintmodu(14, 23)); curve_t curve = { .order = stoi(27), .curve = e, .ngens = 1, .generators = gens}; - config_t cfg = {}; GEN orders = mkvec2s(9, 27); size_t npoints = 2; - int ret = points_gen_nonprime(&curve, &cfg, NULL, OFFSET_POINTS); + int ret = points_gen_nonprime(&curve, NULL, OFFSET_POINTS); cr_assert_eq(ret, 1, "Points weren't generated."); cr_assert_eq(curve.npoints, npoints, "Incorrect number of points."); |