18 files changed, 51 insertions, 50 deletions

diff --git a/test/ec/bench_divpoly.py b/test/ec/bench_divpoly.py
index 0df7d59..0bf7617 100755
--- a/test/ec/bench_divpoly.py
+++ b/test/ec/bench_divpoly.py
@@ -1,11 +1,11 @@
 #!/usr/bin/env python
 import sys
+from datetime import datetime
 
 import click
 
 from pyecsca.ec.divpoly import mult_by_n
 from pyecsca.ec.params import get_params
-from datetime import datetime
 
 
 @click.command()
diff --git a/test/ec/perf_formula.py b/test/ec/perf_formula.py
index 1092ab5..e55ec9c 100755
--- a/test/ec/perf_formula.py
+++ b/test/ec/perf_formula.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 import click
 
-from pyecsca.ec.mod.gmp import has_gmp
 from pyecsca.ec.mod.flint import has_flint
+from pyecsca.ec.mod.gmp import has_gmp
 from pyecsca.ec.params import get_params
 from pyecsca.misc.cfg import TemporaryConfig
 from test.utils import Profiler
diff --git a/test/ec/perf_mod.py b/test/ec/perf_mod.py
index 7783f09..4bd1e1e 100755
--- a/test/ec/perf_mod.py
+++ b/test/ec/perf_mod.py
@@ -2,8 +2,8 @@
 import click
 
 from pyecsca.ec.mod.base import Mod, mod as make_mod
-from pyecsca.ec.mod.gmp import has_gmp
 from pyecsca.ec.mod.flint import has_flint
+from pyecsca.ec.mod.gmp import has_gmp
 from pyecsca.misc.cfg import TemporaryConfig
 from test.utils import Profiler
 
diff --git a/test/ec/perf_mult.py b/test/ec/perf_mult.py
index 402aa26..e26bbe6 100755
--- a/test/ec/perf_mult.py
+++ b/test/ec/perf_mult.py
@@ -5,8 +5,8 @@ import click
 
 from pyecsca.ec.context import local, DefaultContext
 from pyecsca.ec.formula import AdditionFormula, DoublingFormula
-from pyecsca.ec.mod.gmp import has_gmp
 from pyecsca.ec.mod.flint import has_flint
+from pyecsca.ec.mod.gmp import has_gmp
 from pyecsca.ec.mult import LTRMultiplier
 from pyecsca.ec.params import get_params
 from pyecsca.misc.cfg import TemporaryConfig
diff --git a/test/ec/test_countermeasures.py b/test/ec/test_countermeasures.py
index 3f78f74..0559d26 100644
--- a/test/ec/test_countermeasures.py
+++ b/test/ec/test_countermeasures.py
@@ -1,12 +1,12 @@
 import pytest
 
-from pyecsca.ec.mult import LTRMultiplier
 from pyecsca.ec.countermeasures import (
     GroupScalarRandomization,
     AdditiveSplitting,
     MultiplicativeSplitting,
     EuclideanSplitting,
 )
+from pyecsca.ec.mult import LTRMultiplier
 
 
 @pytest.fixture(params=["add-1998-cmo-2", "add-2015-rcb"])
diff --git a/test/ec/test_curve.py b/test/ec/test_curve.py
index 42bbcf6..fd3625f 100644
--- a/test/ec/test_curve.py
+++ b/test/ec/test_curve.py
@@ -1,10 +1,11 @@
 from binascii import unhexlify
+
 import pytest
 
 from pyecsca.ec.coordinates import AffineCoordinateModel
 from pyecsca.ec.curve import EllipticCurve
 from pyecsca.ec.error import UnsatisfiedAssumptionError
-from pyecsca.ec.mod import Mod, mod
+from pyecsca.ec.mod import mod
 from pyecsca.ec.model import MontgomeryModel
 from pyecsca.ec.point import Point, InfinityPoint
 
diff --git a/test/ec/test_divpoly.py b/test/ec/test_divpoly.py
index 76b5f29..fc76b9a 100644
--- a/test/ec/test_divpoly.py
+++ b/test/ec/test_divpoly.py
@@ -2,9 +2,9 @@ import json
 
 import pytest
 from importlib_resources import files
+from sympy import FF
 
 import test.data.divpoly
-from sympy import FF
 from pyecsca.ec.divpoly import a_invariants, b_invariants, divpoly0, divpoly, mult_by_n
 
 
diff --git a/test/ec/test_formula.py b/test/ec/test_formula.py
index 137f243..a06203a 100644
--- a/test/ec/test_formula.py
+++ b/test/ec/test_formula.py
@@ -1,12 +1,25 @@
+import multiprocessing as mp
 import pickle
 from operator import itemgetter
 from typing import Tuple
