forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-06-20 13:44:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore!(core/types): change method names of JSON header hooks (#125)

Browse source 
- MarshalJSON -> EncodeJSON
- UnmarshalJSON -> DecodeJSON
- Placates the gopls forced linter
- Aligns with EncodeRLP and DecodeRLP hook functions
This commit is contained in:
Quentin McGaw 2025-02-10 17:48:50 +01:00 committed by GitHub
parent 9125583d8e
commit f6832f23bc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/types/block.libevm.go
View file

@ -29,8 +29,8 @@ import (
// HeaderHooks are required for all types registered with [RegisterExtras] for
// [Header] payloads.
type HeaderHooks interface {
MarshalJSON(*Header) ([]byte, error) //nolint:govet // Type-specific override hook
UnmarshalJSON(*Header, []byte) error //nolint:govet
EncodeJSON(*Header) ([]byte, error)
DecodeJSON(*Header, []byte) error
EncodeRLP(*Header, io.Writer) error
DecodeRLP(*Header, *rlp.Stream) error
PostCopy(dst *Header)
@ -58,12 +58,12 @@ var _ interface {
// MarshalJSON implements the [json.Marshaler] interface.
func (h *Header) MarshalJSON() ([]byte, error) {
return h.hooks().MarshalJSON(h)
return h.hooks().EncodeJSON(h)
}
// UnmarshalJSON implements the [json.Unmarshaler] interface.
func (h *Header) UnmarshalJSON(b []byte) error {
return h.hooks().UnmarshalJSON(h, b)
return h.hooks().DecodeJSON(h, b)
}
// EncodeRLP implements the [rlp.Encoder] interface.
@ -94,11 +94,11 @@ type NOOPHeaderHooks struct{}
var _ HeaderHooks = (*NOOPHeaderHooks)(nil)
func (*NOOPHeaderHooks) MarshalJSON(h *Header) ([]byte, error) { //nolint:govet
func (*NOOPHeaderHooks) EncodeJSON(h *Header) ([]byte, error) {
return h.marshalJSON()
}
func (*NOOPHeaderHooks) UnmarshalJSON(h *Header, b []byte) error { //nolint:govet
func (*NOOPHeaderHooks) DecodeJSON(h *Header, b []byte) error {
return h.unmarshalJSON(b)
}

4
core/types/block.libevm_test.go
View file

@ -51,11 +51,11 @@ func fakeHeaderRLP(h *Header, suffix []byte) []byte {
return append(crypto.Keccak256(h.ParentHash[:]), suffix...)
}
func (hh *stubHeaderHooks) MarshalJSON(h *Header) ([]byte, error) { //nolint:govet
func (hh *stubHeaderHooks) EncodeJSON(h *Header) ([]byte, error) {
return fakeHeaderJSON(h, hh.suffix), hh.errMarshal
}
func (hh *stubHeaderHooks) UnmarshalJSON(h *Header, b []byte) error { //nolint:govet
func (hh *stubHeaderHooks) DecodeJSON(h *Header, b []byte) error {
hh.gotRawJSONToUnmarshal = b
*h = hh.setHeaderToOnUnmarshalOrDecode
return hh.errUnmarshal