Merge branch 'master' into anvacaru/vacuous-2

Author: anvacaru

deps/k_release

@@ -1 +1 @@
-6.0.44
+6.0.48

package/version

@@ -1 +1 @@
-0.1.407
+0.1.408

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "pyk"
-version = "0.1.407"
+version = "0.1.408"
 description = ""
 authors = [
     "Runtime Verification, Inc. <[email protected]>",

src/pyk/__init__.py

@@ -6,4 +6,4 @@
     from typing import Final
 
 
-K_VERSION: Final = '6.0.44'
+K_VERSION: Final = '6.0.48'

src/tests/integration/kore/test_kore_client.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from dataclasses import asdict
 from string import Template
 from typing import TYPE_CHECKING
 
@@ -213,6 +214,19 @@ def state(n: int) -> State:
 )
 
 
+def assert_execute_result_equals(actual: ExecuteResult, expected: ExecuteResult) -> None:
+    assert type(actual) == type(expected)
+
+    actual_dict = asdict(actual)  # type: ignore
+    expected_dict = asdict(expected)  # type: ignore
+    if 'next_states' in actual_dict and actual.next_states is not None:
+        actual_dict['next_states'] = set(actual.next_states)
+    if 'next_states' in expected_dict and expected.next_states is not None:
+        expected_dict['next_states'] = set(expected.next_states)
+
+    assert actual_dict == expected_dict
+
+
 class TestBooster(BoosterClientTest):
     MAIN_FILE = K_FILES / 'kore-rpc-test.k'
     MODULE_NAME = 'KORE-RPC-TEST'
@@ -233,15 +247,7 @@ def test_execute_booster(
         # When
         actual = booster_client.execute(term(n), **params)
         # Then
-        assert actual.__class__ == expected.__class__
-        assert actual.reason == expected.reason
-        assert actual.state == expected.state
-        assert actual.depth == expected.depth
-        assert actual.rule == expected.rule
-        if actual.next_states is not None and expected.next_states is not None:
-            assert set(actual.next_states) == set(expected.next_states)
-        else:
-            assert actual.next_states == expected.next_states
+        assert_execute_result_equals(actual, expected)
 
 
 class TestKoreClient(KoreClientTest):
@@ -265,7 +271,7 @@ def test_execute(
         actual = kore_client.execute(term(n), **params)
 
         # Then
-        assert actual == expected
+        assert_execute_result_equals(actual, expected)
 
     @pytest.mark.parametrize(
         'test_id,antecedent,consequent,expected',