-import multiprocessing as mp
 
 import pytest
-from sympy import FF, symbols
 from importlib_resources import files, as_file
+from sympy import FF, symbols
+
 import pyecsca.ec
+from pyecsca.ec.error import UnsatisfiedAssumptionError
+from pyecsca.ec.formula import (
+    AdditionFormula,
+    DoublingFormula,
+    LadderFormula,
+    CodeFormula,
+)
+from pyecsca.ec.formula.efd import (
+    AdditionEFDFormula,
+    DoublingEFDFormula,
+    LadderEFDFormula,
+)
 from pyecsca.ec.formula.expand import expand_formula_set, expand_formula_set_parallel
 from pyecsca.ec.formula.fliparoo import generate_fliparood_formulas
 from pyecsca.ec.formula.graph import rename_ivs
@@ -22,23 +35,11 @@ from pyecsca.ec.formula.partitions import (
     generate_partitioned_formulas,
 )
 from pyecsca.ec.formula.switch_sign import generate_switched_formulas
-from pyecsca.ec.mod import SymbolicMod, Mod, mod
-from pyecsca.misc.cfg import TemporaryConfig
-from pyecsca.ec.error import UnsatisfiedAssumptionError
+from pyecsca.ec.mod import SymbolicMod, mod
+from pyecsca.ec.model import ShortWeierstrassModel, MontgomeryModel, TwistedEdwardsModel
 from pyecsca.ec.params import get_params, DomainParameters
 from pyecsca.ec.point import Point
-from pyecsca.ec.model import ShortWeierstrassModel, MontgomeryModel, TwistedEdwardsModel
-from pyecsca.ec.formula.efd import (
-    AdditionEFDFormula,
-    DoublingEFDFormula,
-    LadderEFDFormula,
-)
-from pyecsca.ec.formula import (
-    AdditionFormula,
-    DoublingFormula,
-    LadderFormula,
-    CodeFormula,
-)
+from pyecsca.misc.cfg import TemporaryConfig
 
 
 @pytest.fixture()
diff --git a/test/ec/test_key_agreement.py b/test/ec/test_key_agreement.py
index aa09051..5f1512c 100644
--- a/test/ec/test_key_agreement.py
+++ b/test/ec/test_key_agreement.py
@@ -1,9 +1,10 @@
+import json
 from copy import copy
 
 import pytest
-import json
 from importlib_resources import files
 
