From 591a2b47c8af28a43f5349435749d7f60f9894d4 Mon Sep 17 00:00:00 2001
From: Justin Drake <drakefjustin@gmail.com>
Date: Wed, 1 May 2019 12:08:15 +0100
Subject: [PATCH] Simplify state_transition.py

---
 specs/core/0_beacon-chain.md                  |  6 +-
 .../eth2spec/phase0/state_transition.py       | 69 +------------------
 2 files changed, 5 insertions(+), 70 deletions(-)

diff --git a/specs/core/0_beacon-chain.md b/specs/core/0_beacon-chain.md
index bfb51e99a..e57fce037 100644
--- a/specs/core/0_beacon-chain.md
+++ b/specs/core/0_beacon-chain.md
@@ -1698,14 +1698,14 @@ def process_operations(state: BeaconState, body: BeaconBlockBody) -> None:
     assert len(body.deposits) == min(MAX_DEPOSITS, state.latest_eth1_data.deposit_count - state.deposit_index)
     assert len(body.transfers) == len(set(body.transfers))
 
-    for operations, max_operations, function in {
+    for operations, max_operations, function in (
         (body.proposer_slashings, MAX_PROPOSER_SLASHINGS, process_proposer_slashing),
-        (body.attester_slashings, MAX_ATTESTER_SLASHINGS, attester_slashings),
+        (body.attester_slashings, MAX_ATTESTER_SLASHINGS, process_attester_slashing),
         (body.attestations, MAX_ATTESTATIONS, process_attestation),
         (body.deposits, MAX_DEPOSITS, process_deposit),
         (body.voluntary_exits, MAX_VOLUNTARY_EXITS, process_voluntary_exit),
         (body.transfers, MAX_TRANSFERS, process_transfer),
-    }:
+    ):
         assert len(operations) <= max_operations
         for operation in operations:
             function(state, operation)
diff --git a/test_libs/pyspec/eth2spec/phase0/state_transition.py b/test_libs/pyspec/eth2spec/phase0/state_transition.py
index 1bef358d4..2aa0a38a6 100644
--- a/test_libs/pyspec/eth2spec/phase0/state_transition.py
+++ b/test_libs/pyspec/eth2spec/phase0/state_transition.py
@@ -14,76 +14,11 @@ from .spec import (
 )
 
 
-def expected_deposit_count(state: BeaconState) -> int:
-    return min(
-        spec.MAX_DEPOSITS,
-        state.latest_eth1_data.deposit_count - state.deposit_index
-    )
-
-
-def process_operation_type(state: BeaconState,
-                           operations: List[Any],
-                           max_operations: int,
-                           tx_fn: Callable[[BeaconState, Any], None]) -> None:
-    assert len(operations) <= max_operations
-    for operation in operations:
-        tx_fn(state, operation)
-
-
-def process_operations(state: BeaconState, block: BeaconBlock) -> None:
-    process_operation_type(
-        state,
-        block.body.proposer_slashings,
-        spec.MAX_PROPOSER_SLASHINGS,
-        spec.process_proposer_slashing,
-    )
-
-    process_operation_type(
-        state,
-        block.body.attester_slashings,
-        spec.MAX_ATTESTER_SLASHINGS,
-        spec.process_attester_slashing,
-    )
-
-    process_operation_type(
-        state,
-        block.body.attestations,
-        spec.MAX_ATTESTATIONS,
-        spec.process_attestation,
-    )
-
-    assert len(block.body.deposits) == expected_deposit_count(state)
-    process_operation_type(
-        state,
-        block.body.deposits,
-        spec.MAX_DEPOSITS,
-        spec.process_deposit,
-    )
-
-    process_operation_type(
-        state,
-        block.body.voluntary_exits,
-        spec.MAX_VOLUNTARY_EXITS,
-        spec.process_voluntary_exit,
-    )
-
-    assert len(block.body.transfers) == len(set(block.body.transfers))
-    process_operation_type(
-        state,
-        block.body.transfers,
-        spec.MAX_TRANSFERS,
-        spec.process_transfer,
-    )
-
-
-def process_block(state: BeaconState,
-                  block: BeaconBlock,
-                  verify_state_root: bool=False) -> None:
+def process_block(state: BeaconState, block: BeaconBlock, verify_state_root) -> None:
     spec.process_block_header(state, block)
     spec.process_randao(state, block)
     spec.process_eth1_data(state, block)
-
-    process_operations(state, block)
+    spec.process_operations(state, block.body)
     if verify_state_root:
         spec.verify_block_state_root(state, block)