From 72fb873bd83a70242480028b6b1ef4a76c0ecd91 Mon Sep 17 00:00:00 2001 From: jsvisa Date: Sat, 26 Aug 2023 22:01:24 +0800 Subject: [PATCH] Revert "core/types: implement log.EncodeRLP" This reverts commit fe8bf2df9eebb67beba2f92289b3c141e969c69b. Signed-off-by: jsvisa --- core/types/log.go | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/core/types/log.go b/core/types/log.go index de49210609..54c7ff6372 100644 --- a/core/types/log.go +++ b/core/types/log.go @@ -17,13 +17,13 @@ package types import ( - "io" - "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rlp" ) +//go:generate go run ../../rlp/rlpgen -type Log -out gen_log_rlp.go +//go:generate go run github.com/fjl/gencodec -type Log -field-override logMarshaling -out gen_log_json.go + // Log represents a contract log event. These events are generated by the LOG opcode and // stored/indexed by the node. type Log struct { @@ -53,23 +53,6 @@ type Log struct { Removed bool `json:"removed" rlp:"-"` } -// EncodeRLP implements rlp.Encoder, and flattens all content fields of a log -// into an RLP stream. -func (log *Log) EncodeRLP(_w io.Writer) error { - w := rlp.NewEncoderBuffer(_w) - outerList := w.List() - w.WriteBytes(log.Address[:]) - topicList := w.List() - for _, topic := range log.Topics { - w.WriteBytes(topic[:]) - } - w.ListEnd(topicList) - w.WriteBytes(log.Data) - w.ListEnd(outerList) - return w.Flush() -} - -//go:generate go run github.com/fjl/gencodec -type Log -field-override logMarshaling -out gen_log_json.go type logMarshaling struct { Data hexutil.Bytes BlockNumber hexutil.Uint64