From d62dbcc57eb3014ac6215744cb5be02b80eed068 Mon Sep 17 00:00:00 2001
From: alpharush <0xalpharush@protonmail.com>
Date: Mon, 24 Jul 2023 21:48:44 -0500
Subject: [PATCH] fix ternary rewrite test and make assertion more strict

---
 .../unit/slithir/test_ternary_expressions.py  | 55 +++++++++++--------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/tests/unit/slithir/test_ternary_expressions.py b/tests/unit/slithir/test_ternary_expressions.py
index 0acd9345d7..712c9582b0 100644
--- a/tests/unit/slithir/test_ternary_expressions.py
+++ b/tests/unit/slithir/test_ternary_expressions.py
@@ -1,8 +1,13 @@
 from pathlib import Path
 from slither import Slither
 from slither.core.cfg.node import NodeType
-from slither.slithir.operations import Assignment
-from slither.core.expressions import AssignmentOperation, TupleExpression
+from slither.slithir.operations import Assignment, Unpack
+from slither.core.expressions import (
+    AssignmentOperation,
+    TupleExpression,
+    NewElementaryType,
+    CallExpression,
+)
 
 
 TEST_DATA_DIR = Path(__file__).resolve().parent / "test_data"
@@ -12,27 +17,29 @@ def test_ternary_conversions(solc_binary_path) -> None:
     solc_path = solc_binary_path("0.8.0")
     slither = Slither(Path(TEST_DATA_DIR, "ternary_expressions.sol").as_posix(), solc=solc_path)
     for contract in slither.contracts:
-        for function in contract.functions:
-            vars_declared = 0
-            vars_assigned = 0
-            for node in function.nodes:
-                if node.type in [NodeType.IF, NodeType.IFLOOP]:
+        if not contract.is_signature_only:
+            for function in contract.functions:
+                vars_declared = 0
+                vars_assigned = 0
+                for node in function.nodes:
+                    if node.type in [NodeType.IF, NodeType.IFLOOP]:
 
-                    # Iterate over true and false son
-                    for inner_node in node.sons:
-                        # Count all variables declared
-                        expression = inner_node.expression
-                        if isinstance(expression, AssignmentOperation):
-                            var_expr = expression.expression_left
-                            # Only tuples declare more than one var
-                            if isinstance(var_expr, TupleExpression):
-                                vars_declared += len(var_expr.expressions)
-                            else:
-                                vars_declared += 1
+                        # Iterate over true and false son
+                        for inner_node in node.sons:
+                            # Count all variables declared
+                            expression = inner_node.expression
+                            if isinstance(
+                                expression, (AssignmentOperation, NewElementaryType, CallExpression)
+                            ):
+                                var_expr = expression.expression_left
+                                # Only tuples declare more than one var
+                                if isinstance(var_expr, TupleExpression):
+                                    vars_declared += len(var_expr.expressions)
+                                else:
+                                    vars_declared += 1
 
-                        for ir in inner_node.irs:
-                            # Count all variables defined
-                            if isinstance(ir, Assignment):
-                                vars_assigned += 1
-
-            assert vars_declared == vars_assigned
+                            for ir in inner_node.irs:
+                                # Count all variables defined
+                                if isinstance(ir, (Assignment, Unpack)):
+                                    vars_assigned += 1
+                assert vars_declared == vars_assigned and vars_assigned != 0