Skip to content

Commit

Permalink
fix again
Browse files Browse the repository at this point in the history
  • Loading branch information
cristaloleg committed Dec 2, 2024
1 parent c462b99 commit 31f00cd
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 14 deletions.
17 changes: 6 additions & 11 deletions header/header.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down Expand Up @@ -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{}
21 changes: 18 additions & 3 deletions header/headertest/verify_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,23 +30,38 @@ 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
},
err: header.ErrValidatorHashMismatch,
},
{
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
},
err: header.ErrLastHeaderHashMismatch,
},
{
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
},
Expand Down

0 comments on commit 31f00cd

Please sign in to comment.