Merge collapsible `if` statements

2 files changed, 9 insertions, 9 deletions

diff --git a/pyecsca/ec/configuration.py b/pyecsca/ec/configuration.py
index 714f9b1..04ee41c 100644
--- a/pyecsca/ec/configuration.py
+++ b/pyecsca/ec/configuration.py
@@ -220,13 +220,11 @@ def all_configurations(**kwargs) -> Generator[Configuration, Configuration, None
 
     for model_cls in leaf_subclasses(CurveModel):
         model = model_cls()
-        if "model" in kwargs:
-            if model != kwargs["model"]:
-                continue
+        if "model" in kwargs and model != kwargs["model"]:
+            continue
         for coords in model.coordinates.values():
-            if "coords" in kwargs:
-                if coords != kwargs["coords"]:
-                    continue
+            if "coords" in kwargs and coords != kwargs["coords"]:
+                continue
             coords_formulas = coords.formulas.values()
             mult_classes = leaf_subclasses(ScalarMultiplier)
             if "scalarmult" in kwargs:
diff --git a/pyecsca/ec/mult.py b/pyecsca/ec/mult.py
index 0841dc4..47c36b1 100644
--- a/pyecsca/ec/mult.py
+++ b/pyecsca/ec/mult.py
@@ -101,9 +101,11 @@ class ScalarMultiplier(ABC):
     def _dbl(self, point: Point) -> Point:
         if "dbl" not in self.formulas:
             raise NotImplementedError
-        if self.short_circuit:
-            if point == self._params.curve.neutral:
-                return copy(point)
+        if (
+            self.short_circuit
+            and point == self._params.curve.neutral
+        ):
+            return copy(point)
         return self.formulas["dbl"](
             self._params.curve.prime, point, **self._params.curve.parameters
         )[0]