diff options
| author | Felix Lange <fjl@twurst.com> | 2015-06-03 21:52:25 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-06-04 04:43:23 +0800 |
| commit | ec7a2c34423f9337c238ff07c39a15eb18eed79a (patch) | |
| tree | 3c11cfa14540f246f4cfada5c3a7dc8a197c77b4 /core | |
| parent | 5721c43585100aad82a4c18341e9518c6e91393b (diff) | |
| download | dexon-ec7a2c34423f9337c238ff07c39a15eb18eed79a.tar dexon-ec7a2c34423f9337c238ff07c39a15eb18eed79a.tar.gz dexon-ec7a2c34423f9337c238ff07c39a15eb18eed79a.tar.bz2 dexon-ec7a2c34423f9337c238ff07c39a15eb18eed79a.tar.lz dexon-ec7a2c34423f9337c238ff07c39a15eb18eed79a.tar.xz dexon-ec7a2c34423f9337c238ff07c39a15eb18eed79a.tar.zst dexon-ec7a2c34423f9337c238ff07c39a15eb18eed79a.zip | |
core: don't remove transactions after block processing
The transaction pool drops processed transactions on its own
during pool maintenance.
Diffstat (limited to 'core')
| -rw-r--r-- | core/block_processor.go | 5 | ||||
| -rw-r--r-- | core/block_processor_test.go | 2 | ||||
| -rw-r--r-- | core/chain_makers.go | 3 | ||||
| -rw-r--r-- | core/chain_manager_test.go | 6 |
4 files changed, 5 insertions, 11 deletions
diff --git a/core/block_processor.go b/core/block_processor.go index 9a013b280..190e72694 100644 --- a/core/block_processor.go +++ b/core/block_processor.go @@ -38,14 +38,12 @@ type BlockProcessor struct { // Proof of work used for validating Pow pow.PoW - txpool *TxPool - events event.Subscription eventMux *event.TypeMux } -func NewBlockProcessor(db, extra common.Database, pow pow.PoW, txpool *TxPool, chainManager *ChainManager, eventMux *event.TypeMux) *BlockProcessor { +func NewBlockProcessor(db, extra common.Database, pow pow.PoW, chainManager *ChainManager, eventMux *event.TypeMux) *BlockProcessor { sm := &BlockProcessor{ db: db, extraDb: extra, @@ -53,7 +51,6 @@ func NewBlockProcessor(db, extra common.Database, pow pow.PoW, txpool *TxPool, c Pow: pow, bc: chainManager, eventMux: eventMux, - txpool: txpool, } return sm diff --git a/core/block_processor_test.go b/core/block_processor_test.go index 72b173a71..b52c3d3f8 100644 --- a/core/block_processor_test.go +++ b/core/block_processor_test.go @@ -17,7 +17,7 @@ func proc() (*BlockProcessor, *ChainManager) { var mux event.TypeMux chainMan := NewChainManager(db, db, thePow(), &mux) - return NewBlockProcessor(db, db, ezp.New(), nil, chainMan, &mux), chainMan + return NewBlockProcessor(db, db, ezp.New(), chainMan, &mux), chainMan } func TestNumber(t *testing.T) { diff --git a/core/chain_makers.go b/core/chain_makers.go index 44f17cc33..3039e52da 100644 --- a/core/chain_makers.go +++ b/core/chain_makers.go @@ -124,8 +124,7 @@ func newChainManager(block *types.Block, eventMux *event.TypeMux, db common.Data // block processor with fake pow func newBlockProcessor(db common.Database, cman *ChainManager, eventMux *event.TypeMux) *BlockProcessor { chainMan := newChainManager(nil, eventMux, db) - txpool := NewTxPool(eventMux, chainMan.State, chainMan.GasLimit) - bman := NewBlockProcessor(db, db, FakePow{}, txpool, chainMan, eventMux) + bman := NewBlockProcessor(db, db, FakePow{}, chainMan, eventMux) return bman } diff --git a/core/chain_manager_test.go b/core/chain_manager_test.go index 7dc7358c0..560e85f77 100644 --- a/core/chain_manager_test.go +++ b/core/chain_manager_test.go @@ -267,8 +267,7 @@ func TestChainInsertions(t *testing.T) { var eventMux event.TypeMux chainMan := NewChainManager(db, db, thePow(), &eventMux) - txPool := NewTxPool(&eventMux, chainMan.State, func() *big.Int { return big.NewInt(100000000) }) - blockMan := NewBlockProcessor(db, db, nil, txPool, chainMan, &eventMux) + blockMan := NewBlockProcessor(db, db, nil, chainMan, &eventMux) chainMan.SetProcessor(blockMan) const max = 2 @@ -313,8 +312,7 @@ func TestChainMultipleInsertions(t *testing.T) { } var eventMux event.TypeMux chainMan := NewChainManager(db, db, thePow(), &eventMux) - txPool := NewTxPool(&eventMux, chainMan.State, func() *big.Int { return big.NewInt(100000000) }) - blockMan := NewBlockProcessor(db, db, nil, txPool, chainMan, &eventMux) + blockMan := NewBlockProcessor(db, db, nil, chainMan, &eventMux) chainMan.SetProcessor(blockMan) done := make(chan bool, max) for i, chain := range chains { |