Fix after rebasing

Fix `BeaconChainFactory` after rebasing Fix after new SSZ Hashable structure
ethereum · Dec 18, 2019 · d3e330c · d3e330c
1 parent ce81f30
commit d3e330c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/eth2/beacon/tools/builder/aggregator.py b/eth2/beacon/tools/builder/aggregator.py
@@ -86,7 +86,7 @@ def get_aggregate_from_valid_committee_attestations(
 
     assert len(attestations) > 0
 
-    return Attestation(
+    return Attestation.create(
         data=attestations[0].data,
         aggregation_bits=Bitfield(aggregation_bits),
         signature=aggregate_signature,

diff --git a/eth2/beacon/tools/factories.py b/eth2/beacon/tools/factories.py
@@ -51,10 +51,8 @@ def _create(
         else:
             num_validators = cls.num_validators
 
-        keymap = mk_keymap_of_size(num_validators)
-
         if kwargs["genesis_state"] is None:
-            keymap = mk_keymap_of_size(cls.num_validators)
+            keymap = mk_keymap_of_size(num_validators)
             genesis_state, genesis_block = create_mock_genesis(
                 config=cls.config,
                 pubkeys=tuple(keymap.keys()),

diff --git a/trinity/components/eth2/beacon/validator.py b/trinity/components/eth2/beacon/validator.py
@@ -520,7 +520,7 @@ async def aggregate(
                 # 3. For each aggregate
                 # (it's possible with same CommitteeIndex and different AttesatationData)
                 for aggregate in aggregates:
-                    aggregate_and_proof = AggregateAndProof(
+                    aggregate_and_proof = AggregateAndProof.create(
                         aggregator_index=validator_index,
                         aggregate=aggregate,
                         selection_proof=selected_proofs[validator_index],