mirror of
https://gitlab.com/pulsechaincom/erigon-pulse.git
synced 2024-12-23 12:07:17 +00:00
cmd/utils, eth: core.NewBlockProcessor no longer needs TxPool
This commit is contained in:
parent
ec7a2c3442
commit
5197aed7db
@ -345,8 +345,7 @@ func MakeChain(ctx *cli.Context) (chain *core.ChainManager, blockDB, stateDB, ex
|
|||||||
eventMux := new(event.TypeMux)
|
eventMux := new(event.TypeMux)
|
||||||
pow := ethash.New()
|
pow := ethash.New()
|
||||||
chain = core.NewChainManager(blockDB, stateDB, pow, eventMux)
|
chain = core.NewChainManager(blockDB, stateDB, pow, eventMux)
|
||||||
txpool := core.NewTxPool(eventMux, chain.State, chain.GasLimit)
|
proc := core.NewBlockProcessor(stateDB, extraDB, pow, chain, eventMux)
|
||||||
proc := core.NewBlockProcessor(stateDB, extraDB, pow, txpool, chain, eventMux)
|
|
||||||
chain.SetProcessor(proc)
|
chain.SetProcessor(proc)
|
||||||
return chain, blockDB, stateDB, extraDB
|
return chain, blockDB, stateDB, extraDB
|
||||||
}
|
}
|
||||||
|
@ -288,7 +288,7 @@ func New(config *Config) (*Ethereum, error) {
|
|||||||
eth.chainManager = core.NewChainManager(blockDb, stateDb, eth.pow, eth.EventMux())
|
eth.chainManager = core.NewChainManager(blockDb, stateDb, eth.pow, eth.EventMux())
|
||||||
eth.downloader = downloader.New(eth.EventMux(), eth.chainManager.HasBlock, eth.chainManager.GetBlock)
|
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.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.chainManager.SetProcessor(eth.blockProcessor)
|
||||||
eth.miner = miner.New(eth, eth.EventMux(), eth.pow)
|
eth.miner = miner.New(eth, eth.EventMux(), eth.pow)
|
||||||
eth.miner.SetGasPrice(config.GasPrice)
|
eth.miner.SetGasPrice(config.GasPrice)
|
||||||
|
Loading…
Reference in New Issue
Block a user