Fix Merge

Author: rcosta358

liquidjava-verifier/src/main/java/liquidjava/rj_language/opt/ExpressionSimplifier.java

@@ -19,8 +19,7 @@ public class ExpressionSimplifier {
      * expanding aliases Returns a derivation node representing the tree of simplifications applied
      */
     public static ValDerivationNode simplify(Expression exp, Map<String, AliasDTO> aliases) {
-        ValDerivationNode node = new ValDerivationNode(exp, null);
-        ValDerivationNode fixedPoint = simplifyToFixedPoint(node, exp);
+        ValDerivationNode fixedPoint = simplifyToFixedPoint(null, exp);
         ValDerivationNode simplified = simplifyValDerivationNode(fixedPoint);
         ValDerivationNode unwrapped = unwrapBooleanLiterals(simplified);
         return AliasExpansion.expand(unwrapped, aliases);

liquidjava-verifier/src/test/java/liquidjava/rj_language/opt/ExpressionSimplifierTest.java

@@ -118,7 +118,7 @@ void testSimpleComparison() {
         // Then
         assertNotNull(result, "Result should not be null");
         assertInstanceOf(LiteralBoolean.class, result.getValue(), "Result should be a boolean");
-        assertFalse(((LiteralBoolean) result.getValue()).isBooleanTrue(), "Expected result to befalse");
+        assertFalse((result.getValue()).isBooleanTrue(), "Expected result to be false");
 
         // (y || true) && y == false => false || true = true
         ValDerivationNode valFalseForY = new ValDerivationNode(new LiteralBoolean(false), new VarDerivationNode("y"));