Merge branch 'replace-list-relays-with-curl'

3 files changed, 12 insertions, 38 deletions

diff --git a/README.md b/README.md
index e8b2a62fda..32fbd659bf 100644
--- a/README.md
+++ b/README.md
@@ -86,8 +86,12 @@ homebrew:
     ```
 
 1. Get the latest list of Mullvad relays:
-    ```
-    ./target/debug/list-relays > dist-assets/relays.json
+    ```bash
+    curl -X POST \
+         -H "Content-Type: application/json" \
+         -d '{"jsonrpc": "2.0", "id": "0", "method": "relay_list"}' \
+         https://api.mullvad.net/rpc/ \
+         -o dist-assets/relays.json
     ```
 
 1. Run the daemon debug binary with verbose logging to the terminal with:
diff --git a/build.sh b/build.sh
index 8bd7971a18..6183117920 100755
--- a/build.sh
+++ b/build.sh
@@ -86,7 +86,7 @@ sed -i.bak \
     mullvad-daemon/Cargo.toml \
     mullvad-cli/Cargo.toml \
     mullvad-problem-report/Cargo.toml
-	
+
 SEMVER_ARRAY=($(echo $SEMVER_VERSION | sed -r 's/[.-]+/ /g'))
 
 SEMVER_MAJOR=${SEMVER_ARRAY[0]}
@@ -131,7 +131,11 @@ if [[ "$(uname -s)" != "MINGW"* ]]; then
 fi
 
 echo "Updating relay list..."
-MULLVAD_RESOURCE_DIR="$SCRIPT_DIR/dist-assets/" ./target/release/list-relays > dist-assets/relays.json
+curl -X POST \
+     -H "Content-Type: application/json" \
+     -d '{"jsonrpc": "2.0", "id": "0", "method": "relay_list"}' \
+     https://api.mullvad.net/rpc/ \
+     -o dist-assets/relays.json
 
 echo "Installing JavaScript dependencies..."
 yarn install
diff --git a/mullvad-daemon/src/bin/list-relays.rs b/mullvad-daemon/src/bin/list-relays.rs
deleted file mode 100644
index a330297e20..0000000000
--- a/mullvad-daemon/src/bin/list-relays.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-//! # License
-//!
-//! Copyright (C) 2017  Amagicom AB
-//!
-//! This program is free software: you can redistribute it and/or modify it under the terms of the
-//! GNU General Public License as published by the Free Software Foundation, either version 3 of
-//! the License, or (at your option) any later version.
-
-#[macro_use]
-extern crate error_chain;
-
-extern crate mullvad_paths;
-extern crate mullvad_rpc;
-extern crate serde_json;
-
-error_chain!{}
-
-quick_main!(run);
-
-fn run() -> Result<()> {
-    let ca_path = mullvad_paths::resources::get_api_ca_path();
-    let mut rpc_manager = mullvad_rpc::MullvadRpcFactory::new(ca_path);
-    let rpc_http_handle = rpc_manager
-        .new_connection()
-        .chain_err(|| "Unable to connect RPC")?;
-    let mut client = mullvad_rpc::RelayListProxy::new(rpc_http_handle);
-
-    let relays = client
-        .relay_list()
-        .call()
-        .chain_err(|| "Error during RPC call")?;
-    println!("{}", serde_json::to_string_pretty(&relays).unwrap());
-    Ok(())
-}