Add Inbound field to admin_peers rpc call response (#7443)

NethermindEth · Nov 29, 2024 · 8fed53f · 8fed53f
1 parent 14406f3
commit 8fed53f
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/src/Nethermind/Nethermind.JsonRpc.Test/Modules/AdminModuleTests.cs b/src/Nethermind/Nethermind.JsonRpc.Test/Modules/AdminModuleTests.cs
@@ -1,7 +1,9 @@
 // SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited
 // SPDX-License-Identifier: LGPL-3.0-only
 
+using System;
 using System.Collections.Concurrent;
+using System.Collections.Generic;
 using System.Text.Json;
 using System.Threading.Tasks;
 using FluentAssertions;
@@ -63,6 +65,21 @@ public void Setup()
         _serializer = new EthereumJsonSerializer();
     }
 
+    [Test]
+    public async Task Test_peers()
+    {
+        string serialized = await RpcTest.TestSerializedRequest(_adminRpcModule, "admin_peers");
+        JsonRpcSuccessResponse response = _serializer.Deserialize<JsonRpcSuccessResponse>(serialized);
+        var peerInfoList = ((JsonElement)response.Result!).Deserialize<List<PeerInfo>>(EthereumJsonSerializer.JsonOptions)!;
+        peerInfoList.Count.Should().Be(1);
+        PeerInfo peerInfo = peerInfoList[0];
+        peerInfo.Host.Should().Be("127.0.0.1");
+        peerInfo.Port.Should().Be(30303);
+        peerInfo.Inbound.Should().BeFalse();
+        peerInfo.IsStatic.Should().BeTrue();
+        peerInfo.Id.Should().NotBeEmpty();
+    }
+
     [Test]
     public async Task Test_node_info()
     {

diff --git a/src/Nethermind/Nethermind.JsonRpc/Modules/Admin/PeerInfo.cs b/src/Nethermind/Nethermind.JsonRpc/Modules/Admin/PeerInfo.cs
@@ -25,6 +25,8 @@ public class PeerInfo
         public string EthDetails { get; set; }
         public string LastSignal { get; set; }
 
+        public bool Inbound { get; set; }
+
         public PeerInfo()
         {
         }
@@ -45,12 +47,14 @@ public PeerInfo(Peer peer, bool includeDetails)
             IsBootnode = peer.Node.IsBootnode;
             IsStatic = peer.Node.IsStatic;
             Enode = peer.Node.ToString(Node.Format.ENode);
+            Inbound = peer.InSession is not null;
 
             if (includeDetails)
             {
                 ClientType = peer.Node.ClientType.ToString();
                 EthDetails = peer.Node.EthDetails;
-                LastSignal = (peer.InSession ?? peer.OutSession)?.LastPingUtc.ToString(CultureInfo.InvariantCulture);
+                LastSignal = (peer.InSession ?? peer.OutSession!).LastPingUtc.ToString(CultureInfo.InvariantCulture);
+
             }
         }
     }