Pusher engine refactor: remove unused collection metrics

onflow · Nov 30, 2024 · ad04f27 · ad04f27
1 parent aad332c
commit ad04f27
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 7 deletions.
diff --git a/cmd/collection/main.go b/cmd/collection/main.go
@@ -481,7 +481,6 @@ func main() {
 				node.State,
 				node.Metrics.Engine,
 				node.Metrics.Mempool,
-				colMetrics,
 				node.Me,
 				node.Storage.Collections,
 				node.Storage.Transactions,

diff --git a/engine/collection/pusher/engine.go b/engine/collection/pusher/engine.go
@@ -31,7 +31,6 @@ import (
 type Engine struct {
 	log          zerolog.Logger
 	engMetrics   module.EngineMetrics
-	colMetrics   module.CollectionMetrics
 	conduit      network.Conduit
 	me           module.Local
 	state        protocol.State
@@ -56,7 +55,6 @@ func New(
 	state protocol.State,
 	engMetrics module.EngineMetrics,
 	mempoolMetrics module.MempoolMetrics,
-	colMetrics module.CollectionMetrics,
 	me module.Local,
 	collections storage.Collections,
 	transactions storage.Transactions,
@@ -76,7 +74,6 @@ func New(
 	e := &Engine{
 		log:          log.With().Str("engine", "pusher").Logger(),
 		engMetrics:   engMetrics,
-		colMetrics:   colMetrics,
 		me:           me,
 		state:        state,
 		collections:  collections,
@@ -100,7 +97,7 @@ func New(
 	return e, nil
 }
 
-// outboundQueueWorker implements a component worker which broadcasts collection guarantees, 
+// outboundQueueWorker implements a component worker which broadcasts collection guarantees,
 // enqueued by the Finalizer upon finalization, to Consensus Nodes.
 func (e *Engine) outboundQueueWorker(ctx irrecoverable.SignalerContext, ready component.ReadyFunc) {
 	ready()

diff --git a/engine/collection/pusher/engine_test.go b/engine/collection/pusher/engine_test.go
@@ -72,7 +72,6 @@ func (suite *Suite) SetupTest() {
 		suite.state,
 		metrics,
 		metrics,
-		metrics,
 		suite.me,
 		suite.collections,
 		suite.transactions,

diff --git a/engine/testutil/nodes.go b/engine/testutil/nodes.go
@@ -313,7 +313,7 @@ func CollectionNode(t *testing.T, hub *stub.Hub, identity bootstrap.NodeInfo, ro
 		retrieve)
 	require.NoError(t, err)
 
-	pusherEngine, err := pusher.New(node.Log, node.Net, node.State, node.Metrics, node.Metrics, node.Metrics, node.Me, collections, transactions)
+	pusherEngine, err := pusher.New(node.Log, node.Net, node.State, node.Metrics, node.Metrics, node.Me, collections, transactions)
 	require.NoError(t, err)
 
 	clusterStateFactory, err := factories.NewClusterStateFactory(