Remove duplicate actpool metric (iotexproject#63)

Author: zjshen14

actpool/actpool.go

@@ -69,8 +69,6 @@ type ActPool interface {
 	GetSize() uint64
 	// GetCapacity returns the act pool capacity
 	GetCapacity() uint64
-	// GetUnconfirmedActSize returns the unconfirmed action's size
-	GetUnconfirmedActSize() uint64
 }
 
 // actPool implements ActPool interface
@@ -321,19 +319,6 @@ func (ap *actPool) GetCapacity() uint64 {
 	return ap.cfg.MaxNumActsPerPool
 }
 
-// GetUnconfirmedActSize returns the unconfirmed action's size
-func (ap *actPool) GetUnconfirmedActSize() uint64 {
-	ap.mutex.RLock()
-	defer ap.mutex.RUnlock()
-
-	n := uint64(0)
-	for _, queue := range ap.accountActs {
-		n += uint64(queue.Len())
-	}
-
-	return n
-}
-
 //======================================
 // private functions
 //======================================

actpool/actpool_test.go

@@ -862,40 +862,6 @@ func TestActPool_GetSize(t *testing.T) {
 	require.Equal(uint64(0), ap.GetSize())
 }
 
-func TestActPool_GetUnconfirmedActSize(t *testing.T) {
-	require := require.New(t)
-	bc := blockchain.NewBlockchain(&config.Default, blockchain.InMemStateFactoryOption(), blockchain.InMemDaoOption())
-	_, err := bc.CreateState(addr1.RawAddress, uint64(100))
-	require.NoError(err)
-	require.NoError(bc.GetFactory().CommitStateChanges(0, nil, nil, nil))
-	// Create actpool
-	apConfig := getActPoolCfg()
-	Ap, err := NewActPool(bc, apConfig)
-	require.NoError(err)
-	ap, ok := Ap.(*actPool)
-	require.True(ok)
-	require.Zero(ap.GetUnconfirmedActSize())
-
-	tsf1, err := signedTransfer(addr1, addr1, uint64(1), big.NewInt(10))
-	require.NoError(err)
-	tsf2, err := signedTransfer(addr1, addr1, uint64(2), big.NewInt(20))
-	require.NoError(err)
-	tsf3, err := signedTransfer(addr1, addr1, uint64(3), big.NewInt(30))
-	require.NoError(err)
-	vote4, err := signedVote(addr1, addr1, uint64(4))
-	require.NoError(err)
-	require.NoError(ap.AddTsf(tsf1))
-	require.NoError(ap.AddTsf(tsf2))
-	require.NoError(ap.AddTsf(tsf3))
-	require.NoError(ap.AddVote(vote4))
-	require.Equal(uint64(4), ap.GetUnconfirmedActSize())
-
-	require.NoError(bc.GetFactory().CommitStateChanges(0,
-		[]*action.Transfer{tsf1, tsf2, tsf3}, nil, nil))
-	ap.removeConfirmedActs()
-	require.Equal(uint64(1), ap.GetUnconfirmedActSize())
-}
-
 // Helper function to return the correct pending nonce just in case of empty queue
 func (ap *actPool) getPendingNonce(addr string) (uint64, error) {
 	if queue, ok := ap.accountActs[addr]; ok {

server/itx/heartbeat.go

@@ -106,7 +106,6 @@ func (h *HeartbeatHandler) Log() {
 
 	actPoolSize := h.s.actPool.GetSize()
 	actPoolCapacity := h.s.actPool.GetCapacity()
-	pendingActs := h.s.actPool.GetUnconfirmedActSize()
 
 	logger.Info().
 		Uint("numPeers", numPeers).
@@ -119,7 +118,6 @@ func (h *HeartbeatHandler) Log() {
 		Uint64("blockchainHeight", height).
 		Uint64("actpoolSize", actPoolSize).
 		Uint64("actpoolCapacity", actPoolCapacity).
-		Uint64("pendingActions", pendingActs).
 		Msg("node status")
 
 	heartbeatMtc.WithLabelValues("numPeers").Set(float64(numPeers))
@@ -128,6 +126,5 @@ func (h *HeartbeatHandler) Log() {
 	heartbeatMtc.WithLabelValues("blockchainHeight").Set(float64(height))
 	heartbeatMtc.WithLabelValues("actpoolSize").Set(float64(actPoolSize))
 	heartbeatMtc.WithLabelValues("actpoolCapacity").Set(float64(actPoolCapacity))
-	heartbeatMtc.WithLabelValues("pendingActions").Set(float64(actPoolCapacity))
 
 }