Passing validator base url as an argument

explorer/Cargo.toml

@@ -7,7 +7,8 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-# no point in importing entire futtures crate
+clap = "2.33"
+# no point in importing entire futures crate
 futures-util = "0.3"
 log = "0.4"
 reqwest = "0.10.8"

explorer/src/jobs/mixmining.rs

@@ -1,13 +1,12 @@
+use crate::utils::file;
 use reqwest::Error;
 
-use crate::utils::file;
+const RELATIVE_PATH: &str = "api/mixmining/fullreport";
+
+pub async fn renew_periodically(validator_base_url: &str) -> Result<(), Error> {
+    let url = format!("{}/{}", validator_base_url, RELATIVE_PATH);
 
-pub async fn renew_periodically() -> Result<(), Error> {
-    let topology_json =
-        reqwest::get("http://qa-validator.nymtech.net:8081/api/mixmining/fullreport")
-            .await?
-            .text()
-            .await?;
+    let topology_json = reqwest::get(&url).await?.text().await?;
     file::save(topology_json, "public/downloads/mixmining.json");
     Ok(())
 }

explorer/src/jobs/mod.rs

@@ -4,16 +4,16 @@ use tokio::time::{self, Duration};
 mod mixmining;
 mod topology;
 
-pub async fn start() {
+pub async fn start(validator_base_url: &str) {
     let mut timer = time::interval(Duration::from_secs(10));
     loop {
         timer.tick().await;
 
-        if let Err(err) = topology::renew_periodically().await {
+        if let Err(err) = topology::renew_periodically(validator_base_url).await {
             warn!("Error refreshing topology: {}", err)
         };
 
-        if let Err(err) = mixmining::renew_periodically().await {
+        if let Err(err) = mixmining::renew_periodically(validator_base_url).await {
             warn!("Error refreshing mixmining report: {}", err)
         };
     }

explorer/src/jobs/topology.rs

@@ -1,12 +1,12 @@
+use crate::utils::file;
 use reqwest::Error;
 
-use crate::utils::file;
+const RELATIVE_PATH: &str = "api/mixmining/topology";
+
+pub async fn renew_periodically(validator_base_url: &str) -> Result<(), Error> {
+    let url = format!("{}/{}", validator_base_url, RELATIVE_PATH);
 
-pub async fn renew_periodically() -> Result<(), Error> {
-    let topology_json = reqwest::get("http://qa-validator.nymtech.net:8081/api/mixmining/topology")
-        .await?
-        .text()
-        .await?;
+    let topology_json = reqwest::get(&url).await?.text().await?;
     file::save(topology_json, "public/downloads/topology.json");
     Ok(())
 }

explorer/src/main.rs

@@ -3,6 +3,7 @@
 #[macro_use]
 extern crate rocket;
 
+use clap::{App, Arg, ArgMatches};
 use rocket_contrib::serve::StaticFiles;
 use tokio::sync::broadcast;
 
@@ -12,6 +13,19 @@ mod websockets;
 
 // this specifies number of messages that can be held by the channel, not number of the clients.
 const BROADCAST_CAPACITY: usize = 10;
+const VALIDATOR_ARG: &str = "validator";
+
+fn parse_args<'a>() -> ArgMatches<'a> {
+    App::new("Nym Explorer")
+        .author("Nymtech")
+        .arg(
+            Arg::with_name(VALIDATOR_ARG)
+                .help("REST endpoint of the explorer will use to periodically grab topology and node status.")
+                .takes_value(true)
+                .required(true),
+        )
+        .get_matches()
+}
 
 #[get("/")]
 fn index() -> &'static str {
@@ -20,6 +34,9 @@ fn index() -> &'static str {
 
 #[tokio::main]
 async fn main() {
+    let matches = parse_args();
+    let validator_base_url = matches.value_of(VALIDATOR_ARG).unwrap();
+
     tokio::spawn(async move {
         rocket::ignite()
             .mount("/", StaticFiles::from("public"))
@@ -39,5 +56,5 @@ async fn main() {
         websockets::listen(8080, sender_clone).await;
     });
 
-    jobs::start().await;
+    jobs::start(validator_base_url).await;
 }