From 3c419ced1646d4365d1a05f610c585ab434f2b5d Mon Sep 17 00:00:00 2001
From: Igor Sirotin <sirotin@status.im>
Date: Wed, 10 Jun 2026 12:07:46 +0300
Subject: [PATCH] fix: repair references to removed utils package

nwaku_test_utils.go now uses pkg/kernel/utils.GetRSSKB; the memory_record
tool is self-contained (local helpers, missing mutex restored).

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 pkg/kernel/nwaku_test_utils.go |  2 +-
 tools/memory_record.go         | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkg/kernel/nwaku_test_utils.go b/pkg/kernel/nwaku_test_utils.go
index e69b499..1d7d574 100644
--- a/pkg/kernel/nwaku_test_utils.go
+++ b/pkg/kernel/nwaku_test_utils.go
@@ -18,7 +18,7 @@ import (
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/logos-messaging/logos-delivery-go-bindings/pkg/kernel/common"
 	"github.com/logos-messaging/logos-delivery-go-bindings/pkg/kernel/pb"
-	"github.com/logos-messaging/logos-delivery-go-bindings/utils"
+	"github.com/logos-messaging/logos-delivery-go-bindings/pkg/kernel/utils"
 	"google.golang.org/protobuf/proto"
 )
 
diff --git a/tools/memory_record.go b/tools/memory_record.go
index 518ff4e..cbeea8d 100644
--- a/tools/memory_record.go
+++ b/tools/memory_record.go
@@ -9,15 +9,15 @@ import (
 	"runtime"
 	"strconv"
 	"strings"
+	"sync"
 	"time"
-
-	"github.com/logos-messaging/logos-delivery-go-bindings/utils"
 )
 
 var (
 	testName  string
 	iteration int
 	phase     string
+	mu        sync.Mutex
 )
 
 func main() {
@@ -30,13 +30,13 @@ func main() {
 	runtime.ReadMemStats(&memStats)
 	heapKB := memStats.HeapAlloc / 1024
 
-	rssKB, err := utils.GetRSSKB()
+	rssKB, err := GetRSSKB()
 	if err != nil {
 		fmt.Fprintln(os.Stderr, "Failed to get RSS:", err)
 		rssKB = 0
 	}
 
-	if err := utils.RecordMemoryMetricsCSV(testName, iteration, phase, heapKB, rssKB); err != nil {
+	if err := RecordMemoryMetricsCSV(testName, iteration, phase, heapKB, rssKB); err != nil {
 		fmt.Fprintln(os.Stderr, "Error recording metrics:", err)
 		os.Exit(1)
 	}
@@ -50,7 +50,7 @@ func RecordMemoryMetricsCSV(testName string, iter int, phase string, heapKB, rss
 	if err != nil {
 		return err
 	}
-	defer f.Close()
+	defer func() { _ = f.Close() }()
 
 	w := csv.NewWriter(f)
 	defer w.Flush()
@@ -83,7 +83,7 @@ func GetRSSKB() (uint64, error) {
 	if err != nil {
 		return 0, err
 	}
-	defer f.Close()
+	defer func() { _ = f.Close() }()
 	data, err := io.ReadAll(f)
 	if err != nil {
 		return 0, err