Fix failing staking escrow additional test.

Code cleanup.

Co-authored-by: vzotova <[email protected]>

tests/staking_escrow/test_staking_escrow_additional.py

@@ -42,11 +42,15 @@ def test_upgrading(accounts, token, t_token, vending_machine, project):
     dispatcher = creator.deploy(project.Dispatcher, contract_library_v1.address)
 
     tx = creator.history[-1]
-    assert tx.events == [
-        dispatcher.OwnershipTransferred(previousOwner=ZERO_ADDRESS, newOwner=creator),
-        dispatcher.StateVerified(testTarget=contract_library_v1.address, sender=creator),
-        dispatcher.UpgradeFinished(target=contract_library_v1.address, sender=creator),
-    ]
+    assert tx.events[0] == dispatcher.OwnershipTransferred(
+        previousOwner=ZERO_ADDRESS, newOwner=creator
+    )
+    assert tx.events[1] == dispatcher.StateVerified(
+        testTarget=contract_library_v1.address, sender=creator
+    )
+    assert tx.events[2] == dispatcher.UpgradeFinished(
+        target=contract_library_v1.address, sender=creator
+    )
 
     # Deploy second version of the contract
     contract_library_v2 = creator.deploy(
@@ -82,11 +86,15 @@ def test_upgrading(accounts, token, t_token, vending_machine, project):
     contract.setValueToCheck(3, sender=creator)
     assert contract.valueToCheck() == 3
 
-    assert tx.events == [
-        dispatcher.StateVerified(testTarget=contract_library_v2.address, sender=creator),
-        dispatcher.StateVerified(testTarget=contract_library_v2.address, sender=creator),
-        dispatcher.UpgradeFinished(target=contract_library_v2.address, sender=creator),
-    ]
+    assert tx.events[0] == dispatcher.StateVerified(
+        testTarget=contract_library_v2.address, sender=creator
+    )
+    assert tx.events[1] == dispatcher.StateVerified(
+        testTarget=contract_library_v2.address, sender=creator
+    )
+    assert tx.events[2] == dispatcher.UpgradeFinished(
+        target=contract_library_v2.address, sender=creator
+    )
 
     # Can't upgrade to the previous version or to the bad version
     contract_library_bad = creator.deploy(
@@ -124,10 +132,12 @@ def test_upgrading(accounts, token, t_token, vending_machine, project):
     assert contract_library_v1.address == event["target"]
     assert event["sender"] == creator
 
-    assert tx.events == [
-        dispatcher.StateVerified(testTarget=contract_library_v2.address, sender=creator),
-        dispatcher.UpgradeFinished(target=contract_library_v1.address, sender=creator),
-    ]
+    assert tx.events[1] == dispatcher.StateVerified(
+        testTarget=contract_library_v2.address, sender=creator
+    )
+    assert tx.events[2] == dispatcher.UpgradeFinished(
+        target=contract_library_v1.address, sender=creator
+    )
 
 
 def test_measure_work(accounts, token, worklock, escrow):

tests/test_beta_program_initiator.py

@@ -110,7 +110,7 @@ def test_register(accounts, beta_program_initiator, token, coordinator):
     event = events[0]
     assert event.sender == initiator_1
     assert event.requestIndex == 0
-    assert event.providers == list(n.address for n in nodes)
+    assert event.providers == [n.address for n in nodes]
     assert event.authority == authority
     assert event.duration == duration
     assert event.accessController == access_controller
@@ -142,7 +142,7 @@ def test_register(accounts, beta_program_initiator, token, coordinator):
     event = events[0]
     assert event.sender == initiator_2
     assert event.requestIndex == 1
-    assert event.providers == list(n.address for n in nodes)
+    assert event.providers == [n.address for n in nodes]
     assert event.authority == authority
     assert event.duration == duration
     assert event.accessController == access_controller

tests/test_coordinator.py

@@ -5,6 +5,7 @@
 import pytest
 from eth_account import Account
 from eth_account.messages import encode_defunct
+from hexbytes import HexBytes
 from web3 import Web3
 
 TIMEOUT = 1000
@@ -190,7 +191,7 @@ def test_initiate_ritual(
     event = events[0]
     assert event.ritualId == ritualID
     assert event.authority == authority
-    assert event.participants == list(n.address for n in nodes)
+    assert event.participants == [n.address for n in nodes]
 
     assert coordinator.getRitualState(0) == RitualState.DKG_AWAITING_TRANSCRIPTS
 
@@ -236,7 +237,7 @@ def test_provider_public_key(coordinator, nodes):
     event = events[0]
     assert event.ritualId == ritual_id
     assert event.participant == selected_provider
-    assert tuple(event.publicKey) == public_key
+    assert event.publicKey == [HexBytes(k) for k in public_key]
     assert coordinator.getProviderPublicKey(selected_provider, ritual_id) == public_key