Merge pull request #38 from elecbug/elecbug/master

Update v0.11.1

Author: elecbug

graph/graph.go

@@ -39,8 +39,8 @@ func FromMatrix(matrix [][]bool, bidirectional bool) *Graph {
 	return g
 }
 
-// Save serializes the graph to a string.
-func Save(g *Graph) (string, error) {
+// Serialize serializes the graph to a string.
+func Serialize(g *Graph) (string, error) {
 	if g == nil {
 		return "", fmt.Errorf("graph is nil")
 	}
@@ -66,8 +66,8 @@ func Save(g *Graph) (string, error) {
 	return fmt.Sprintf("%s\n%s\n%s", nodes, edges, bidirectional), nil
 }
 
-// Load deserializes the graph from a string.
-func Load(data string) (*Graph, error) {
+// Deserialize deserializes the graph from a string.
+func Deserialize(data string) (*Graph, error) {
 	lines := strings.Split(data, "\n")
 	if len(lines) < 3 {
 		return nil, fmt.Errorf("invalid graph data")

graph/graph_test.go

@@ -102,15 +102,15 @@ func TestBidirectionalGraph(t *testing.T) {
 		g.AddEdge(graph.NodeID(fmt.Sprintf("%d", rand.Intn(nodeCount))), graph.NodeID(fmt.Sprintf("%d", rand.Intn(nodeCount))))
 	}
 
-	str, err := graph.Save(g)
+	str, err := graph.Serialize(g)
 
 	if err != nil {
 		t.Fatalf("Failed to save graph: %v", err)
 	}
 
 	os.WriteFile("bidirectional.graph.log", []byte(str), fs.ModePerm)
 
-	g2, err := graph.Load(str)
+	g2, err := graph.Deserialize(str)
 
 	if err != nil {
 		t.Fatalf("Failed to load graph: %v", err)
@@ -137,15 +137,15 @@ func TestDirectionalGraph(t *testing.T) {
 		g.AddEdge(graph.NodeID(fmt.Sprintf("%d", rand.Intn(nodeCount))), graph.NodeID(fmt.Sprintf("%d", rand.Intn(nodeCount))))
 	}
 
-	str, err := graph.Save(g)
+	str, err := graph.Serialize(g)
 
 	if err != nil {
 		t.Fatalf("Failed to save graph: %v", err)
 	}
 
 	os.WriteFile("directional.graph.log", []byte(str), fs.ModePerm)
 
-	g2, err := graph.Load(str)
+	g2, err := graph.Deserialize(str)
 
 	if err != nil {
 		t.Fatalf("Failed to load graph: %v", err)

p2p/node.go

@@ -13,9 +13,10 @@ type p2pNode struct {
 	nodeLatency float64
 	edges       map[PeerID]p2pEdge
 
-	recvFrom map[string]map[PeerID]struct{} // content -> set of senders
-	sentTo   map[string]map[PeerID]struct{} // content -> set of targets
-	seenAt   map[string]time.Time           // content -> first arrival time
+	recvFrom  map[string]map[PeerID]struct{} // content -> set of senders
+	sentTo    map[string]map[PeerID]struct{} // content -> set of targets
+	seenAt    map[string]time.Time           // content -> first arrival time
+	firstFrom map[string]PeerID              // content -> first sender
 
 	msgQueue chan Message
 	mu       sync.Mutex
@@ -36,9 +37,10 @@ func newNode(id PeerID, nodeLatency float64) *p2pNode {
 		nodeLatency: nodeLatency,
 		edges:       make(map[PeerID]p2pEdge),
 
-		recvFrom: make(map[string]map[PeerID]struct{}),
-		sentTo:   make(map[string]map[PeerID]struct{}),
-		seenAt:   make(map[string]time.Time),
+		recvFrom:  make(map[string]map[PeerID]struct{}),
+		sentTo:    make(map[string]map[PeerID]struct{}),
+		seenAt:    make(map[string]time.Time),
+		firstFrom: make(map[string]PeerID),
 
 		msgQueue: make(chan Message, 1000),
 		mu:       sync.Mutex{},
@@ -67,6 +69,7 @@ func (n *p2pNode) eachRun(network *P2P, wg *sync.WaitGroup, ctx context.Context)
 
 				if _, ok := n.seenAt[msg.Content]; !ok {
 					n.seenAt[msg.Content] = time.Now()
+					n.firstFrom[msg.Content] = msg.From
 					first = true
 				}
 				n.mu.Unlock()

p2p/p2p.go

@@ -165,6 +165,38 @@ func (p *P2P) FirstMessageReceptionTimes(msg string) []time.Time {
 	return firstTimes
 }
 
+func (p *P2P) FirstMessageReceptions(msg string) []struct {
+	PeerID    graph.NodeID `json:"peer_id"`
+	From      graph.NodeID `json:"from"`
+	Timestamp time.Time    `json:"timestamp"`
+} {
+	receptions := make([]struct {
+		PeerID    graph.NodeID `json:"peer_id"`
+		From      graph.NodeID `json:"from"`
+		Timestamp time.Time    `json:"timestamp"`
+	}, 0)
+
+	for _, node := range p.nodes {
+		node.mu.Lock()
+		if t, ok := node.seenAt[msg]; ok {
+			from := node.firstFrom[msg]
+
+			receptions = append(receptions, struct {
+				PeerID    graph.NodeID `json:"peer_id"`
+				From      graph.NodeID `json:"from"`
+				Timestamp time.Time    `json:"timestamp"`
+			}{
+				PeerID:    graph.NodeID(fmt.Sprintf("%d", node.id)),
+				From:      graph.NodeID(fmt.Sprintf("%d", from)),
+				Timestamp: t,
+			})
+		}
+		node.mu.Unlock()
+	}
+
+	return receptions
+}
+
 // NumberOfDuplicateMessages counts how many duplicate messages were received across all nodes.
 func (p *P2P) NumberOfDuplicateMessages(msg string) int {
 	dupCount := 0