From 584fd8f2c3c52c8d668cc61d99d911bb40f2372e Mon Sep 17 00:00:00 2001 From: Richard Ramos Date: Wed, 29 May 2024 21:42:22 -0400 Subject: [PATCH] fix: use hex for uuid --- cmd/storemsgcounter/execute.go | 8 +++++--- go.mod | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cmd/storemsgcounter/execute.go b/cmd/storemsgcounter/execute.go index 5628589..548dd8d 100644 --- a/cmd/storemsgcounter/execute.go +++ b/cmd/storemsgcounter/execute.go @@ -3,6 +3,7 @@ package main import ( "context" "database/sql" + "encoding/hex" "errors" "fmt" "net" @@ -146,7 +147,8 @@ var msgMap map[pb.MessageHash]map[peer.ID]MessageExistence var msgAttr map[pb.MessageHash]MessageAttr func verifyHistory(ctx context.Context, storenodes []peer.AddrInfo, wakuNode *node.WakuNode, dbStore *persistence.DBStore, logger *zap.Logger) error { - runId := uuid.New().String() + tmpUUID := uuid.New() + runId := hex.EncodeToString(tmpUUID[:]) logger = logger.With(zap.String("runId", runId)) @@ -204,7 +206,7 @@ func verifyHistory(ctx context.Context, storenodes []peer.AddrInfo, wakuNode *no wg.Add(1) go func(peerID peer.ID, messageHashes []pb.MessageHash) { defer wg.Done() - verifyMessageExistence(ctx, runId, tx, peerID, messageHashes, wakuNode, dbStore, logger) + verifyMessageExistence(ctx, runId, peerID, messageHashes, wakuNode, dbStore, logger) }(peerID, messageHashes) } wg.Wait() @@ -359,7 +361,7 @@ func retrieveHistory(ctx context.Context, runId string, storenodes []peer.AddrIn } } -func verifyMessageExistence(ctx context.Context, runId string, tx *sql.Tx, peerID peer.ID, messageHashes []pb.MessageHash, wakuNode *node.WakuNode, dbStore *persistence.DBStore, logger *zap.Logger) { +func verifyMessageExistence(ctx context.Context, runId string, peerID peer.ID, messageHashes []pb.MessageHash, wakuNode *node.WakuNode, dbStore *persistence.DBStore, logger *zap.Logger) { storeNodeFailure := false var result *store.Result var err error diff --git a/go.mod b/go.mod index 8fc4063..bec8883 100644 --- a/go.mod +++ b/go.mod @@ -10,6 +10,7 @@ require ( github.com/google/uuid v1.3.0 github.com/ipfs/go-log/v2 v2.5.1 github.com/jackc/pgx/v5 v5.4.1 + github.com/libp2p/go-libp2p v0.32.2 github.com/mattn/go-sqlite3 v1.14.17 github.com/multiformats/go-multiaddr v0.12.3 github.com/urfave/cli/v2 v2.27.2 @@ -75,7 +76,6 @@ require ( github.com/libp2p/go-buffer-pool v0.1.0 // indirect github.com/libp2p/go-cidranger v1.1.0 // indirect github.com/libp2p/go-flow-metrics v0.1.0 // indirect - github.com/libp2p/go-libp2p v0.32.2 // indirect github.com/libp2p/go-libp2p-asn-util v0.3.0 // indirect github.com/libp2p/go-libp2p-pubsub v0.10.1 // indirect github.com/libp2p/go-msgio v0.3.0 // indirect