diff options
| -rw-r--r-- | cmd/utils/flags.go | 3 | ||||
| -rw-r--r-- | eth/backend.go | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index d319055b1..909d7815e 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -345,8 +345,7 @@ func MakeChain(ctx *cli.Context) (chain *core.ChainManager, blockDB, stateDB, ex eventMux := new(event.TypeMux) pow := ethash.New() chain = core.NewChainManager(blockDB, stateDB, pow, eventMux) - txpool := core.NewTxPool(eventMux, chain.State, chain.GasLimit) - proc := core.NewBlockProcessor(stateDB, extraDB, pow, txpool, chain, eventMux) + proc := core.NewBlockProcessor(stateDB, extraDB, pow, chain, eventMux) chain.SetProcessor(proc) return chain, blockDB, stateDB, extraDB } diff --git a/eth/backend.go b/eth/backend.go index 98939b1fa..724763a52 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -288,7 +288,7 @@ func New(config *Config) (*Ethereum, error) { eth.chainManager = core.NewChainManager(blockDb, stateDb, eth.pow, eth.EventMux()) eth.downloader = downloader.New(eth.EventMux(), eth.chainManager.HasBlock, eth.chainManager.GetBlock) eth.txPool = core.NewTxPool(eth.EventMux(), eth.chainManager.State, eth.chainManager.GasLimit) - eth.blockProcessor = core.NewBlockProcessor(stateDb, extraDb, eth.pow, eth.txPool, eth.chainManager, eth.EventMux()) + eth.blockProcessor = core.NewBlockProcessor(stateDb, extraDb, eth.pow, eth.chainManager, eth.EventMux()) eth.chainManager.SetProcessor(eth.blockProcessor) eth.miner = miner.New(eth, eth.EventMux(), eth.pow) eth.miner.SetGasPrice(config.GasPrice) |