aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorBas van Kervel <bas@ethdev.com>2015-07-10 17:35:15 +0800
committerBas van Kervel <bas@ethdev.com>2015-07-28 16:42:31 +0800
commit7e31df39877d95446b48c8064e55ebef48d4e5c6 (patch)
tree7092be5bdfe8cff0c7ec014576b87add78b8f79b /core
parent5a810758dbe75dce9537d464ac0e5b5385b0e78f (diff)
downloaddexon-7e31df39877d95446b48c8064e55ebef48d4e5c6.tar
dexon-7e31df39877d95446b48c8064e55ebef48d4e5c6.tar.gz
dexon-7e31df39877d95446b48c8064e55ebef48d4e5c6.tar.bz2
dexon-7e31df39877d95446b48c8064e55ebef48d4e5c6.tar.lz
dexon-7e31df39877d95446b48c8064e55ebef48d4e5c6.tar.xz
dexon-7e31df39877d95446b48c8064e55ebef48d4e5c6.tar.zst
dexon-7e31df39877d95446b48c8064e55ebef48d4e5c6.zip
bugfix, pending transaction was resend with new gas price/limit but not removed from transaction 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 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))