Introduce explicit field argument to formula calls.

2 files changed, 8 insertions, 8 deletions

diff --git a/test/ec/test_formula.py b/test/ec/test_formula.py
index 779b140..a7ef691 100644
--- a/test/ec/test_formula.py
+++ b/test/ec/test_formula.py
@@ -18,9 +18,9 @@ class FormulaTests(TestCase):
 
     def test_wrong_call(self):
         with self.assertRaises(ValueError):
-            self.add()
+            self.add(self.secp128r1.curve.prime)
         with self.assertRaises(ValueError):
-            self.add(self.secp128r1.generator.to_affine(), self.secp128r1.generator.to_affine())
+            self.add(self.secp128r1.curve.prime, self.secp128r1.generator.to_affine(), self.secp128r1.generator.to_affine())
 
     def test_indices(self):
         self.assertEqual(self.add.input_index, 1)
@@ -44,18 +44,18 @@ class FormulaTests(TestCase):
         self.assertEqual(self.add.num_addsubs, 10)
 
     def test_assumptions(self):
-        res = self.mdbl(self.secp128r1.generator, **self.secp128r1.curve.parameters)
+        res = self.mdbl(self.secp128r1.curve.prime, self.secp128r1.generator, **self.secp128r1.curve.parameters)
         self.assertIsNotNone(res)
 
         coords = {name: value * 5 for name, value in self.secp128r1.generator.coords.items()}
         other = Point(self.secp128r1.generator.coordinate_model, **coords)
         with self.assertRaises(UnsatisfiedAssumptionError):
-            self.mdbl(other, **self.secp128r1.curve.parameters)
+            self.mdbl(self.secp128r1.curve.prime, other, **self.secp128r1.curve.parameters)
         with TemporaryConfig() as cfg:
             cfg.ec.unsatisfied_formula_assumption_action = "ignore"
-            pt = self.mdbl(other, **self.secp128r1.curve.parameters)
+            pt = self.mdbl(self.secp128r1.curve.prime, other, **self.secp128r1.curve.parameters)
             self.assertIsNotNone(pt)
 
     def test_parameters(self):
-        res = self.jac_dbl(self.jac_secp128r1.generator, **self.jac_secp128r1.curve.parameters)
+        res = self.jac_dbl(self.secp128r1.curve.prime, self.jac_secp128r1.generator, **self.jac_secp128r1.curve.parameters)
         self.assertIsNotNone(res)
diff --git a/test/ec/test_regress.py b/test/ec/test_regress.py
index fe14eb3..ef593fc 100644
--- a/test/ec/test_regress.py
+++ b/test/ec/test_regress.py
@@ -47,12 +47,12 @@ class RegressionTests(TestCase):
         curve = EllipticCurve(model, coords, p, neutral, {"a": Mod(8, p), "b": Mod(1, p)})
         base = Point(coords, X=Mod(12, p), Z=Mod(1, p))
         formula = coords.formulas["dbl-1987-m-2"]
-        res = formula(base, **curve.parameters)[0]
+        res = formula(p, base, **curve.parameters)[0]
         self.assertIsNotNone(res)
         affine_base = Point(AffineCoordinateModel(model), x=Mod(12, p), y=Mod(2, p))
         dbase = curve.affine_double(affine_base).to_model(coords, curve)
         ladder = coords.formulas["ladd-1987-m-3"]
-        one, other = ladder(base, dbase, base, **curve.parameters)
+        one, other = ladder(p, base, dbase, base, **curve.parameters)
         self.assertIsNotNone(one)
         self.assertIsNotNone(other)