Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Merge] add merge spec datastructures #4503

Merged
merged 12 commits into from
Oct 26, 2021
Merged

[Merge] add merge spec datastructures #4503

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0753160
add merge spec datastructures
tbenr Oct 18, 2021
7a5ba83
update BlockOperationSelectorFactoryTest
tbenr Oct 18, 2021
17fabc8
revisit BeaconBlockBodyBuilder classes and adds BeaconBlockBodyMergeTest
tbenr Oct 22, 2021
8c1302d
Merge branch 'master' into merge_add_merge_spec_datastructures
tbenr Oct 22, 2021
f35d899
fix dependency
tbenr Oct 22, 2021
7b8fecd
fix merge SpecVersion creation
tbenr Oct 22, 2021
44754a6
update UT
tbenr Oct 22, 2021
52bf04c
Merge branch 'master' into merge_add_merge_spec_datastructures
tbenr Oct 25, 2021
3cf6d9a
better builder and camelCase
tbenr Oct 25, 2021
cb42460
getBeaconStateSchema renovation
tbenr Oct 25, 2021
982bfe5
revert static on getValidatorStats
tbenr Oct 25, 2021
a83d136
Merge branch 'master' into merge_add_merge_spec_datastructures
tbenr Oct 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions data/serializer/src/main/java/tech/pegasys/teku/api/schema/altair/BeaconStateAltair.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import tech.pegasys.teku.api.schema.interfaces.State;
import tech.pegasys.teku.infrastructure.unsigned.UInt64;
import tech.pegasys.teku.spec.datastructures.state.beaconstate.MutableBeaconState;
import tech.pegasys.teku.spec.datastructures.state.beaconstate.versions.altair.BeaconStateSchemaAltair;
import tech.pegasys.teku.ssz.SszList;
import tech.pegasys.teku.ssz.collections.SszBitvector;
import tech.pegasys.teku.ssz.primitive.SszByte;
Expand Down Expand Up @@ -125,8 +126,7 @@ protected void applyAdditionalFields(final MutableBeaconState state) {
beaconStateAltair -> {
final tech.pegasys.teku.spec.datastructures.state.SyncCommittee.SyncCommitteeSchema
syncCommitteeSchema =
beaconStateAltair
.getBeaconStateSchemaAltair()
((BeaconStateSchemaAltair) beaconStateAltair.getBeaconStateSchema())
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ajsutton going down to that path I found this. do you think we should then implement the toVersion<Milestone> pattern in BeaconStateSchema too?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suspect it's more likely a required kind of pattern where it just throws an exception if it's the wrong type (with useful detail). Code like this won't be able to handle getting an empty Optional back. But yes that's definitely better than casting.

.getCurrentSyncCommitteeSchema();
final SszList<SszByte> previousEpochParticipation =
beaconStateAltair
Expand Down
4 changes: 0 additions & 4 deletions ...pegasys/teku/spec/datastructures/state/beaconstate/versions/altair/BeaconStateAltair.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@

public interface BeaconStateAltair extends BeaconState {

default BeaconStateSchemaAltair getBeaconStateSchemaAltair() {
return (BeaconStateSchemaAltair) getSchema();
}

static BeaconStateAltair required(final BeaconState state) {
return state
.toVersionAltair()
Expand Down
5 changes: 5 additions & 0 deletions ...sys/teku/spec/datastructures/state/beaconstate/versions/altair/BeaconStateAltairImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@ class BeaconStateAltairImpl extends AbstractBeaconState<MutableBeaconStateAltair
super(type, backingNode);
}

@Override
public BeaconStateSchemaAltair getBeaconStateSchema() {
return (BeaconStateSchemaAltair) getSchema();
}

@Override
public MutableBeaconStateAltair createWritableCopy() {
return new MutableBeaconStateAltairImpl(this);
Expand Down
5 changes: 5 additions & 0 deletions ...u/spec/datastructures/state/beaconstate/versions/altair/MutableBeaconStateAltairImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ class MutableBeaconStateAltairImpl extends AbstractMutableBeaconState<BeaconStat
super(backingImmutableView, builder);
}

@Override
public BeaconStateSchemaAltair getBeaconStateSchema() {
return (BeaconStateSchemaAltair) getSchema();
}

@Override
protected BeaconStateAltairImpl createImmutableBeaconState(
TreeNode backingNode, IntCache<SszData> viewCache, TransitionCaches transitionCache) {
Expand Down
4 changes: 0 additions & 4 deletions ...h/pegasys/teku/spec/datastructures/state/beaconstate/versions/merge/BeaconStateMerge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@

public interface BeaconStateMerge extends BeaconStateAltair {

default BeaconStateSchemaMerge getBeaconStateSchemaMerge() {
return (BeaconStateSchemaMerge) getSchema();
}

static BeaconStateMerge required(final BeaconState state) {
return state
.toVersionMerge()
Expand Down
5 changes: 5 additions & 0 deletions ...gasys/teku/spec/datastructures/state/beaconstate/versions/merge/BeaconStateMergeImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@ class BeaconStateMergeImpl extends AbstractBeaconState<MutableBeaconStateMerge>
super(type, backingNode);
}

@Override
public BeaconStateSchemaMerge getBeaconStateSchema() {
return (BeaconStateSchemaMerge) getSchema();
}

@Override
public MutableBeaconStateMerge createWritableCopy() {
return new MutableBeaconStateMergeImpl(this);
Expand Down
5 changes: 5 additions & 0 deletions ...eku/spec/datastructures/state/beaconstate/versions/merge/MutableBeaconStateMergeImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ class MutableBeaconStateMergeImpl extends AbstractMutableBeaconState<BeaconState
super(backingImmutableView, builder);
}

@Override
public BeaconStateSchemaMerge getBeaconStateSchema() {
return (BeaconStateSchemaMerge) getSchema();
}

@Override
protected BeaconStateMergeImpl createImmutableBeaconState(
TreeNode backingNode, IntCache<SszData> viewCache, TransitionCaches transitionCache) {
Expand Down
3 changes: 2 additions & 1 deletion ...pegasys/teku/spec/datastructures/state/beaconstate/versions/phase0/BeaconStatePhase0.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@

public interface BeaconStatePhase0 extends BeaconState {

default BeaconStateSchemaPhase0 getBeaconStateSchemaPhase0() {
@Override
default BeaconStateSchemaPhase0 getBeaconStateSchema() {
return (BeaconStateSchemaPhase0) getSchema();
}

Expand Down
5 changes: 5 additions & 0 deletions ...sys/teku/spec/datastructures/state/beaconstate/versions/phase0/BeaconStatePhase0Impl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@ class BeaconStatePhase0Impl extends AbstractBeaconState<MutableBeaconStatePhase0
super(type, backingNode);
}

@Override
public BeaconStateSchemaPhase0 getBeaconStateSchema() {
return (BeaconStateSchemaPhase0) getSchema();
}

@Override
public <E1 extends Exception, E2 extends Exception, E3 extends Exception>
BeaconStatePhase0 updatedPhase0(Mutator<MutableBeaconStatePhase0, E1, E2, E3> mutator)
Expand Down
2 changes: 1 addition & 1 deletion ...java/tech/pegasys/teku/spec/logic/versions/phase0/helpers/BeaconStateAccessorsPhase0.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public int getPreviousEpochAttestationCapacity(final BeaconState genericState) {
final BeaconStatePhase0 state = BeaconStatePhase0.required(genericState);
final int absoluteMax =
Math.toIntExact(
state.getBeaconStateSchemaPhase0().getPreviousEpochAttestationsSchema().getMaxLength());
state.getBeaconStateSchema().getPreviousEpochAttestationsSchema().getMaxLength());
return absoluteMax - state.getPrevious_epoch_attestations().size();
}
}