Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add name in enum payload #185

Merged
merged 4 commits into from
Jan 22, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions multiversx_sdk/abi/abi_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,7 @@ def test_decode_custom_enum():
),
)
setattr(expected_output, "__discriminant__", 5)
setattr(expected_output, "__name__", "SendTransferExecuteEgld")
assert decoded_type == expected_output


Expand Down
5 changes: 5 additions & 0 deletions multiversx_sdk/abi/enum_value.py
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,11 @@ def get_payload(self) -> Any:

setattr(obj, ENUM_DISCRIMINANT_FIELD_NAME, self.discriminant)

if self.names_to_discriminants is not None:
for name, discriminant in self.names_to_discriminants.items():
if discriminant == self.discriminant:
setattr(obj, ENUM_NAME_FIELD_NAME, name)

return obj

def __eq__(self, other: Any) -> bool:
Expand Down
10 changes: 5 additions & 5 deletions multiversx_sdk/abi/enum_value_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def test_set_payload_and_get_payload_using_names():
value = EnumValue(fields_provider=lambda discriminant: [], names_to_discriminants={"TypeB": 42})
value.set_payload("TypeB")
assert value.discriminant == 42
assert value.get_payload() == SimpleNamespace(__discriminant__=42)
assert value.get_payload() == SimpleNamespace(__discriminant__=42, __name__="TypeB")

# With fields (from SimpleNamespace, object, dictionary or list)
def provide_fields(discriminant: int) -> list[Field]:
Expand All @@ -124,7 +124,7 @@ def provide_fields(discriminant: int) -> list[Field]:
value.set_payload(SimpleNamespace(__name__="TypeA", a=1, b=2))
assert value.discriminant == 41
assert value.fields == [Field("a", U32Value(1)), Field("b", BigUIntValue(2))]
assert value.get_payload() == SimpleNamespace(__discriminant__=41, a=1, b=2)
assert value.get_payload() == SimpleNamespace(__discriminant__=41, __name__="TypeA", a=1, b=2)
assert int(value.get_payload()) == 41

class Payload:
Expand All @@ -137,19 +137,19 @@ def __init__(self, c: int, d: int):
value.set_payload(Payload(3, 4))
assert value.discriminant == 42
assert value.fields == [Field("c", U32Value(3)), Field("d", BigUIntValue(4))]
assert value.get_payload() == SimpleNamespace(__discriminant__=42, c=3, d=4)
assert value.get_payload() == SimpleNamespace(__discriminant__=42, __name__="TypeB", c=3, d=4)
assert int(value.get_payload()) == 42

# Then, from dictionary
value.set_payload({"__name__": "TypeC", "e": 5, "f": 6})
assert value.discriminant == 43
assert value.fields == [Field("e", U32Value(5)), Field("f", BigUIntValue(6))]
assert value.get_payload() == SimpleNamespace(__discriminant__=43, e=5, f=6)
assert value.get_payload() == SimpleNamespace(__discriminant__=43, __name__="TypeC", e=5, f=6)
assert int(value.get_payload()) == 43

# Finally, from list (first element is the name)
value.set_payload(["TypeD", 7, 8])
assert value.discriminant == 44
assert value.fields == [Field("g", U32Value(7)), Field("h", BigUIntValue(8))]
assert value.get_payload() == SimpleNamespace(__discriminant__=44, g=7, h=8)
assert value.get_payload() == SimpleNamespace(__discriminant__=44, __name__="TypeD", g=7, h=8)
assert int(value.get_payload()) == 44
2 changes: 2 additions & 0 deletions multiversx_sdk/core/transaction_events_parser_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ def test_parse_multisig_start_perform_action():
arguments=[bytes.fromhex("07")],
),
"__discriminant__": 5,
"__name__": "SendTransferExecuteEgld",
}
),
signers=[
Expand Down Expand Up @@ -284,6 +285,7 @@ def test_multisig_start_perform_action():
}
),
"__discriminant__": 5,
"__name__": "SendTransferExecuteEgld",
},
),
signers=[
Expand Down
Loading