+import test.data.ec
 from pyecsca.ec.coordinates import AffineCoordinateModel
 from pyecsca.ec.key_agreement import (
     ECDH_NONE,
@@ -15,13 +16,12 @@ from pyecsca.ec.key_agreement import (
     X25519,
     X448,
 )
-from pyecsca.ec.mod import Mod, mod
+from pyecsca.ec.mod import mod
 from pyecsca.ec.mult import (
     LTRMultiplier,
     LadderMultiplier,
     DifferentialLadderMultiplier,
 )
-import test.data.ec
 from pyecsca.ec.params import get_params
 from pyecsca.ec.point import Point
 
diff --git a/test/ec/test_mod.py b/test/ec/test_mod.py
index 630a1ff..07f5bdf 100644
--- a/test/ec/test_mod.py
+++ b/test/ec/test_mod.py
@@ -3,9 +3,14 @@ import warnings
 import pytest
 from sympy import FF, symbols
 
+from pyecsca.ec.error import (
+    NonInvertibleError,
+    NonResidueError,
+    NonInvertibleWarning,
+    NonResidueWarning,
+)
 from pyecsca.ec.mod import (
     mod,
-    Mod,
     gcd,
     extgcd,
     Undefined,
@@ -15,12 +20,6 @@ from pyecsca.ec.mod import (
     jacobi,
 )
 from pyecsca.ec.mod.gmp import has_gmp
-from pyecsca.ec.error import (
-    NonInvertibleError,
-    NonResidueError,
-    NonInvertibleWarning,
-    NonResidueWarning,
-)
 from pyecsca.misc.cfg import getconfig, TemporaryConfig
 
 
diff --git a/test/ec/test_mult.py b/test/ec/test_mult.py
index a7719dc..721badc 100644
--- a/test/ec/test_mult.py
+++ b/test/ec/test_mult.py
@@ -3,8 +3,7 @@ from typing import Sequence, List
 
 import pytest
 
-from pyecsca.ec.context import local, DefaultContext
-from pyecsca.ec.mod import Mod, mod
+from pyecsca.ec.mod import mod
 from pyecsca.ec.mult import (
     DoubleAndAddMultiplier,
     LTRMultiplier,
diff --git a/test/ec/test_op.py b/test/ec/test_op.py
index 8d6996b..e82742c 100644
--- a/test/ec/test_op.py
+++ b/test/ec/test_op.py
@@ -3,7 +3,7 @@ from ast import parse
 import pytest
 
 from pyecsca.ec.formula import OpResult
-from pyecsca.ec.mod import Mod, mod
+from pyecsca.ec.mod import mod
 from pyecsca.ec.op import CodeOp, OpType
 
 
diff --git a/test/ec/test_params.py b/test/ec/test_params.py
index 891a7ca..b020f9b 100644
--- a/test/ec/test_params.py
+++ b/test/ec/test_params.py
@@ -1,19 +1,18 @@
 import pickle
 
-from importlib_resources import files, as_file
-
 import pytest
+from importlib_resources import files, as_file
 
 import test.data.ec
-from pyecsca.ec.mod import Mod, mod
-from pyecsca.ec.point import Point, InfinityPoint
-from pyecsca.misc.cfg import TemporaryConfig
 from pyecsca.ec.coordinates import AffineCoordinateModel
+from pyecsca.ec.curve import EllipticCurve
 from pyecsca.ec.error import UnsatisfiedAssumptionError
+from pyecsca.ec.mod import mod
+from pyecsca.ec.model import ShortWeierstrassModel
 from pyecsca.ec.params import get_params, load_params, load_category, get_category, DomainParameters, \
     load_params_ectester, load_params_ecgen
-from pyecsca.ec.model import ShortWeierstrassModel
-from pyecsca.ec.curve import EllipticCurve
+from pyecsca.ec.point import Point, InfinityPoint
+from pyecsca.misc.cfg import TemporaryConfig
 
 
 def test_eq(secp128r1, curve25519):
diff --git a/test/ec/test_pickle.py b/test/ec/test_pickle.py
index 3400158..5af3625 100644
--- a/test/ec/test_pickle.py
+++ b/test/ec/test_pickle.py
@@ -1,5 +1,4 @@
 import pickle
-import pickletools
 from multiprocessing import get_context
 from multiprocessing.context import BaseContext
 
diff --git a/test/ec/test_point.py b/test/ec/test_point.py
index 52c2a71..6dfced5 100644
--- a/test/ec/test_point.py
+++ b/test/ec/test_point.py
@@ -1,11 +1,13 @@
 import pickle
 from contextlib import nullcontext as does_not_raise
+
+import pytest
+
 from pyecsca.ec.coordinates import AffineCoordinateModel
-from pyecsca.ec.params import get_params
 from pyecsca.ec.mod import mod
 from pyecsca.ec.model import ShortWeierstrassModel, MontgomeryModel
+from pyecsca.ec.params import get_params
 from pyecsca.ec.point import Point, InfinityPoint
-import pytest
 
 
 @pytest.fixture()
diff --git a/test/ec/test_regress.py b/test/ec/test_regress.py
index cbfb08b..f20491d 100644
--- a/test/ec/test_regress.py
+++ b/test/ec/test_regress.py
@@ -9,8 +9,8 @@ from pyecsca.ec.error import UnsatisfiedAssumptionError
 from pyecsca.ec.formula import AdditionFormula, DoublingFormula, ScalingFormula
 from pyecsca.ec.mod import Mod, SymbolicMod, mod
 from pyecsca.ec.model import MontgomeryModel, EdwardsModel
-from pyecsca.ec.params import get_params
 from pyecsca.ec.mult import LTRMultiplier
+from pyecsca.ec.params import get_params
 from pyecsca.ec.point import Point, InfinityPoint
 
 
diff --git a/test/ec/test_signature.py b/test/ec/test_signature.py
index df00aa6..a61876b 100644
--- a/test/ec/test_signature.py
+++ b/test/ec/test_signature.py
@@ -2,9 +2,10 @@ import json
 
 import pytest
 from importlib_resources import files
+
 import test.data.ec
 from pyecsca.ec.coordinates import AffineCoordinateModel
-from pyecsca.ec.mod import Mod, mod
+from pyecsca.ec.mod import mod
 from pyecsca.ec.mult import LTRMultiplier
 from pyecsca.ec.params import get_params
 from pyecsca.ec.point import Point
diff --git a/test/ec/utils.py b/test/ec/utils.py
index 1f32033..03c8700 100644
--- a/test/ec/utils.py
+++ b/test/ec/utils.py
@@ -1,5 +1,5 @@
-from itertools import product
 from functools import reduce
+from itertools import product
 
 
 def cartesian(*items):