From c02cfd04253c5f5c839410d418789884b9bfb13a Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Tue, 16 Mar 2021 22:09:07 +0100
Subject: Adapt gateway selector to check for nearest gateway within a city.
 Also optionally parse sortedGateways json object from menshen backend reponse

---
 app/src/test/resources/riseup_geoip_v4.json    | 35 --------------------------
 app/src/test/resources/v4/riseup_geoip_v4.json | 35 ++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 35 deletions(-)
 delete mode 100644 app/src/test/resources/riseup_geoip_v4.json
 create mode 100644 app/src/test/resources/v4/riseup_geoip_v4.json

(limited to 'app/src/test')

diff --git a/app/src/test/resources/riseup_geoip_v4.json b/app/src/test/resources/riseup_geoip_v4.json
deleted file mode 100644
index 439d6ffb..00000000
--- a/app/src/test/resources/riseup_geoip_v4.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "ip":"51.158.144.32",
-  "cc":"FR",
-  "city":"Paris",
-  "lat":48.8628,
-  "lon":2.3292,
-  "gateways":[
-    "mouette.riseup.net",
-    "hoatzin.riseup.net",
-    "zarapito.riseup.net",
-    "redshank.riseup.net"
-  ],
-  "sortedGateways": [
-    {
-      "host": "mouette.riseup.net",
-      "fullness": 0.3,
-      "overload": false
-    },
-    {
-      "host": "hoatzin.riseup.net",
-      "fullness": 0.36,
-      "overload": false
-    },
-    {
-      "host": "zarapito.riseup.net",
-      "fullness": 0.57,
-      "overload": false
-    },
-    {
-      "host": "zarapito.riseup.net",
-      "fullness": 0.92,
-      "overload": true
-    }
-  ]
-}
\ No newline at end of file
diff --git a/app/src/test/resources/v4/riseup_geoip_v4.json b/app/src/test/resources/v4/riseup_geoip_v4.json
new file mode 100644
index 00000000..439d6ffb
--- /dev/null
+++ b/app/src/test/resources/v4/riseup_geoip_v4.json
@@ -0,0 +1,35 @@
+{
+  "ip":"51.158.144.32",
+  "cc":"FR",
+  "city":"Paris",
+  "lat":48.8628,
+  "lon":2.3292,
+  "gateways":[
+    "mouette.riseup.net",
+    "hoatzin.riseup.net",
+    "zarapito.riseup.net",
+    "redshank.riseup.net"
+  ],
+  "sortedGateways": [
+    {
+      "host": "mouette.riseup.net",
+      "fullness": 0.3,
+      "overload": false
+    },
+    {
+      "host": "hoatzin.riseup.net",
+      "fullness": 0.36,
+      "overload": false
+    },
+    {
+      "host": "zarapito.riseup.net",
+      "fullness": 0.57,
+      "overload": false
+    },
+    {
+      "host": "zarapito.riseup.net",
+      "fullness": 0.92,
+      "overload": true
+    }
+  ]
+}
\ No newline at end of file
-- 
cgit v1.2.3