Update according to comments. Revert ssz

types/domain_type.go

@@ -1,8 +1,6 @@
 package types
 
 import (
-	"crypto/sha256"
-
 	"github.com/attestantio/go-eth2-client/spec/phase0"
 	"github.com/pkg/errors"
 )
@@ -42,7 +40,7 @@ type ForkData struct {
 	// Epoch in which the fork happened
 	Epoch phase0.Epoch
 	// Domain for the new fork
-	Domain DomainType `ssz-size:"4"`
+	Domain DomainType
 }
 
 func (n NetworkID) Byte() byte {
@@ -88,23 +86,6 @@ func (d DomainType) GetNetworkID() NetworkID {
 	return NetworkID{d[2]}
 }
 
-func (f ForkData) GetRoot() ([]byte, error) {
-	byts, err := f.MarshalSSZ()
-	if err != nil {
-		return nil, errors.Wrap(err, "could not marshal ForkData")
-	}
-	ret := sha256.Sum256(byts)
-	return ret[:], nil
-}
-
-func (f *ForkData) Encode() ([]byte, error) {
-	return f.MarshalSSZ()
-}
-
-func (f *ForkData) Decode(data []byte) error {
-	return f.UnmarshalSSZ(data)
-}
-
 // mainnetForks returns all forks for the mainnet chain
 func mainnetForks() []*ForkData {
 	return []*ForkData{

types/generate.go

@@ -17,6 +17,3 @@ package types
 
 //go:generate rm -f ./consensus_data_encoding.go
 //go:generate go run github.com/ferranbt/fastssz/sszgen --path consensus_data.go --include ./operator.go,./signer.go,./partial_sig_message.go,./beacon_types.go,$GOPATH/pkg/mod/github.com/attestantio/go-eth2-client@v0.16.3/spec/phase0,$GOPATH/pkg/mod/github.com/attestantio/go-eth2-client@v0.16.3/spec,$GOPATH/pkg/mod/github.com/attestantio/go-eth2-client@v0.16.3/spec/altair --exclude-objs Contributions,BeaconNetwork,BeaconRole
-
-//go:generate rm -f ./domain_type_encoding.go
-//go:generate go run github.com/ferranbt/fastssz/sszgen --path domain_type.go --include $GOPATH/pkg/mod/github.com/attestantio/go-eth2-client@v0.16.3/spec/phase0 --exclude-objs NetworkID,DomainType

types/spectest/all_tests.go

@@ -6,7 +6,6 @@ import (
 	"github.com/bloxapp/ssv-spec/types/spectest/tests/beacon"
 	"github.com/bloxapp/ssv-spec/types/spectest/tests/consensusdata"
 	consensusdataproposer "github.com/bloxapp/ssv-spec/types/spectest/tests/consensusdata/proposer"
-	"github.com/bloxapp/ssv-spec/types/spectest/tests/forkdata"
 	"github.com/bloxapp/ssv-spec/types/spectest/tests/ssz"
 
 	"github.com/bloxapp/ssv-spec/types/spectest/tests/encryption"
@@ -65,6 +64,4 @@ var AllTests = []SpecTest{
 	ssz.SSZWithdrawalsMarshaling(),
 
 	beacon.DepositData(),
-
-	forkdata.Encoding(),
 }

types/spectest/run_test.go

@@ -15,7 +15,6 @@ import (
 	"github.com/bloxapp/ssv-spec/types/spectest/tests/consensusdata"
 	consensusdataproposer "github.com/bloxapp/ssv-spec/types/spectest/tests/consensusdata/proposer"
 	"github.com/bloxapp/ssv-spec/types/spectest/tests/encryption"
-	"github.com/bloxapp/ssv-spec/types/spectest/tests/forkdata"
 	"github.com/bloxapp/ssv-spec/types/spectest/tests/partialsigmessage"
 	"github.com/bloxapp/ssv-spec/types/spectest/tests/share"
 	"github.com/bloxapp/ssv-spec/types/spectest/tests/ssvmsg"
@@ -97,12 +96,6 @@ func TestJson(t *testing.T) {
 				typedTest := &beacon.DepositDataSpecTest{}
 				require.NoError(t, json.Unmarshal(byts, &typedTest))
 				typedTest.Run(t)
-			case reflect.TypeOf(&forkdata.EncodingTest{}).String():
-				byts, err := json.Marshal(test)
-				require.NoError(t, err)
-				typedTest := &forkdata.EncodingTest{}
-				require.NoError(t, json.Unmarshal(byts, &typedTest))
-				typedTest.Run(t)
 			default:
 				t.Fatalf("unknown test")
 			}