diff options
author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-04-23 17:59:56 +0800 |
---|---|---|
committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-04-23 17:59:56 +0800 |
commit | 2f8809df404b83824ffadd61ff766cbf9e4c5419 (patch) | |
tree | d3c168060e3efffb945079be1d221d14b4ec79d1 /core/block_processor.go | |
parent | 2fe54ab233c0cd1bf09b49085477c961dcc1980f (diff) | |
parent | 7f14fbd57936cf74627572da4a06585d35161ea9 (diff) | |
download | go-tangerine-2f8809df404b83824ffadd61ff766cbf9e4c5419.tar go-tangerine-2f8809df404b83824ffadd61ff766cbf9e4c5419.tar.gz go-tangerine-2f8809df404b83824ffadd61ff766cbf9e4c5419.tar.bz2 go-tangerine-2f8809df404b83824ffadd61ff766cbf9e4c5419.tar.lz go-tangerine-2f8809df404b83824ffadd61ff766cbf9e4c5419.tar.xz go-tangerine-2f8809df404b83824ffadd61ff766cbf9e4c5419.tar.zst go-tangerine-2f8809df404b83824ffadd61ff766cbf9e4c5419.zip |
Merge pull request #769 from obscuren/develop
core: transaction queue
Diffstat (limited to 'core/block_processor.go')
-rw-r--r-- | core/block_processor.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/block_processor.go b/core/block_processor.go index f33f0d433..af47069ad 100644 --- a/core/block_processor.go +++ b/core/block_processor.go @@ -258,7 +258,7 @@ func (sm *BlockProcessor) processWithParent(block, parent *types.Block) (logs st state.Sync() // Remove transactions from the pool - sm.txpool.RemoveSet(block.Transactions()) + sm.txpool.RemoveTransactions(block.Transactions()) // This puts transactions in a extra db for rpc for i, tx := range block.Transactions() { |