more test speed-ups

Author: tomato42

cosmic-ray.toml

@@ -2,7 +2,7 @@
 module-path = "src"
 python-version = ""
 timeout = 30.0
-exclude-modules = ['src/ecdsa/_version.py', 'src/ecdsa/test*']
+exclude-modules = ['src/ecdsa/_version.py', 'src/ecdsa/test*', 'src/ecdsa/_rwlock.py']
 test-command = "pytest -x --fast -m 'not slow' src/"
 
 [cosmic-ray.execution-engine]

src/ecdsa/test_ecdsa.py

@@ -515,7 +515,10 @@ def st_random_gen_key_msg_nonce(draw):
 
 
 SIG_VER_SETTINGS = dict(HYP_SETTINGS)
-SIG_VER_SETTINGS["max_examples"] = 10
+if "--fast" in sys.argv:
+    SIG_VER_SETTINGS["max_examples"] = 1
+else:
+    SIG_VER_SETTINGS["max_examples"] = 10
 
 
 @settings(**SIG_VER_SETTINGS)

src/ecdsa/test_ellipticcurve.py

@@ -41,7 +41,7 @@
 
 
 HYP_SLOW_SETTINGS = dict(HYP_SETTINGS)
-HYP_SLOW_SETTINGS["max_examples"] = 10
+HYP_SLOW_SETTINGS["max_examples"] = 2
 
 
 @settings(**HYP_SLOW_SETTINGS)

src/ecdsa/test_jacobi.py

@@ -1,4 +1,5 @@
 import pickle
+import sys
 
 try:
     import unittest2 as unittest
@@ -19,6 +20,13 @@
 from .numbertheory import inverse_mod
 
 
+SLOW_SETTINGS = {}
+if "--fast" in sys.argv:
+    SLOW_SETTINGS["max_examples"] = 2
+else:
+    SLOW_SETTINGS["max_examples"] = 10
+
+
 class TestJacobi(unittest.TestCase):
     def test___init__(self):
         curve = object()
@@ -186,7 +194,7 @@ def test_compare_double_with_multiply(self):
 
         self.assertEqual(dbl, mlpl)
 
