From 8fc02e275984683972120e748e51500987780b73 Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Thu, 1 Aug 2019 15:11:14 +1000
Subject: [PATCH] Use get_n_service_nodes

---
 .../xcshareddata/xcschemes/Signal.xcscheme         |  2 +-
 .../src/Loki/API/LokiAPI+SwarmAPI.swift            | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme
index 04df5b5a4..f080c2943 100644
--- a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme
+++ b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme
@@ -133,7 +133,7 @@
       </AdditionalOptions>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "App Store Release"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       enableThreadSanitizer = "YES"
diff --git a/SignalServiceKit/src/Loki/API/LokiAPI+SwarmAPI.swift b/SignalServiceKit/src/Loki/API/LokiAPI+SwarmAPI.swift
index f297d9ba0..f10b91a80 100644
--- a/SignalServiceKit/src/Loki/API/LokiAPI+SwarmAPI.swift
+++ b/SignalServiceKit/src/Loki/API/LokiAPI+SwarmAPI.swift
@@ -51,8 +51,18 @@ public extension LokiAPI {
         if randomSnodePool.isEmpty {
             let target = seedNodePool.randomElement()!
             let url = URL(string: "\(target)/json_rpc")!
-            let request = TSRequest(url: url, method: "POST", parameters: [ "method" : "get_service_nodes" ])
-            print("[Loki] Invoking get_service_nodes on \(target).")
+            let request = TSRequest(url: url, method: "POST", parameters: [
+                "method" : "get_n_service_nodes",
+                "params" : [
+                    "active_only" : true,
+                    "limit" : 24,
+                    "fields" : [
+                        "public_ip" : true,
+                        "storage_port" : true,
+                    ]
+                ]
+            ])
+            print("[Loki] Invoking get_n_service_nodes on \(target).")
             return TSNetworkManager.shared().makePromise(request: request).map { intermediate in
                 let rawResponse = intermediate.responseObject
                 guard let json = rawResponse as? JSON, let intermediate = json["result"] as? JSON, let rawTargets = intermediate["service_node_states"] as? [JSON] else { throw "Failed to update random snode pool from: \(rawResponse)." }