libnetwork/networkdb: drop id field from network

corhere · corhere · commit 30b27ab6eaed · 2025-06-13T16:25:19.000-04:00
The map key for nDB.networks is the network ID. The struct field is not
actually used anywhere in practice.

Signed-off-by: Cory Snider &lt;csnider@mirantis.com&gt;
diff --git a/libnetwork/networkdb/delegate.go b/libnetwork/networkdb/delegate.go
@@ -136,7 +136,6 @@ func (nDB *NetworkDB) handleNetworkEvent(nEvent *NetworkEvent) bool {
 
 	// This remote network join is being seen the first time.
 	nodeNetworks[nEvent.NetworkID] = &network{
-		id:    nEvent.NetworkID,
 		ltime: nEvent.LTime,
 	}
 
@@ -452,10 +451,10 @@ func (d *delegate) LocalState(join bool) []byte {
 	}
 
 	for name, nn := range d.nDB.networks {
-		for _, n := range nn {
+		for nid, n := range nn {
 			pp.Networks = append(pp.Networks, &NetworkEntry{
 				LTime:     n.ltime,
-				NetworkID: n.id,
+				NetworkID: nid,
 				NodeName:  name,
 				Leaving:   n.leaving,
 			})
diff --git a/libnetwork/networkdb/networkdb.go b/libnetwork/networkdb/networkdb.go
@@ -128,9 +128,6 @@ type node struct {
 
 // network describes the node/network attachment.
 type network struct {
-	// Network ID
-	id string
-
 	// Lamport time for the latest state of the entry.
 	ltime serf.LamportTime
 
@@ -621,7 +618,7 @@ func (nDB *NetworkDB) JoinNetwork(nid string) error {
 	if ok {
 		entries = n.entriesNumber.Load()
 	}
-	nodeNetworks[nid] = &network{id: nid, ltime: ltime}
+	nodeNetworks[nid] = &network{ltime: ltime}
 	nodeNetworks[nid].entriesNumber.Store(entries)
 	nodeNetworks[nid].tableBroadcasts = &memberlist.TransmitLimitedQueue{
 		NumNodes: func() int {
