Make tests better

Author: kclowes

docs/contracts.rst

@@ -489,7 +489,6 @@ and the arguments are ambiguous.
         >>> identity_func(1, True).call()
         1
 
-
 Contract Functions
 ------------------
 

tests/core/contracts/test_extracting_event_data.py

@@ -296,10 +296,10 @@ def test_event_processing_with_strict_error_flag(
 
 
 @pytest.mark.parametrize(
-    'errors,rich_log_length,expected_args',
+    'errors,rich_log_length',
     (
-        (EventLogErrorFlags.discard, 0, None),
-        (EventLogErrorFlags.ignore, 1, {'arg0': 12345}),
+        (EventLogErrorFlags.discard, 0),
+        (EventLogErrorFlags.ignore, 1),
     )
 )
 def test_event_processing_with_caught_errors(
@@ -308,7 +308,6 @@ def test_event_processing_with_caught_errors(
         indexed_event_contract,
         wait_for_transaction,
         errors,
-        expected_args,
         rich_log_length):
 
     emitter_fn = indexed_event_contract.functions.logTwoEvents
@@ -322,14 +321,16 @@ def test_event_processing_with_caught_errors(
 
     event_instance = indexed_event_contract.events.LogSingleWithIndex()
 
-    rich_logs = event_instance.processReceipt(dup_txn_receipt, errors=errors)
+    returned_logs = event_instance.processReceipt(dup_txn_receipt, errors=errors)
 
-    assert len(rich_logs) == rich_log_length
+    assert len(returned_logs) == rich_log_length
 
-    if len(rich_logs) >= 1:
-        rich_log = rich_logs[0]
+    if len(returned_logs) == 0:
+        assert returned_logs == ()
+    elif len(returned_logs) == 1:
+        returned_log = returned_logs[0]
 
-        assert rich_log['blockHash'] == dup_txn_receipt['blockHash']
-        assert rich_log['blockNumber'] == dup_txn_receipt['blockNumber']
-        assert rich_log['transactionIndex'] == dup_txn_receipt['transactionIndex']
-        assert is_same_address(rich_log['address'], event_contract.address)
+        assert returned_log == dup_txn_receipt['logs'][0]
+        assert is_same_address(returned_log['address'], event_contract.address)
+    else:
+        raise Exception('Unreachable!')