Skip to content

Commit

Permalink
chore: fix utils packages paths
Browse files Browse the repository at this point in the history
  • Loading branch information
pik694 committed May 11, 2020
1 parent 9770382 commit 0b46ff4
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 29 deletions.
32 changes: 4 additions & 28 deletions plasma_framework/python_tests/tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
from plasma_core.account import EthereumAccount
from plasma_core.constants import NULL_ADDRESS
from testlang.testlang import TestingLanguage
from tests.tests_utils.constants import (
from tests_utils.constants import (
INITIAL_ETH,
START_GAS,
GAS_LIMIT,
)
from tests.tests_utils.convenience_wrappers import ConvenienceContractWrapper, AutominingEth
from tests.tests_utils.deployer import Deployer
from tests.tests_utils.plasma_framework import PlasmaFramework
from tests_utils.convenience_wrappers import ConvenienceContractWrapper, AutominingEth
from tests_utils.deployer import Deployer
from tests_utils.plasma_framework import PlasmaFramework


# IMPORTANT NOTICE
Expand Down Expand Up @@ -176,27 +176,3 @@ def _find_file(name, path):
if name in files:
return os.path.join(root, name)
raise FileNotFoundError(name)


def assert_events(events_objects, expected_events):
assert len(events_objects) == len(expected_events)

# sort received and expected events by name
events_objects = sorted(events_objects, key=lambda e: e[1].event)
expected_events = sorted(expected_events, key=lambda e: e[0])

for event_obj, expected_event in zip(events_objects, expected_events):
assert_event(event_obj, *expected_event)


def assert_event(event_obj, expected_event_name, expected_event_args=None, expected_contract_address=None):
contract_address, event = event_obj

if expected_event_args is None:
expected_event_args = {}

if expected_contract_address:
assert contract_address == expected_contract_address

assert event['event'] == expected_event_name
assert expected_event_args.items() <= event['args'].items()
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from plasma_core.constants import NULL_ADDRESS, NULL_ADDRESS_HEX, MIN_EXIT_PERIOD
from plasma_core.transaction import Transaction
from plasma_core.utils.transactions import decode_utxo_id, encode_utxo_id
from tests.conftest import assert_events
from tests_utils.assertions import assert_events


def prepare_exitable_utxo(testlang, owners, amount, outputs, num_outputs=1):
Expand Down
22 changes: 22 additions & 0 deletions plasma_framework/python_tests/tests/tests_utils/assertions.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
def assert_events(events_objects, expected_events):
assert len(events_objects) == len(expected_events)

# sort received and expected events by name
events_objects = sorted(events_objects, key=lambda e: e[1].event)
expected_events = sorted(expected_events, key=lambda e: e[0])

for event_obj, expected_event in zip(events_objects, expected_events):
assert_event(event_obj, *expected_event)


def assert_event(event_obj, expected_event_name, expected_event_args=None, expected_contract_address=None):
contract_address, event = event_obj

if expected_event_args is None:
expected_event_args = {}

if expected_contract_address:
assert contract_address == expected_contract_address

assert event['event'] == expected_event_name
assert expected_event_args.items() <= event['args'].items()

0 comments on commit 0b46ff4

Please sign in to comment.