batch update 2019-04-20

Author: iotex-dev

Makefile

@@ -52,4 +52,4 @@ clean:
 .PHONY: run
 run:
 	$(GOBUILD) -o ./bin/$(BUILD_TARGET_SERVER) -v ./$(BUILD_TARGET_SERVER)
-	./bin/$(BUILD_TARGET_SERVER) -stderrthreshold=WARNING -log_dir=./log
+	./bin/$(BUILD_TARGET_SERVER) -stderrthreshold=WARNING -log_dir=./log -config=e2etests/config_local_delegate.yaml

README.md

@@ -1,5 +1,5 @@
 [![Go version](https://img.shields.io/badge/go-1.9.2-blue.svg)](https://github.com/moovweb/gvm)
-[![CircleCI](https://circleci.com/gh/iotexproject/iotex-core/tree/master.svg?style=svg)](https://circleci.com/gh/iotexproject/iotex-core/tree/master)
+[![CircleCI](https://circleci.com/gh/iotexproject/iotex-core/tree/master.svg?style=svg&circle-token=905df94e89f57084aee6a0a2a57d14c44e37bccb)](https://circleci.com/gh/iotexproject/iotex-core/tree/master)
 
 # iotex-core
 Welcome to the official Go implementation of IoTeX protocol! IoTeX is building the next generation of the decentralized 

txpool/txpool.go

@@ -66,47 +66,6 @@ func NewTxSourcePointer(in *blockchain.TxInput) TxSourcePointer {
 	}
 }
 
-type txDescPriorityQueue []*TxDesc
-
-func (pq txDescPriorityQueue) Len() int {
-	return len(pq)
-}
-
-func (pq txDescPriorityQueue) Less(i, j int) bool {
-	return pq[i].Priority > pq[j].Priority
-}
-
-func (pq txDescPriorityQueue) Swap(i, j int) {
-	pq[i], pq[j] = pq[j], pq[i]
-	pq[i].idx = i
-	pq[j].idx = j
-}
-
-func (pq *txDescPriorityQueue) Push(x interface{}) {
-	n := len(*pq)
-	txDesc := x.(*TxDesc)
-	txDesc.idx = n
-	*pq = append(*pq, txDesc)
-}
-
-func (pq *txDescPriorityQueue) Pop() interface{} {
-	n := len(*pq)
-	old := *pq
-	txDesc := old[n-1]
-	txDesc.idx = -1
-	*pq = old[0 : n-1]
-	return txDesc
-}
-
-func (pq *txDescPriorityQueue) Delete(i int) interface{} {
-	n := len(*pq)
-	pq.Swap(i, n-1)
-	txDesc := pq.Pop()
-	heap.Fix(pq, i)
-
-	return txDesc
-}
-
 // TxPool is a pool of received txs
 type TxPool interface {
 	// RemoveOrphanTx remove an orphan transaction, but not its descendants
@@ -388,8 +347,8 @@ func (tp *txPool) removeTx(tx *blockchain.Tx, removeDescendants bool) {
 		delete(tp.txSourcePointers, NewTxSourcePointer(txIn))
 	}
 
-	// TODO: soft delete desc from txDescPriorityQueue
-	//tp.txDescPriorityQueue.Delete(desc.idx)
+	// Use the heap built-in Remove() to remove TxDesc pointer from txDescPriorityQueue
+	heap.Remove(&tp.txDescPriorityQueue, desc.idx)
 	delete(tp.txDescs, hash)
 	tp.setLastUpdateUnixTime()
 }

txpool/txpq.go

@@ -0,0 +1,39 @@
+// Copyright (c) 2018 IoTeX
+// This is an alpha (internal) release and is not suitable for production. This source code is provided ‘as is’ and no
+// warranties are given as to title or non-infringement, merchantability or fitness for purpose and, to the extent
+// permitted by law, all liability for your use of the code is disclaimed. This source code is governed by Apache
+// License 2.0 that can be found in the LICENSE file.
+
+package txpool
+
+type txDescPriorityQueue []*TxDesc
+
+func (pq txDescPriorityQueue) Len() int {
+	return len(pq)
+}
+
+func (pq txDescPriorityQueue) Less(i, j int) bool {
+	return pq[i].Priority > pq[j].Priority
+}
+
+func (pq txDescPriorityQueue) Swap(i, j int) {
+	pq[i], pq[j] = pq[j], pq[i]
+	pq[i].idx = i
+	pq[j].idx = j
+}
+
+func (pq *txDescPriorityQueue) Push(x interface{}) {
+	n := len(*pq)
+	txDesc := x.(*TxDesc)
+	txDesc.idx = n
+	*pq = append(*pq, txDesc)
+}
+
+func (pq *txDescPriorityQueue) Pop() interface{} {
+	n := len(*pq)
+	old := *pq
+	txDesc := old[n-1]
+	txDesc.idx = -1
+	*pq = old[0 : n-1]
+	return txDesc
+}

txpool/txpq_test.go

@@ -0,0 +1,96 @@
+// Copyright (c) 2018 IoTeX
+// This is an alpha (internal) release and is not suitable for production. This source code is provided ‘as is’ and no
+// warranties are given as to title or non-infringement, merchantability or fitness for purpose and, to the extent
+// permitted by law, all liability for your use of the code is disclaimed. This source code is governed by Apache
+// License 2.0 that can be found in the LICENSE file.
+
+package txpool
+
+import (
+	"container/heap"
+	"math/rand"
+	"testing"
+	"time"
+
+	"github.com/iotexproject/iotex-core/blockchain"
+)
+
+func TestTxPq(t *testing.T) {
+	// Create four dummy TxDescs
+	// TxDesc1
+	desc1 := TxDesc{
+		Tx:          &blockchain.Tx{},
+		AddedTime:   time.Now(),
+		BlockHeight: uint32(1),
+		Fee:         int64(0),
+		FeePerKB:    int64(0),
+		Priority:    float64(100),
+	}
+
+	// TxDesc2
+	desc2 := TxDesc{
+		Tx:          &blockchain.Tx{},
+		AddedTime:   time.Now(),
+		BlockHeight: uint32(1),
+		Fee:         int64(0),
+		FeePerKB:    int64(0),
+		Priority:    float64(50),
+	}
+
+	// TxDesc3
+	desc3 := TxDesc{
+		Tx:          &blockchain.Tx{},
+		AddedTime:   time.Now(),
+		BlockHeight: uint32(1),
+		Fee:         int64(0),
+		FeePerKB:    int64(0),
+		Priority:    float64(1000),
+	}
+
+	// TxDesc4
+	desc4 := TxDesc{
+		Tx:          &blockchain.Tx{},
+		AddedTime:   time.Now(),
+		BlockHeight: uint32(1),
+		Fee:         int64(0),
+		FeePerKB:    int64(0),
+		Priority:    float64(5),
+	}
+
+	// Initialize a txDescPriorityQueue
+	pq := txDescPriorityQueue{}
+
+	// Test Push implementation
+	heap.Push(&pq, &desc1)
+	heap.Push(&pq, &desc2)
+	heap.Push(&pq, &desc3)
+	heap.Push(&pq, &desc4)
+
+	t.Log("The priority of each TxDesc in the order of popped is as follows:")
+
+	// Test Pop implementation
+	for pq.Len() > 0 {
+		txDesc := heap.Pop(&pq).(*TxDesc)
+		t.Log(txDesc.Priority)
+		t.Log()
+	}
+
+	// Repush the four dummy TxDescs back to the txDescPriorityQueue
+	heap.Push(&pq, &desc1)
+	heap.Push(&pq, &desc2)
+	heap.Push(&pq, &desc3)
+	heap.Push(&pq, &desc4)
+
+	// Test built-in Remove implementation
+	// Remove a random *txDesc from txDescPriorityQueue
+	rand.Seed(time.Now().UnixNano())
+	heap.Remove(&pq, rand.Intn(pq.Len()))
+
+	t.Log("After randomly removing a TxDesc, the priority of each remaining TxDesc in the order of popped is as follows:")
+
+	for pq.Len() > 0 {
+		txDesc := heap.Pop(&pq).(*TxDesc)
+		t.Log(txDesc.Priority)
+		t.Log()
+	}
+}