-    @settings(max_examples=10)
+    @settings(**SLOW_SETTINGS)
     @given(
         st.integers(
             min_value=0, max_value=int(generator_brainpoolp160r1.order())
@@ -201,7 +209,7 @@ def test_multiplications(self, mul):
         self.assertEqual((pj.x(), pj.y()), (pw.x(), pw.y()))
         self.assertEqual(pj, pw)
 
-    @settings(max_examples=10)
+    @settings(**SLOW_SETTINGS)
     @given(
         st.integers(
             min_value=0, max_value=int(generator_brainpoolp160r1.order())
@@ -218,7 +226,7 @@ def test_precompute(self, mul):
 
         self.assertEqual(a, b)
 
-    @settings(max_examples=10)
+    @settings(**SLOW_SETTINGS)
     @given(
         st.integers(
             min_value=1, max_value=int(generator_brainpoolp160r1.order())
@@ -237,7 +245,7 @@ def test_add_scaled_points(self, a_mul, b_mul):
 
         self.assertEqual(c, j_g * (a_mul + b_mul))
 
-    @settings(max_examples=10)
+    @settings(**SLOW_SETTINGS)
     @given(
         st.integers(
             min_value=1, max_value=int(generator_brainpoolp160r1.order())
@@ -269,7 +277,8 @@ def test_add_one_scaled_point(self, a_mul, b_mul, new_z):
 
         self.assertEqual(c, j_g * (a_mul + b_mul))
 
-    @settings(max_examples=10)
+    @pytest.mark.slow
+    @settings(**SLOW_SETTINGS)
     @given(
         st.integers(
             min_value=1, max_value=int(generator_brainpoolp160r1.order())
@@ -311,7 +320,31 @@ def test_add_same_scale_points(self, a_mul, b_mul, new_z):
 
         self.assertEqual(c, j_g * (a_mul + b_mul))
 
-    @settings(max_examples=10)
+    def test_add_same_scale_points_static(self):
+        j_g = generator_brainpoolp160r1
+        p = curve_brainpoolp160r1.p()
+        a = j_g * 11
+        a.scale()
+        z1 = 13
+        x = PointJacobi(
+            curve_brainpoolp160r1,
+            a.x() * z1 ** 2 % p,
+            a.y() * z1 ** 3 % p,
+            z1,
+        )
+        y = PointJacobi(
+            curve_brainpoolp160r1,
+            a.x() * z1 ** 2 % p,
+            a.y() * z1 ** 3 % p,
+            z1,
+        )
+
+        c = a + a
+
+        self.assertEqual(c, x + y)
+
+    @pytest.mark.slow
+    @settings(**SLOW_SETTINGS)
     @given(
         st.integers(
             min_value=1, max_value=int(generator_brainpoolp160r1.order())
@@ -362,6 +395,30 @@ def test_add_different_scale_points(self, a_mul, b_mul, new_z):
 
         self.assertEqual(c, j_g * (a_mul + b_mul))
 
+    def test_add_different_scale_points_static(self):
+        j_g = generator_brainpoolp160r1
+        p = curve_brainpoolp160r1.p()
+        a = j_g * 11
+        a.scale()
+        z1 = 13
+        x = PointJacobi(
+            curve_brainpoolp160r1,
+            a.x() * z1 ** 2 % p,
+            a.y() * z1 ** 3 % p,
+            z1,
+        )
+        z2 = 29
+        y = PointJacobi(
+            curve_brainpoolp160r1,
+            a.x() * z2 ** 2 % p,
+            a.y() * z2 ** 3 % p,
+            z2,
+        )
+
+        c = a + a
+
+        self.assertEqual(c, x + y)
+
     def test_add_point_3_times(self):
         j_g = PointJacobi.from_affine(generator_256)
 

src/ecdsa/test_malformed_sigs.py

@@ -150,7 +150,7 @@ def st_fuzzed_sig(draw, keys_and_sigs):
 
 slow_params = dict(params)
 if "--fast" in sys.argv:
-    slow_params["max_examples"] = 2
+    slow_params["max_examples"] = 1
 else:
     slow_params["max_examples"] = 10
 
@@ -311,7 +311,7 @@ def test_random_der_as_signature(params, der):
         verifying_key.verify(der, example_data, sigdecode=sigdecode_der)
 
 
-@settings(**params)
+@settings(**slow_params)
 @given(st.sampled_from(keys_and_sigs), st.binary(max_size=1024 ** 2))
 @example(
     keys_and_sigs[0], encode_sequence(encode_integer(0), encode_integer(0))

src/ecdsa/test_numbertheory.py

@@ -68,6 +68,7 @@ def test_next_prime_with_nums_less_2(val):
     assert next_prime(val) == 2
 
 
+@pytest.mark.slow
 @pytest.mark.parametrize("prime", smallprimes)
 def test_square_root_mod_prime_for_small_primes(prime):
     squares = set()
@@ -85,6 +86,32 @@ def test_square_root_mod_prime_for_small_primes(prime):
             square_root_mod_prime(nonsquare, prime)
 
 
+def test_square_root_mod_prime_for_2():
+    a = square_root_mod_prime(1, 2)
+    assert a == 1
+
+
+def test_square_root_mod_prime_for_small_prime():
+    root = square_root_mod_prime(98 ** 2 % 101, 101)
+    assert root * root % 101 == 9
+
+
+def test_square_root_mod_prime_for_p_congruent_5():
+    p = 13
+    assert p % 8 == 5
+
+    root = square_root_mod_prime(3, p)
+    assert root * root % p == 3
+
+
+def test_square_root_mod_prime_for_p_congruent_5_large_d():
+    p = 29
+    assert p % 8 == 5
+
+    root = square_root_mod_prime(4, p)
+    assert root * root % p == 4
+
+
 @st.composite
 def st_two_nums_rel_prime(draw):
     # 521-bit is the biggest curve we operate on, use 1024 for a bit
@@ -209,7 +236,7 @@ def st_comp_no_com_fac(draw):
 
 HYP_SLOW_SETTINGS = dict(HYP_SETTINGS)
 if "--fast" in sys.argv:
-    HYP_SLOW_SETTINGS["max_examples"] = 2
+    HYP_SLOW_SETTINGS["max_examples"] = 1
 else:
     HYP_SLOW_SETTINGS["max_examples"] = 20
 
@@ -292,7 +319,8 @@ def test_square_root_mod_prime(self, vals):
         calc = square_root_mod_prime(square, prime)
         assert calc * calc % prime == square
 
-    @settings(**HYP_SETTINGS)
+    @pytest.mark.slow
+    @settings(**HYP_SLOW_SETTINGS)
     @given(st.integers(min_value=1, max_value=10 ** 12))
     @example(265399 * 1526929)
     @example(373297 ** 2 * 553991)
@@ -303,7 +331,33 @@ def test_factorization(self, num):
             mult *= i[0] ** i[1]
         assert mult == num
 
-    @settings(**HYP_SETTINGS)
+    def test_factorisation_smallprimes(self):
+        exp = 101 * 103
+        assert 101 in smallprimes
+        assert 103 in smallprimes
+        factors = factorization(exp)
+        mult = 1
+        for i in factors:
+            mult *= i[0] ** i[1]
+        assert mult == exp
+
+    def test_factorisation_not_smallprimes(self):
+        exp = 1231 * 1237
+        assert 1231 not in smallprimes
+        assert 1237 not in smallprimes
+        factors = factorization(exp)
+        mult = 1
+        for i in factors:
+            mult *= i[0] ** i[1]
+        assert mult == exp
+
+    def test_jacobi_with_zero(self):
+        assert jacobi(0, 3) == 0
+
+    def test_jacobi_with_one(self):
+        assert jacobi(1, 3) == 1
+
+    @settings(**HYP_SLOW_SETTINGS)
     @given(st.integers(min_value=3, max_value=1000).filter(lambda x: x % 2))
     def test_jacobi(self, mod):
         if is_prime(mod):
@@ -322,7 +376,7 @@ def test_jacobi(self, mod):
                     c *= jacobi(a, i[0]) ** i[1]
                 assert c == jacobi(a, mod)
 
-    @settings(**HYP_SETTINGS)
+    @settings(**HYP_SLOW_SETTINGS)
     @given(st_two_nums_rel_prime())
     def test_inverse_mod(self, nums):
         num, mod = nums