diff --git a/header/header.go b/header/header.go index 4882014fcb..fe7df77616 100644 --- a/header/header.go +++ b/header/header.go @@ -229,7 +229,12 @@ func (eh *ExtendedHeader) UnmarshalBinary(data []byte) error { return err } - *eh = *out.Clone() + *eh = ExtendedHeader{ + RawHeader: out.RawHeader, + Commit: out.Commit, + ValidatorSet: out.ValidatorSet, + DAH: out.DAH, + } return nil } @@ -285,14 +290,4 @@ func (eh *ExtendedHeader) UnmarshalJSON(data []byte) error { return nil } -// Clone creates a shallow copy of the ExtendedHeader and returns it. -func (eh *ExtendedHeader) Clone() *ExtendedHeader { - return &ExtendedHeader{ - RawHeader: eh.RawHeader, - Commit: eh.Commit, - ValidatorSet: eh.ValidatorSet, - DAH: eh.DAH, - } -} - var _ libhead.Header[*ExtendedHeader] = &ExtendedHeader{} diff --git a/header/headertest/verify_test.go b/header/headertest/verify_test.go index 3289fa5dfa..f1140f3601 100644 --- a/header/headertest/verify_test.go +++ b/header/headertest/verify_test.go @@ -30,7 +30,12 @@ func TestVerify(t *testing.T) { }, { prepare: func() *header.ExtendedHeader { - untrusted := *untrustedAdj.Clone() + untrusted := header.ExtendedHeader{ + RawHeader: untrustedAdj.RawHeader, + Commit: untrustedAdj.Commit, + ValidatorSet: untrustedAdj.ValidatorSet, + DAH: untrustedAdj.DAH, + } untrusted.ValidatorsHash = tmrand.Bytes(32) return &untrusted }, @@ -38,7 +43,12 @@ func TestVerify(t *testing.T) { }, { prepare: func() *header.ExtendedHeader { - untrusted := *untrustedAdj.Clone() + untrusted := header.ExtendedHeader{ + RawHeader: untrustedAdj.RawHeader, + Commit: untrustedAdj.Commit, + ValidatorSet: untrustedAdj.ValidatorSet, + DAH: untrustedAdj.DAH, + } untrusted.RawHeader.LastBlockID.Hash = tmrand.Bytes(32) return &untrusted }, @@ -46,7 +56,12 @@ func TestVerify(t *testing.T) { }, { prepare: func() *header.ExtendedHeader { - untrusted := *untrustedNonAdj.Clone() + untrusted := header.ExtendedHeader{ + RawHeader: untrustedNonAdj.RawHeader, + Commit: untrustedNonAdj.Commit, + ValidatorSet: untrustedNonAdj.ValidatorSet, + DAH: untrustedNonAdj.DAH, + } untrusted.Commit = NewTestSuite(t, 2, 0).Commit(RandRawHeader(t)) return &untrusted },