diff options
| author | Felix Lange <fjl@twurst.com> | 2015-06-03 21:56:25 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-06-04 04:43:23 +0800 |
| commit | 5197aed7dbba2ac19d99221efe33fede82007f5d (patch) | |
| tree | 98d7870254d9a6a4298ecdcc3d532998486d5f68 | |
| parent | ec7a2c34423f9337c238ff07c39a15eb18eed79a (diff) | |
| download | go-tangerine-5197aed7dbba2ac19d99221efe33fede82007f5d.tar go-tangerine-5197aed7dbba2ac19d99221efe33fede82007f5d.tar.gz go-tangerine-5197aed7dbba2ac19d99221efe33fede82007f5d.tar.bz2 go-tangerine-5197aed7dbba2ac19d99221efe33fede82007f5d.tar.lz go-tangerine-5197aed7dbba2ac19d99221efe33fede82007f5d.tar.xz go-tangerine-5197aed7dbba2ac19d99221efe33fede82007f5d.tar.zst go-tangerine-5197aed7dbba2ac19d99221efe33fede82007f5d.zip | |
cmd/utils, eth: core.NewBlockProcessor no longer needs TxPool
| -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) |