From 5310e685964ee8cfb98a0dad21dea665276a6c3c Mon Sep 17 00:00:00 2001 From: Arpit Temani Date: Thu, 9 Nov 2023 22:14:00 +0530 Subject: [PATCH] remove blobpool --- core/txpool/txpool.go | 2 -- eth/backend.go | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/core/txpool/txpool.go b/core/txpool/txpool.go index 2d015e2964..b0e91fee6c 100644 --- a/core/txpool/txpool.go +++ b/core/txpool/txpool.go @@ -200,9 +200,7 @@ func (p *TxPool) loop(head *types.Header, chain BlockChain) { case resetBusy <- struct{}{}: // Busy marker injected, start a new subpool reset go func(oldHead, newHead *types.Header) { - fmt.Println("-------------- subpools length", len(p.subpools)) for _, subpool := range p.subpools { - fmt.Println("--------------- in subpools", subpool) subpool.Reset(oldHead, newHead) } resetDone <- newHead diff --git a/eth/backend.go b/eth/backend.go index 52dfa759ee..e21e760d60 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -39,7 +39,6 @@ import ( "github.com/ethereum/go-ethereum/core/rawdb" "github.com/ethereum/go-ethereum/core/state/pruner" "github.com/ethereum/go-ethereum/core/txpool" - "github.com/ethereum/go-ethereum/core/txpool/blobpool" "github.com/ethereum/go-ethereum/core/txpool/legacypool" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/vm" @@ -259,14 +258,13 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) { if config.BlobPool.Datadir != "" { config.BlobPool.Datadir = stack.ResolvePath(config.BlobPool.Datadir) } - blobPool := blobpool.New(config.BlobPool, eth.blockchain) if config.TxPool.Journal != "" { config.TxPool.Journal = stack.ResolvePath(config.TxPool.Journal) } legacyPool := legacypool.New(config.TxPool, eth.blockchain) - eth.txPool, err = txpool.New(new(big.Int).SetUint64(config.TxPool.PriceLimit), eth.blockchain, []txpool.SubPool{legacyPool, blobPool}) + eth.txPool, err = txpool.New(new(big.Int).SetUint64(config.TxPool.PriceLimit), eth.blockchain, []txpool.SubPool{legacyPool}) if err != nil { return nil, err }