1 files changed, 22 insertions, 16 deletions

diff --git a/test/sca/test_epa.py b/test/sca/test_epa.py
index 0362e4e..4bb27f0 100644
--- a/test/sca/test_epa.py
+++ b/test/sca/test_epa.py
@@ -1,15 +1,20 @@
 from functools import partial
 
 from pyecsca.ec.mult import LTRMultiplier, CombMultiplier
+from pyecsca.sca import multiple_graph
 from pyecsca.sca.re.epa import errors_out
 
 
 def test_errors_out(secp128r1):
-    res_empty_checks = errors_out(
+    ctx, out = multiple_graph(
         scalar=15,
         params=secp128r1,
         mult_class=LTRMultiplier,
         mult_factory=LTRMultiplier,
+    )
+    res_empty_checks = errors_out(
+        ctx,
+        out,
         check_funcs={},
         check_condition="all",
         precomp_to_affine=True,
@@ -20,10 +25,8 @@ def test_errors_out(secp128r1):
         return k == 6
 
     res_check_k_add = errors_out(
-        scalar=15,
-        params=secp128r1,
-        mult_class=LTRMultiplier,
-        mult_factory=LTRMultiplier,
+        ctx,
+        out,
         check_funcs={"add": add_check},
         check_condition="all",
         precomp_to_affine=True,
@@ -34,24 +37,29 @@ def test_errors_out(secp128r1):
         return k == 15
 
     res_check_k_affine = errors_out(
-        scalar=15,
-        params=secp128r1,
-        mult_class=LTRMultiplier,
-        mult_factory=LTRMultiplier,
+        ctx,
+        out,
         check_funcs={"affine": affine_check},
         check_condition="all",
         precomp_to_affine=True,
     )
     assert res_check_k_affine
 
-    def affine_check_comb(k):
-        return k == 2**64
 
-    res_check_k_affine_precomp = errors_out(
+def test_errors_out_comb(secp128r1):
+    ctx, out = multiple_graph(
         scalar=15,
         params=secp128r1,
         mult_class=CombMultiplier,
         mult_factory=partial(CombMultiplier, width=2),
+    )
+
+    def affine_check_comb(k):
+        return k == 2**64
+
+    res_check_k_affine_precomp = errors_out(
+        ctx,
+        out,
         check_funcs={"affine": affine_check_comb},
         check_condition="all",
         precomp_to_affine=True,
@@ -59,10 +67,8 @@ def test_errors_out(secp128r1):
     assert res_check_k_affine_precomp
 
     res_check_k_no_affine_precomp = errors_out(
-        scalar=15,
-        params=secp128r1,
-        mult_class=CombMultiplier,
-        mult_factory=partial(CombMultiplier, width=2),
+        ctx,
+        out,
         check_funcs={"affine": affine_check_comb},
         check_condition="all",
         precomp_to_affine=False,