From 7e31df39877d95446b48c8064e55ebef48d4e5c6 Mon Sep 17 00:00:00 2001 From: Bas van Kervel Date: Fri, 10 Jul 2015 11:35:15 +0200 Subject: bugfix, pending transaction was resend with new gas price/limit but not removed from transaction pool --- core/transaction_pool.go | 5 +++-- core/transaction_pool_test.go | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'core') diff --git a/core/transaction_pool.go b/core/transaction_pool.go index e02a3a6ac..eb4c374c2 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 fdd0a7872..9d4cb40b4 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)) -- cgit v1.2.3