From b2a43bafc3d9b0eb823c788b597e17c999c33533 Mon Sep 17 00:00:00 2001
From: jbhusson <jonah@elixxir.io>
Date: Thu, 8 Sep 2022 16:30:11 -0400
Subject: [PATCH] Fix format args with round inputs
---
cmd/broadcast.go | 4 ++--
cmd/group.go | 2 +-
single/receivedRequest.go | 2 +-
single/request.go | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/cmd/broadcast.go b/cmd/broadcast.go
index 8cf3d4a5f..15c01a99b 100644
--- a/cmd/broadcast.go
+++ b/cmd/broadcast.go
@@ -217,7 +217,7 @@ var broadcastCmd = &cobra.Command{
continue
}
fmt.Printf("Sent symmetric broadcast message: %s", symmetric)
- jww.INFO.Printf("Sent symmetric broadcast message to %s over round %d", eid, rid)
+ jww.INFO.Printf("Sent symmetric broadcast message to %s over round %d", eid, rid.ID)
}
/* Send asymmetric broadcast */
@@ -237,7 +237,7 @@ var broadcastCmd = &cobra.Command{
continue
}
fmt.Printf("Sent asymmetric broadcast message: %s", asymmetric)
- jww.INFO.Printf("Sent asymmetric broadcast message to %s over round %d", eid, rid)
+ jww.INFO.Printf("Sent asymmetric broadcast message to %s over round %d", eid, rid.ID)
}
wg.Done()
diff --git a/cmd/group.go b/cmd/group.go
index 8f8bb6a39..0cf296b4c 100644
--- a/cmd/group.go
+++ b/cmd/group.go
@@ -237,7 +237,7 @@ func sendGroup(groupIdString string, msg []byte, gm groupChat.GroupChat) {
}
jww.INFO.Printf("[GC] Sent to group %s on round %d at %s",
- groupID, rid, timestamp)
+ groupID, rid.ID, timestamp)
fmt.Printf("Sent message %q to group.\n", msg)
}
diff --git a/single/receivedRequest.go b/single/receivedRequest.go
index f9ec7fea8..cc0561008 100644
--- a/single/receivedRequest.go
+++ b/single/receivedRequest.go
@@ -104,7 +104,7 @@ func (r *Request) Respond(payload []byte, cMixParams cmix.CMIXParams,
jww.DEBUG.Printf("[SU] Sent single-use response cMix message part "+
"%d of %d on round %d to %s (eph ID %d) (%s).",
- i, len(parts), round, r.sender, ephID.Int64(), r.tag)
+ i, len(parts), round.ID, r.sender, ephID.Int64(), r.tag)
rounds[i] = round.ID
r.net.GetInstance().GetRoundEvents().AddRoundEventChan(
diff --git a/single/request.go b/single/request.go
index e38803915..16429e835 100644
--- a/single/request.go
+++ b/single/request.go
@@ -211,7 +211,7 @@ func TransmitRequest(recipient contact.Contact, tag string, payload []byte,
jww.DEBUG.Printf("[SU] Sent single-use request cMix message part "+
"%d of %d on round %d to %s (eph ID %d) (%s).",
- 0, len(parts)+1, rid, recipient.ID, ephID.Int64(), tag)
+ 0, len(parts)+1, rid.ID, recipient.ID, ephID.Int64(), tag)
var wg sync.WaitGroup
wg.Add(len(parts))
--
GitLab