From 1b9189866af26ed0003c1afe8dd5652ebe9b2e4a Mon Sep 17 00:00:00 2001
From: Jon Atack <jon@atack.com>
Date: Sat, 3 Apr 2021 20:22:55 +0200
Subject: [PATCH] rpc: simplify/constify getnodeaddresses code

---
 src/rpc/net.cpp | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index aff9bf7ae18..96c195a20e3 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -863,15 +863,11 @@ static RPCHelpMan getnodeaddresses()
         throw JSONRPCError(RPC_CLIENT_P2P_DISABLED, "Error: Peer-to-peer functionality missing or disabled");
     }
 
-    int count = 1;
-    if (!request.params[0].isNull()) {
-        count = request.params[0].get_int();
-        if (count < 0) {
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "Address count out of range");
-        }
-    }
+    const int count{request.params[0].isNull() ? 1 : request.params[0].get_int()};
+    if (count < 0) throw JSONRPCError(RPC_INVALID_PARAMETER, "Address count out of range");
+
     // returns a shuffled list of CAddress
-    std::vector<CAddress> vAddr = node.connman->GetAddresses(count, /* max_pct */ 0);
+    const std::vector<CAddress> vAddr{node.connman->GetAddresses(count, /* max_pct */ 0)};
     UniValue ret(UniValue::VARR);
 
     for (const CAddress& addr : vAddr) {