From 78b8557c753f2fba838e428393dc3e116b991d97 Mon Sep 17 00:00:00 2001
From: rene <41963722+renaynay@users.noreply.github.com>
Date: Sat, 23 Dec 2023 17:36:31 +0100
Subject: [PATCH] fix(nodebuilder/header): header metrics initialisation now
 moved to store construction due to dep bump

---
 nodebuilder/header/constructors.go | 14 ++++++--------
 share/eds/byzantine/byzantine.go   |  3 ++-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/nodebuilder/header/constructors.go b/nodebuilder/header/constructors.go
index 15d2da09b1..a78d609d8e 100644
--- a/nodebuilder/header/constructors.go
+++ b/nodebuilder/header/constructors.go
@@ -99,16 +99,14 @@ func newInitStore[H libhead.Header[H]](
 	ds datastore.Batching,
 	ex libhead.Exchange[H],
 ) (libhead.Store[H], error) {
-	s, err := store.NewStore[H](ds, store.WithParams(cfg.Store))
-	if err != nil {
-		return nil, err
+	opts := []store.Option{store.WithParams(cfg.Store)}
+	if MetricsEnabled {
+		opts = append(opts, store.WithMetrics())
 	}
 
-	if MetricsEnabled {
-		err = libhead.WithMetrics[H](s)
-		if err != nil {
-			return nil, err
-		}
+	s, err := store.NewStore[H](ds, opts...)
+	if err != nil {
+		return nil, err
 	}
 
 	trustedHash, err := cfg.trustedHash(net)
diff --git a/share/eds/byzantine/byzantine.go b/share/eds/byzantine/byzantine.go
index e7aec28959..d20b56deed 100644
--- a/share/eds/byzantine/byzantine.go
+++ b/share/eds/byzantine/byzantine.go
@@ -4,9 +4,10 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/ipfs/boxo/blockservice"
+
 	"github.com/celestiaorg/celestia-app/pkg/da"
 	"github.com/celestiaorg/rsmt2d"
-	"github.com/ipfs/boxo/blockservice"
 
 	"github.com/celestiaorg/celestia-node/share/ipld"
 )