aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2015-08-02 07:18:54 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2015-08-02 07:18:54 +0800
commit33efb3381c8b862f8086a4b5c5d3b7d6b2b1f47b (patch)
treea32d0565fb5b4a38ce91453ba93b80a2bcd21e46 /core
parenta8b39b5cc0dff46e5834826fac6f37e39ee4c3b3 (diff)
parent7e31df39877d95446b48c8064e55ebef48d4e5c6 (diff)
downloaddexon-33efb3381c8b862f8086a4b5c5d3b7d6b2b1f47b.tar
dexon-33efb3381c8b862f8086a4b5c5d3b7d6b2b1f47b.tar.gz
dexon-33efb3381c8b862f8086a4b5c5d3b7d6b2b1f47b.tar.bz2
dexon-33efb3381c8b862f8086a4b5c5d3b7d6b2b1f47b.tar.lz
dexon-33efb3381c8b862f8086a4b5c5d3b7d6b2b1f47b.tar.xz
dexon-33efb3381c8b862f8086a4b5c5d3b7d6b2b1f47b.tar.zst
dexon-33efb3381c8b862f8086a4b5c5d3b7d6b2b1f47b.zip
Merge pull request #1461 from bas-vk/eth_resend
Old transaction after resend was not removed from pool
Diffstat (limited to 'core')
-rw-r--r--core/transaction_pool.go5
-rw-r--r--core/transaction_pool_test.go2
2 files changed, 4 insertions, 3 deletions
diff --git a/core/transaction_pool.go b/core/transaction_pool.go
index 2a6666ea1..42bf2fc51 100644
--- a/core/transaction_pool.go
+++ b/core/transaction_pool.go
@@ -356,11 +356,12 @@ func (self *TxPool) RemoveTransactions(txs types.Transactions) {
self.mu.Lock()
defer self.mu.Unlock()
for _, tx := range txs {
- self.removeTx(tx.Hash())
+ self.RemoveTx(tx.Hash())
}
}
-func (pool *TxPool) removeTx(hash common.Hash) {
+// RemoveTx removes the transaction with the given hash from the pool.
+func (pool *TxPool) RemoveTx(hash common.Hash) {
// delete from pending pool
delete(pool.pending, hash)
// delete from queue
diff --git a/core/transaction_pool_test.go b/core/transaction_pool_test.go
index 26af4fc16..7d0984740 100644
--- a/core/transaction_pool_test.go
+++ b/core/transaction_pool_test.go
@@ -130,7 +130,7 @@ func TestRemoveTx(t *testing.T) {
t.Error("expected txs to be 1, got", len(pool.pending))
}
- pool.removeTx(tx.Hash())
+ pool.RemoveTx(tx.Hash())
if len(pool.queue) > 0 {
t.Error("expected queue to be 0, got", len(pool.queue))