From b8d64aa30a3af8dfecb2a566f0bf63ae058345fd Mon Sep 17 00:00:00 2001 From: Jared Wasinger Date: Tue, 22 Apr 2025 16:22:19 +0800 Subject: [PATCH] fix --- eth/downloader/metrics.go | 2 -- eth/downloader/queue.go | 20 +++----------------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/eth/downloader/metrics.go b/eth/downloader/metrics.go index 82b826dedd..608b39828b 100644 --- a/eth/downloader/metrics.go +++ b/eth/downloader/metrics.go @@ -31,8 +31,6 @@ var ( bodyReqTimer = metrics.NewRegisteredTimer("eth/downloader/bodies/req", nil) bodyDropMeter = metrics.NewRegisteredMeter("eth/downloader/bodies/drop", nil) bodyTimeoutMeter = metrics.NewRegisteredMeter("eth/downloader/bodies/timeout", nil) - - blockSizeGauge = metrics.NewRegisteredGauge("eth/downloader/blocks/size", nil) pendingBodyGauge = metrics.NewRegisteredGauge("eth/downloader/bodies/pending", nil) receiptInMeter = metrics.NewRegisteredMeter("eth/downloader/receipts/in", nil) diff --git a/eth/downloader/queue.go b/eth/downloader/queue.go index 5faafe5fa9..f11e02f806 100644 --- a/eth/downloader/queue.go +++ b/eth/downloader/queue.go @@ -22,11 +22,6 @@ package downloader import ( "errors" "fmt" - "sync" - "sync/atomic" - "time" - "unsafe" - "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/prque" "github.com/ethereum/go-ethereum/core/types" @@ -35,6 +30,9 @@ import ( "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/metrics" "github.com/ethereum/go-ethereum/params" + "sync" + "sync/atomic" + "time" ) const ( @@ -89,18 +87,6 @@ func newFetchResult(header *types.Header, snapSync bool) *fetchResult { return item } -func (f *fetchResult) Size() int { - receiptsSize := 0 - for _, r := range f.Receipts { - receiptsSize += int(r.Size()) - } - txsSize := 0 - for _, t := range f.Transactions { - txsSize += int(t.Size()) - } - return common.HashLength*len(f.Uncles) + int(unsafe.Sizeof(types.Withdrawal{})) + int(f.Header.Size()) + receiptsSize + txsSize -} - // body returns a representation of the fetch result as a types.Body object. func (f *fetchResult) body() types.Body { return types.Body{