Fix after rebasing

Fix `BeaconChainFactory` after rebasing

Fix after new SSZ Hashable structure

Author: hwwhww

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,

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()),

eth2/beacon/types/aggregate_and_proof.py

@@ -29,7 +29,9 @@ def create(
         selection_proof: BLSSignature = EMPTY_SIGNATURE,
     ) -> TAggregateAndProof:
         return super().create(
-            aggregator_index=aggregator_index, aggregate=aggregate, selection_proof=selection_proof
+            aggregator_index=aggregator_index,
+            aggregate=aggregate,
+            selection_proof=selection_proof,
         )
 
     def __str__(self) -> str:

tests/eth2/core/beacon/tools/builder/test_aggregator.py

@@ -59,16 +59,18 @@ def test_get_aggregate_from_valid_committee_attestations(
 ):
     committee_size = 16
     empty_bitfield = get_empty_bitfield(committee_size)
-    base_attestation = Attestation(**sample_attestation_params)
+    base_attestation = Attestation.create(**sample_attestation_params)
     message_hash = base_attestation.data.hash_tree_root
     attestations = []
     expected_bitfield = empty_bitfield
 
     for i in range(4, 16, 2):
         attestations.append(
-            base_attestation.copy(
-                aggregation_bits=set_voted(empty_bitfield, i),
-                signature=sign_transaction(
+            base_attestation.mset(
+                "aggregation_bits",
+                set_voted(empty_bitfield, i),
+                "signature",
+                sign_transaction(
                     message_hash=message_hash,
                     privkey=privkeys[i],
                     state=genesis_state,

trinity/components/eth2/beacon/validator.py

@@ -524,7 +524,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],