rename adversary functions

This commit is contained in:
Youngjoon Lee 2024-05-25 14:43:07 +09:00
parent 53bb8b1bde
commit 37abf93bd3
No known key found for this signature in database
GPG Key ID: 09B750B5BD6F08A2
2 changed files with 6 additions and 6 deletions

View File

@ -29,12 +29,12 @@ class Adversary:
def inspect_message_size(self, msg: SphinxPacket | bytes):
self.message_sizes.append(len(msg))
def observe_incoming_message(self, node: "Node"):
def observe_receiving_node(self, node: "Node"):
self.mixed_msgs_per_window[-1][node] += 1
# if node not in self.node_states[self.env.now]:
# self.node_states[self.env.now][node] = NodeState.RECEIVING
def observe_outgoing_message(self, node: "Node"):
def observe_sending_node(self, node: "Node"):
self.mixed_msgs_per_window[-1][node] -= 1
if self.is_around_message_interval(self.env.now):
self.senders_around_interval[node] += 1

View File

@ -68,7 +68,7 @@ class NaiveBroadcastP2P(P2P):
if cnt > 0:
# Adversary
self.adversary.inspect_message_size(msg)
self.adversary.observe_outgoing_message(sender)
self.adversary.observe_sending_node(sender)
def receive(self, msg: SphinxPacket | bytes, sender: "Node", receiver: "Node"):
yield from super().receive(msg, sender, receiver)
@ -76,7 +76,7 @@ class NaiveBroadcastP2P(P2P):
# Measurement
self.measurement.measure_ingress(receiver, msg)
# Adversary
self.adversary.observe_incoming_message(receiver)
self.adversary.observe_receiving_node(receiver)
self.env.process(receiver.receive_message(msg))
@ -129,7 +129,7 @@ class GossipP2P(P2P):
if cnt > 0:
# Adversary
self.adversary.inspect_message_size(msg)
self.adversary.observe_outgoing_message(sender)
self.adversary.observe_sending_node(sender)
def receive(self, msg: SphinxPacket | bytes, sender: "Node", receiver: "Node"):
yield from super().receive(msg, sender, receiver)
@ -138,7 +138,7 @@ class GossipP2P(P2P):
# because the node doesn't know if the message is a duplicate before receiving it from the network.
self.measurement.measure_ingress(receiver, msg)
# Adversary
self.adversary.observe_incoming_message(receiver)
self.adversary.observe_receiving_node(receiver)
# Receive/gossip the msg only if it hasn't been received before. If not, just ignore the msg.
# i.e. each message is received/gossiped at most once by each node.