Fix invalid message size calculation

Ref. #1042
AdaCore · May 30, 2022 · 118d064 · 118d064
1 parent dc4908c
commit 118d064
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/rflx/model/message.py b/rflx/model/message.py
@@ -2397,5 +2397,5 @@ def to_mapping(facts: Sequence[expr.Expr]) -> Dict[expr.Name, expr.Expr]:
     return {
         f.left: f.right
         for f in facts
-        if isinstance(f, (expr.Equal, expr.GreaterEqual)) and isinstance(f.left, expr.Name)
+        if isinstance(f, expr.Equal) and isinstance(f.left, expr.Name)
     }
diff --git a/tests/unit/model/message_test.py b/tests/unit/model/message_test.py
@@ -2701,24 +2701,24 @@ def test_is_definite() -> None:
 def test_size() -> None:
     assert NULL_MESSAGE.size() == Number(0)
     assert FIXED_SIZE_MESSAGE.size() == Number(200)
-    assert TLV_MESSAGE.size({Field("Tag"): Variable("Msg_Error")}) == Number(8)
+    assert TLV_MESSAGE.size({Field("Tag"): Variable("TLV::Msg_Error")}) == Number(8)
     assert TLV_MESSAGE.size(
         {
-            Field("Tag"): Variable("Msg_Data"),
+            Field("Tag"): Variable("TLV::Msg_Data"),
             Field("Length"): Number(4),
             Field("Value"): Aggregate(*[Number(0)] * 4),
         }
     ) == Number(56)
     assert TLV_MESSAGE.size(
         {
-            Field("Tag"): Variable("Msg_Data"),
+            Field("Tag"): Variable("TLV::Msg_Data"),
             Field("Length"): Div(Add(Size("Tag"), Size("TLV::Length")), Number(8)),
             Field("Value"): Aggregate(*[Number(0)] * 3),
         }
     ) == Number(48)
     assert TLV_MESSAGE.size(
         {
-            Field("Tag"): Variable("Msg_Data"),
+            Field("Tag"): Variable("TLV::Msg_Data"),
             Field("Length"): Add(Div(Size("X"), Number(8)), Variable("Y")),
             Field("Value"): Variable("Z"),
         }