From 01d839a7a74524036ed9bcee77712eaa96e4a34f Mon Sep 17 00:00:00 2001
From: Youngjoon Lee <5462944+youngjoon-lee@users.noreply.github.com>
Date: Fri, 24 May 2024 14:00:09 +0900
Subject: [PATCH] change log format

---
 mixnet/v2/sim/node.py | 2 +-
 mixnet/v2/sim/p2p.py  | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/mixnet/v2/sim/node.py b/mixnet/v2/sim/node.py
index ab41352..b235b2c 100644
--- a/mixnet/v2/sim/node.py
+++ b/mixnet/v2/sim/node.py
@@ -126,7 +126,7 @@ class Node:
         return tx == Node.create_incentive_tx(self.public_key)
 
     def log(self, msg):
-        print("Node:%d at %g: %s" % (self.id, self.env.now, msg))
+        print(f"t={self.env.now}: Node:{self.id}: {msg}")
 
 
 class MessageType(Enum):
diff --git a/mixnet/v2/sim/p2p.py b/mixnet/v2/sim/p2p.py
index 72fce20..7f7a255 100644
--- a/mixnet/v2/sim/p2p.py
+++ b/mixnet/v2/sim/p2p.py
@@ -51,7 +51,7 @@ class P2P(ABC):
         self.adversary.observe_incoming_message(receiver)
 
     def log(self, msg):
-        print("P2P at %g: %s" % (self.env.now, msg))
+        print(f"t={self.env.now}: P2P: {msg}")
 
 
 class NaiveBroadcastP2P(P2P):
@@ -63,7 +63,7 @@ class NaiveBroadcastP2P(P2P):
     # but we accept SphinxPacket as well because we don't implement Sphinx deserialization.
     def broadcast(self, sender: "Node", msg: SphinxPacket | bytes):
         yield from super().broadcast(sender, msg)
-        self.log("Broadcasting a msg: %d bytes" % len(msg))
+        self.log(f"Node:{sender.id}: Broadcasting a msg: {len(msg)} bytes")
         for node in self.nodes:
             self.measurement.measure_egress(sender, msg)
             self.env.process(self.send(msg, node))
@@ -99,7 +99,7 @@ class GossipP2P(P2P):
 
     def broadcast(self, sender: "Node", msg: SphinxPacket | bytes):
         yield from super().broadcast(sender, msg)
-        self.log("Gossiping a msg: %d bytes" % len(msg))
+        self.log(f"Node:{sender.id}: Gossiping a msg: {len(msg)} bytes")
         for receiver in self.topology[sender]:
             self.measurement.measure_egress(sender, msg)
             self.env.process(self.send(msg, receiver))
@@ -111,5 +111,4 @@ class GossipP2P(P2P):
         if msg_hash not in self.message_cache[receiver]:
             self.message_cache[receiver].add(msg_hash)
             self.env.process(receiver.receive_message(msg))
-            # gossiping
             self.env.process(self.broadcast(receiver, msg))