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

Renamed method parameter and fixed linter issue #110

Merged
merged 1 commit into from
Oct 17, 2024
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
2 changes: 1 addition & 1 deletion .flake8
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[flake8]
ignore = E501, E722
extend-ignore = E501, E722
10 changes: 7 additions & 3 deletions multiversx_sdk/abi/abi.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@
from multiversx_sdk.abi.option_value import OptionValue
from multiversx_sdk.abi.optional_value import OptionalValue
from multiversx_sdk.abi.serializer import Serializer
from multiversx_sdk.abi.small_int_values import *
from multiversx_sdk.abi.small_int_values import (I8Value, I16Value, I32Value,
I64Value, U8Value, U16Value,
U32Value, U64Value)
from multiversx_sdk.abi.string_value import StringValue
from multiversx_sdk.abi.struct_value import StructValue
from multiversx_sdk.abi.token_identifier_value import TokenIdentifierValue
Expand Down Expand Up @@ -189,7 +191,7 @@ def decode_endpoint_output_parameters(self, endpoint_name: str, encoded_values:
output_native_values = [value.get_payload() for value in output_values_as_native_object_holders]
return output_native_values

def decode_event(self, event_name: str, topics: List[bytes], data_items: List[bytes]) -> SimpleNamespace:
def decode_event(self, event_name: str, topics: List[bytes], additional_data: List[bytes]) -> SimpleNamespace:
result = SimpleNamespace()
event_definition = self.definition.get_event_definition(event_name)
event_prototype = self._get_event_prototype(event_name)
Expand All @@ -212,7 +214,7 @@ def decode_event(self, event_name: str, topics: List[bytes], data_items: List[by
non_indexed_inputs_names = [item.name for item in non_indexed_inputs]

output_values = [field.value for field in fields if field.name in non_indexed_inputs_names]
self._serializer.deserialize_parts(data_items, output_values)
self._serializer.deserialize_parts(additional_data, output_values)

output_values_as_native_object_holders = cast(List[IPayloadHolder], output_values)
output_native_values = [value.get_payload() for value in output_values_as_native_object_holders]
Expand Down Expand Up @@ -265,6 +267,8 @@ def _create_prototype(self, type_formula: TypeFormula) -> Any:
return I16Value()
if name == "i32":
return I32Value()
if name == "i64":
return I64Value()
if name == "BigUint":
return BigUIntValue()
if name == "BigInt":
Expand Down
9 changes: 5 additions & 4 deletions multiversx_sdk/abi/serializer_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@
from multiversx_sdk.abi.bytes_value import BytesValue
from multiversx_sdk.abi.counted_variadic_values import CountedVariadicValues
from multiversx_sdk.abi.enum_value import EnumValue
from multiversx_sdk.abi.fields import *
from multiversx_sdk.abi.fields import Field
from multiversx_sdk.abi.list_value import ListValue
from multiversx_sdk.abi.multi_value import *
from multiversx_sdk.abi.multi_value import MultiValue
from multiversx_sdk.abi.option_value import OptionValue
from multiversx_sdk.abi.optional_value import OptionalValue
from multiversx_sdk.abi.serializer import Serializer
from multiversx_sdk.abi.small_int_values import *
from multiversx_sdk.abi.small_int_values import (U8Value, U16Value, U32Value,
U64Value)
from multiversx_sdk.abi.string_value import StringValue
from multiversx_sdk.abi.struct_value import StructValue
from multiversx_sdk.abi.variadic_values import VariadicValues
Expand Down Expand Up @@ -501,7 +502,7 @@ def test_real_world_multisig_get_pending_action_full_info():
item_creator=lambda: BytesValue()
)

def action_fields_provider(discriminant: int) -> List[Field]:
def action_fields_provider(discriminant: int) -> list[Field]:
if discriminant == 5:
return [
Field("to", action_to),
Expand Down
8 changes: 4 additions & 4 deletions multiversx_sdk/core/transaction_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -317,8 +317,8 @@ def test_compute_bytes_for_verifying_signature(self):
signature=tx.signature
)

assert is_signed_by_alice == True
assert is_signed_by_bob == False
assert is_signed_by_alice
assert is_signed_by_bob is False

def test_compute_bytes_for_verifying_transaction_signed_by_hash(self):
tx = Transaction(
Expand All @@ -343,5 +343,5 @@ def test_compute_bytes_for_verifying_transaction_signed_by_hash(self):
signature=tx.signature
)

assert is_signed_by_alice == True
assert is_signed_by_bob == False
assert is_signed_by_alice
assert is_signed_by_bob is False
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from typing import List, Optional, Protocol, Sequence
from typing import List, Optional, Protocol

from multiversx_sdk.core.errors import BadUsageError
from multiversx_sdk.core.interfaces import IAddress
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@


class IAbi(Protocol):
def decode_event(self, event_name: str, topics: List[bytes], data_items: List[bytes]) -> SimpleNamespace:
def decode_event(self, event_name: str, topics: List[bytes], additional_data: List[bytes]) -> SimpleNamespace:
...


Expand All @@ -30,5 +30,5 @@ def parse_event(self, event: TransactionEvent) -> SimpleNamespace:
return self.abi.decode_event(
event_name=abi_identifier,
topics=topics,
data_items=event.additional_data,
additional_data=event.additional_data,
)
2 changes: 1 addition & 1 deletion multiversx_sdk/core/typecheck.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Runtime type-checking is not a good idea, generally speaking.
Runtime type-checking is not a good idea, generally speaking.
However, some developers may inadvertently disable static type-checking in their IDEs,
and this can lead to hard-to-debug errors.

Expand Down
2 changes: 1 addition & 1 deletion multiversx_sdk/network_providers/network_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def from_http_response(payload: Dict[str, Any]) -> 'NetworkConfig':
network_config.num_shards_without_meta = int(payload.get('erd_num_shards_without_meta', 0))

return network_config

def to_dictionary(self) -> Dict[str, Any]:
return {
"chainId": self.chain_id,
Expand Down
10 changes: 8 additions & 2 deletions multiversx_sdk/network_providers/transaction_decoder.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,14 @@


class ITransactionToDecode(Protocol):
sender: IAddress
receiver: IAddress
@property
def sender(self) -> IAddress:
...

@property
def receiver(self) -> IAddress:
...

data: str
value: int

Expand Down
8 changes: 4 additions & 4 deletions multiversx_sdk/wallet/libraries/bls_facade_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def test_verify_message_signature():
signature=bytes.fromhex("84fd0a3a9d4f1ea2d4b40c6da67f9b786284a1c3895b7253fec7311597cda3f757862bb0690a92a13ce612c33889fd86")
)

assert ok == True
assert ok

# With altered signature
ok = facade.verify_message_signature(
Expand All @@ -59,7 +59,7 @@ def test_verify_message_signature():
signature=bytes.fromhex("84fd0a3a9d4f1ea2d4b40c6da67f9b786284a1c3895b7253fec7311597cda3f757862bb0690a92a13ce612c33889fd86")
)

assert ok == False
assert not ok

# With bad public key
ok = facade.verify_message_signature(
Expand All @@ -68,7 +68,7 @@ def test_verify_message_signature():
signature=bytes.fromhex("84fd0a3a9d4f1ea2d4b40c6da67f9b786284a1c3895b7253fec7311597cda3f757862bb0690a92a13ce612c33889fd86")
)

assert ok == False
assert not ok


def test_generate_sign_and_verify():
Expand All @@ -80,4 +80,4 @@ def test_generate_sign_and_verify():
signature = facade.compute_message_signature(message, private_key)
ok = facade.verify_message_signature(public_key, message, signature)

assert ok == True
assert ok
4 changes: 2 additions & 2 deletions multiversx_sdk/wallet/validator_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ def test_verify_message():
message = b"hello"
signature = bytes.fromhex("84fd0a3a9d4f1ea2d4b40c6da67f9b786284a1c3895b7253fec7311597cda3f757862bb0690a92a13ce612c33889fd86")

assert verifier.verify(message, signature) == True
assert verifier.verify(message, signature)

invalid_signature = bytes.fromhex("94fd0a3a9d4f1ea2d4b40c6da67f9b786284a1c3895b7253fec7311597cda3f757862bb0690a92a13ce612c33889fd86")
assert verifier.verify(message, invalid_signature) == False
assert verifier.verify(message, invalid_signature) is False


def test_pem_save():
Expand Down
Loading