From fe2af8fa5cf334e49c4001080065d1019b63f41a Mon Sep 17 00:00:00 2001
From: dknopik <107140945+dknopik@users.noreply.github.com>
Date: Sun, 28 Jul 2024 20:23:52 +0200
Subject: [PATCH] fix(disc): correct order of `NodeRecord` fields (#9858)

---
 crates/net/discv4/src/proto.rs      | 12 ++++++------
 crates/net/peers/src/node_record.rs |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/crates/net/discv4/src/proto.rs b/crates/net/discv4/src/proto.rs
index 6d2639f2d..d8c7ebcad 100644
--- a/crates/net/discv4/src/proto.rs
+++ b/crates/net/discv4/src/proto.rs
@@ -938,26 +938,26 @@ mod tests {
             let expected_nodes: Vec<NodeRecord> = vec![
                 NodeRecord {
                     address: "99.33.22.55".parse().unwrap(),
-                    tcp_port: 4444,
-                    udp_port: 4445,
+                    udp_port: 4444,
+                    tcp_port: 4445,
                     id: hex!("3155e1427f85f10a5c9a7755877748041af1bcd8d474ec065eb33df57a97babf54bfd2103575fa829115d224c523596b401065a97f74010610fce76382c0bf32").into(),
                 },
                 NodeRecord {
                     address: "1.2.3.4".parse().unwrap(),
-                    tcp_port: 1,
                     udp_port: 1,
+                    tcp_port: 1,
                     id: hex!("312c55512422cf9b8a4097e9a6ad79402e87a15ae909a4bfefa22398f03d20951933beea1e4dfa6f968212385e829f04c2d314fc2d4e255e0d3bc08792b069db").into(),
                 },
                 NodeRecord {
                     address: "2001:db8:3c4d:15::abcd:ef12".parse().unwrap(),
-                    tcp_port: 3333,
                     udp_port: 3333,
+                    tcp_port: 3333,
                     id: hex!("38643200b172dcfef857492156971f0e6aa2c538d8b74010f8e140811d53b98c765dd2d96126051913f44582e8c199ad7c6d6819e9a56483f637feaac9448aac").into(),
                 },
                 NodeRecord {
                     address: "2001:db8:85a3:8d3:1319:8a2e:370:7348".parse().unwrap(),
-                    tcp_port: 999,
-                    udp_port: 1000,
+                    udp_port: 999,
+                    tcp_port: 1000,
                     id: hex!("8dcab8618c3253b558d459da53bd8fa68935a719aff8b811197101a4b2b47dd2d47295286fc00cc081bb542d760717d1bdd6bec2c37cd72eca367d6dd3b9df73").into(),
                 },
             ];
diff --git a/crates/net/peers/src/node_record.rs b/crates/net/peers/src/node_record.rs
index 5f268c253..cd29e12d4 100644
--- a/crates/net/peers/src/node_record.rs
+++ b/crates/net/peers/src/node_record.rs
@@ -33,10 +33,10 @@ use enr::Enr;
 pub struct NodeRecord {
     /// The Address of a node.
     pub address: IpAddr,
-    /// TCP port of the port that accepts connections.
-    pub tcp_port: u16,
     /// UDP discovery port.
     pub udp_port: u16,
+    /// TCP port of the port that accepts connections.
+    pub tcp_port: u16,
     /// Public key of the discovery service
     pub id: PeerId,
 }