From 2220302c602f4ee8af740e0ffbaa8b0db1358b74 Mon Sep 17 00:00:00 2001 From: Mamy Ratsimbazafy Date: Wed, 31 Jul 2024 14:29:41 +0200 Subject: [PATCH 1/2] workaround #448: deactivated secp256k1 tests due to bug on Windows with assembly --- constantine.nimble | 2 +- .../t_ec_shortw_jac_g1_add_double.nim | 10 +++++----- .../t_ec_shortw_jac_g1_mixed_add.nim | 10 +++++----- .../t_ec_shortw_jac_g1_mul_sanity.nim | 10 +++++----- .../t_ec_shortw_jac_g1_mul_vs_ref.nim | 10 +++++----- .../t_ec_shortw_jacext_g1_add_double.nim | 10 +++++----- .../t_ec_shortw_jacext_g1_mixed_add.nim | 10 +++++----- .../t_ec_shortw_prj_g1_add_double.nim | 10 +++++----- .../t_ec_shortw_prj_g1_mixed_add.nim | 10 +++++----- .../t_ec_shortw_prj_g1_mul_distri.nim | 10 +++++----- .../t_ec_shortw_prj_g1_mul_sanity.nim | 10 +++++----- .../t_ec_shortw_prj_g1_mul_vs_ref.nim | 10 +++++----- 12 files changed, 56 insertions(+), 56 deletions(-) diff --git a/constantine.nimble b/constantine.nimble index faecfc4a..313f3f29 100644 --- a/constantine.nimble +++ b/constantine.nimble @@ -529,7 +529,7 @@ const testDesc: seq[tuple[path: string, useGMP: bool]] = @[ ("tests/math_elliptic_curves/t_ec_sage_bls12_381.nim", false), ("tests/math_elliptic_curves/t_ec_sage_pallas.nim", false), ("tests/math_elliptic_curves/t_ec_sage_vesta.nim", false), - ("tests/math_elliptic_curves/t_ec_sage_secp256k1.nim", false), + # ("tests/math_elliptic_curves/t_ec_sage_secp256k1.nim", false), # Edge cases highlighted by past bugs # ---------------------------------------------------------- diff --git a/tests/math_elliptic_curves/t_ec_shortw_jac_g1_add_double.nim b/tests/math_elliptic_curves/t_ec_shortw_jac_g1_add_double.nim index e2cb8754..0ac6c7ea 100644 --- a/tests/math_elliptic_curves/t_ec_shortw_jac_g1_add_double.nim +++ b/tests/math_elliptic_curves/t_ec_shortw_jac_g1_add_double.nim @@ -64,11 +64,11 @@ run_EC_addition_vartime_tests( moduleName = "test_ec_shortweierstrass_jacobian_g1_add_double_vartime_" & $BN254_Snarks ) -run_EC_addition_vartime_tests( - ec = EC_ShortW_Jac[Fp[Secp256k1], G1], - Iters = Iters, - moduleName = "test_ec_shortweierstrass_jacobian_g1_add_double_vartime_" & $Secp256k1 - ) +# run_EC_addition_vartime_tests( +# ec = EC_ShortW_Jac[Fp[Secp256k1], G1], +# Iters = Iters, +# moduleName = "test_ec_shortweierstrass_jacobian_g1_add_double_vartime_" & $Secp256k1 +# ) run_EC_addition_vartime_tests( ec = EC_ShortW_Jac[Fp[BLS12_381], G1], diff --git a/tests/math_elliptic_curves/t_ec_shortw_jac_g1_mixed_add.nim b/tests/math_elliptic_curves/t_ec_shortw_jac_g1_mixed_add.nim index f96911db..e3552d4d 100644 --- a/tests/math_elliptic_curves/t_ec_shortw_jac_g1_mixed_add.nim +++ b/tests/math_elliptic_curves/t_ec_shortw_jac_g1_mixed_add.nim @@ -23,11 +23,11 @@ run_EC_mixed_add_impl( moduleName = "test_ec_shortweierstrass_jacobian_mixed_add_" & $BN254_Snarks ) -run_EC_mixed_add_impl( - ec = EC_ShortW_Jac[Fp[Secp256k1], G1], - Iters = Iters, - moduleName = "test_ec_shortweierstrass_jacobian_mixed_add_" & $Secp256k1 - ) +# run_EC_mixed_add_impl( +# ec = EC_ShortW_Jac[Fp[Secp256k1], G1], +# Iters = Iters, +# moduleName = "test_ec_shortweierstrass_jacobian_mixed_add_" & $Secp256k1 +# ) run_EC_mixed_add_impl( ec = EC_ShortW_Jac[Fp[BLS12_381], G1], diff --git a/tests/math_elliptic_curves/t_ec_shortw_jac_g1_mul_sanity.nim b/tests/math_elliptic_curves/t_ec_shortw_jac_g1_mul_sanity.nim index 5b14e839..c29a37d7 100644 --- a/tests/math_elliptic_curves/t_ec_shortw_jac_g1_mul_sanity.nim +++ b/tests/math_elliptic_curves/t_ec_shortw_jac_g1_mul_sanity.nim @@ -68,11 +68,11 @@ suite "Order checks on BN254_Snarks": bool not ay.isSquare() bool not ay.sqrt_if_square() -run_EC_mul_sanity_tests( - ec = EC_ShortW_Jac[Fp[Secp256k1], G1], - ItersMul = ItersMul, - moduleName = "test_ec_shortweierstrass_jacobian_g1_mul_sanity_" & $Secp256k1 - ) +# run_EC_mul_sanity_tests( +# ec = EC_ShortW_Jac[Fp[Secp256k1], G1], +# ItersMul = ItersMul, +# moduleName = "test_ec_shortweierstrass_jacobian_g1_mul_sanity_" & $Secp256k1 +# ) run_EC_mul_sanity_tests( ec = EC_ShortW_Jac[Fp[BLS12_381], G1], diff --git a/tests/math_elliptic_curves/t_ec_shortw_jac_g1_mul_vs_ref.nim b/tests/math_elliptic_curves/t_ec_shortw_jac_g1_mul_vs_ref.nim index 7a72e238..e8cc4319 100644 --- a/tests/math_elliptic_curves/t_ec_shortw_jac_g1_mul_vs_ref.nim +++ b/tests/math_elliptic_curves/t_ec_shortw_jac_g1_mul_vs_ref.nim @@ -23,11 +23,11 @@ run_EC_mul_vs_ref_impl( moduleName = "test_ec_shortweierstrass_jacobian_g1_mul_vs_ref_" & $BN254_Snarks ) -run_EC_mul_vs_ref_impl( - ec = EC_ShortW_Jac[Fp[Secp256k1], G1], - ItersMul = ItersMul, - moduleName = "test_ec_shortweierstrass_jacobian_g1_mul_vs_ref_" & $Secp256k1 - ) +# run_EC_mul_vs_ref_impl( +# ec = EC_ShortW_Jac[Fp[Secp256k1], G1], +# ItersMul = ItersMul, +# moduleName = "test_ec_shortweierstrass_jacobian_g1_mul_vs_ref_" & $Secp256k1 +# ) run_EC_mul_vs_ref_impl( ec = EC_ShortW_Jac[Fp[BLS12_381], G1], diff --git a/tests/math_elliptic_curves/t_ec_shortw_jacext_g1_add_double.nim b/tests/math_elliptic_curves/t_ec_shortw_jacext_g1_add_double.nim index 9f7fb2a6..81fbd71a 100644 --- a/tests/math_elliptic_curves/t_ec_shortw_jacext_g1_add_double.nim +++ b/tests/math_elliptic_curves/t_ec_shortw_jacext_g1_add_double.nim @@ -22,11 +22,11 @@ run_EC_addition_tests( moduleName = "test_ec_shortweierstrass_jacobian_extended_g1_add_double_" & $BN254_Snarks ) -run_EC_addition_tests( - ec = EC_ShortW_JacExt[Fp[Secp256k1], G1], - Iters = Iters, - moduleName = "test_ec_shortweierstrass_jacobian_extended_g1_add_double_" & $Secp256k1 - ) +# run_EC_addition_tests( +# ec = EC_ShortW_JacExt[Fp[Secp256k1], G1], +# Iters = Iters, +# moduleName = "test_ec_shortweierstrass_jacobian_extended_g1_add_double_" & $Secp256k1 +# ) run_EC_addition_tests( ec = EC_ShortW_JacExt[Fp[BLS12_381], G1], diff --git a/tests/math_elliptic_curves/t_ec_shortw_jacext_g1_mixed_add.nim b/tests/math_elliptic_curves/t_ec_shortw_jacext_g1_mixed_add.nim index 0fc91a07..97618efb 100644 --- a/tests/math_elliptic_curves/t_ec_shortw_jacext_g1_mixed_add.nim +++ b/tests/math_elliptic_curves/t_ec_shortw_jacext_g1_mixed_add.nim @@ -23,11 +23,11 @@ run_EC_mixed_add_impl( moduleName = "test_ec_shortweierstrass_jacobian_extendedmixed_add_" & $BN254_Snarks ) -run_EC_mixed_add_impl( - ec = EC_ShortW_JacExt[Fp[Secp256k1], G1], - Iters = Iters, - moduleName = "test_ec_shortweierstrass_jacobian_extendedmixed_add_" & $Secp256k1 - ) +# run_EC_mixed_add_impl( +# ec = EC_ShortW_JacExt[Fp[Secp256k1], G1], +# Iters = Iters, +# moduleName = "test_ec_shortweierstrass_jacobian_extendedmixed_add_" & $Secp256k1 +# ) run_EC_mixed_add_impl( ec = EC_ShortW_JacExt[Fp[BLS12_381], G1], diff --git a/tests/math_elliptic_curves/t_ec_shortw_prj_g1_add_double.nim b/tests/math_elliptic_curves/t_ec_shortw_prj_g1_add_double.nim index fa8d960d..6d43f28f 100644 --- a/tests/math_elliptic_curves/t_ec_shortw_prj_g1_add_double.nim +++ b/tests/math_elliptic_curves/t_ec_shortw_prj_g1_add_double.nim @@ -22,11 +22,11 @@ run_EC_addition_tests( moduleName = "test_ec_shortweierstrass_projective_g1_add_double_" & $BN254_Snarks ) -run_EC_addition_tests( - ec = EC_ShortW_Prj[Fp[Secp256k1], G1], - Iters = Iters, - moduleName = "test_ec_shortweierstrass_projective_g1_add_double_" & $Secp256k1 - ) +# run_EC_addition_tests( +# ec = EC_ShortW_Prj[Fp[Secp256k1], G1], +# Iters = Iters, +# moduleName = "test_ec_shortweierstrass_projective_g1_add_double_" & $Secp256k1 +# ) run_EC_addition_tests( ec = EC_ShortW_Prj[Fp[BLS12_381], G1], diff --git a/tests/math_elliptic_curves/t_ec_shortw_prj_g1_mixed_add.nim b/tests/math_elliptic_curves/t_ec_shortw_prj_g1_mixed_add.nim index 09d3df58..eb6922cb 100644 --- a/tests/math_elliptic_curves/t_ec_shortw_prj_g1_mixed_add.nim +++ b/tests/math_elliptic_curves/t_ec_shortw_prj_g1_mixed_add.nim @@ -23,11 +23,11 @@ run_EC_mixed_add_impl( moduleName = "test_ec_shortweierstrass_projective_mixed_add_" & $BN254_Snarks ) -run_EC_mixed_add_impl( - ec = EC_ShortW_Prj[Fp[Secp256k1], G1], - Iters = Iters, - moduleName = "test_ec_shortweierstrass_projective_mixed_add_" & $Secp256k1 - ) +# run_EC_mixed_add_impl( +# ec = EC_ShortW_Prj[Fp[Secp256k1], G1], +# Iters = Iters, +# moduleName = "test_ec_shortweierstrass_projective_mixed_add_" & $Secp256k1 +# ) run_EC_mixed_add_impl( ec = EC_ShortW_Prj[Fp[BLS12_381], G1], diff --git a/tests/math_elliptic_curves/t_ec_shortw_prj_g1_mul_distri.nim b/tests/math_elliptic_curves/t_ec_shortw_prj_g1_mul_distri.nim index 6a5143c9..d64c364f 100644 --- a/tests/math_elliptic_curves/t_ec_shortw_prj_g1_mul_distri.nim +++ b/tests/math_elliptic_curves/t_ec_shortw_prj_g1_mul_distri.nim @@ -23,11 +23,11 @@ run_EC_mul_distributive_tests( moduleName = "test_ec_shortweierstrass_projective_g1_mul_distributive_" & $BN254_Snarks ) -run_EC_mul_distributive_tests( - ec = EC_ShortW_Prj[Fp[Secp256k1], G1], - ItersMul = ItersMul, - moduleName = "test_ec_shortweierstrass_projective_g1_mul_distributive_" & $Secp256k1 - ) +# run_EC_mul_distributive_tests( +# ec = EC_ShortW_Prj[Fp[Secp256k1], G1], +# ItersMul = ItersMul, +# moduleName = "test_ec_shortweierstrass_projective_g1_mul_distributive_" & $Secp256k1 +# ) run_EC_mul_distributive_tests( ec = EC_ShortW_Prj[Fp[BLS12_381], G1], diff --git a/tests/math_elliptic_curves/t_ec_shortw_prj_g1_mul_sanity.nim b/tests/math_elliptic_curves/t_ec_shortw_prj_g1_mul_sanity.nim index d778fa03..a3693847 100644 --- a/tests/math_elliptic_curves/t_ec_shortw_prj_g1_mul_sanity.nim +++ b/tests/math_elliptic_curves/t_ec_shortw_prj_g1_mul_sanity.nim @@ -67,11 +67,11 @@ suite "Order checks on BN254_Snarks": bool not ay.isSquare() bool not ay.sqrt_if_square() -run_EC_mul_sanity_tests( - ec = EC_ShortW_Prj[Fp[Secp256k1], G1], - ItersMul = ItersMul, - moduleName = "test_ec_shortweierstrass_projective_g1_mul_sanity_" & $Secp256k1 - ) +# run_EC_mul_sanity_tests( +# ec = EC_ShortW_Prj[Fp[Secp256k1], G1], +# ItersMul = ItersMul, +# moduleName = "test_ec_shortweierstrass_projective_g1_mul_sanity_" & $Secp256k1 +# ) run_EC_mul_sanity_tests( ec = EC_ShortW_Prj[Fp[BLS12_381], G1], diff --git a/tests/math_elliptic_curves/t_ec_shortw_prj_g1_mul_vs_ref.nim b/tests/math_elliptic_curves/t_ec_shortw_prj_g1_mul_vs_ref.nim index d8d7ec45..c16c02d1 100644 --- a/tests/math_elliptic_curves/t_ec_shortw_prj_g1_mul_vs_ref.nim +++ b/tests/math_elliptic_curves/t_ec_shortw_prj_g1_mul_vs_ref.nim @@ -23,11 +23,11 @@ run_EC_mul_vs_ref_impl( moduleName = "test_ec_shortweierstrass_projective_g1_mul_vs_ref_" & $BN254_Snarks ) -run_EC_mul_vs_ref_impl( - ec = EC_ShortW_Prj[Fp[Secp256k1], G1], - ItersMul = ItersMul, - moduleName = "test_ec_shortweierstrass_projective_g1_mul_vs_ref_" & $BN254_Snarks - ) +# run_EC_mul_vs_ref_impl( +# ec = EC_ShortW_Prj[Fp[Secp256k1], G1], +# ItersMul = ItersMul, +# moduleName = "test_ec_shortweierstrass_projective_g1_mul_vs_ref_" & $BN254_Snarks +# ) run_EC_mul_vs_ref_impl( ec = EC_ShortW_Prj[Fp[BLS12_381], G1], From a55345ab6d9dc27749256eb4d9eb7c51ff6b370c Mon Sep 17 00:00:00 2001 From: Mamy Ratsimbazafy Date: Wed, 31 Jul 2024 15:20:57 +0200 Subject: [PATCH 2/2] workaround #448: missed one --- .../t_ec_shortw_jac_g1_add_double.nim | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/math_elliptic_curves/t_ec_shortw_jac_g1_add_double.nim b/tests/math_elliptic_curves/t_ec_shortw_jac_g1_add_double.nim index 0ac6c7ea..bca1c0c2 100644 --- a/tests/math_elliptic_curves/t_ec_shortw_jac_g1_add_double.nim +++ b/tests/math_elliptic_curves/t_ec_shortw_jac_g1_add_double.nim @@ -22,11 +22,11 @@ run_EC_addition_tests( moduleName = "test_ec_shortweierstrass_jacobian_g1_add_double_" & $BN254_Snarks ) -run_EC_addition_tests( - ec = EC_ShortW_Jac[Fp[Secp256k1], G1], - Iters = Iters, - moduleName = "test_ec_shortweierstrass_jacobian_g1_add_double_" & $Secp256k1 - ) +# run_EC_addition_tests( +# ec = EC_ShortW_Jac[Fp[Secp256k1], G1], +# Iters = Iters, +# moduleName = "test_ec_shortweierstrass_jacobian_g1_add_double_" & $Secp256k1 +# ) run_EC_addition_tests( ec = EC_ShortW_Jac[Fp[BLS12_381], G1],