diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-06-05 01:47:23 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-06-05 01:47:23 +0800 |
| commit | 45152dead5c6bc144f8ed51ed85d5ef64f783735 (patch) | |
| tree | 48aa51432821a0d49ffa6d2a015c16f4867a1c63 /cmd/utils | |
| parent | 10fc73376789b1b016fbbd86df3b378df0238a0c (diff) | |
| parent | 912cf7ba049e4bcd5e497c62bb7cb96e7502f1b9 (diff) | |
| download | dexon-45152dead5c6bc144f8ed51ed85d5ef64f783735.tar dexon-45152dead5c6bc144f8ed51ed85d5ef64f783735.tar.gz dexon-45152dead5c6bc144f8ed51ed85d5ef64f783735.tar.bz2 dexon-45152dead5c6bc144f8ed51ed85d5ef64f783735.tar.lz dexon-45152dead5c6bc144f8ed51ed85d5ef64f783735.tar.xz dexon-45152dead5c6bc144f8ed51ed85d5ef64f783735.tar.zst dexon-45152dead5c6bc144f8ed51ed85d5ef64f783735.zip | |
Merge pull request #1181 from obscuren/txpool_fixes
cmd: transaction pool fixes and improvements
Diffstat (limited to 'cmd/utils')
| -rw-r--r-- | cmd/utils/flags.go | 3 |
1 files changed, 1 insertions, 2 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 } |