diff --git a/src/data.rs b/src/data.rs index 8f0b454..a7586ff 100644 --- a/src/data.rs +++ b/src/data.rs @@ -24,7 +24,6 @@ pub struct Dashboard { pub cap_btc: String, // blockchain pub disk_usage: String, - pub age: String, // hashrate pub hashrate: String, pub difficulty: String, @@ -56,7 +55,6 @@ impl Dashboard { cap_usd: String::new(), cap_btc: String::new(), disk_usage: String::new(), - age: String::new(), hashrate: String::new(), difficulty: String::new(), production_cost: String::new(), diff --git a/src/main.rs b/src/main.rs index f661cf1..1b25bad 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,5 @@ #[macro_use] extern crate rocket; +use either::Either; use rocket_dyn_templates::{Template, context}; use rocket::fs::FileServer; use rocket::{State, tokio}; @@ -6,18 +7,17 @@ use rocket::response::Redirect; use rocket::serde::json::json; use std::sync::{Arc, Mutex}; use std::time::Duration; -use either::Either; use serde_json::Value; -mod worker; -mod requests; mod data; +mod requests; +mod worker; -use crate::data::Dashboard; use crate::data::Block; -use crate::data::Transactions; +use crate::data::Dashboard; use crate::data::Kernel; use crate::data::Output; +use crate::data::Transactions; use crate::requests::CONFIG; diff --git a/src/requests.rs b/src/requests.rs index 2d66023..3b2a1bb 100644 --- a/src/requests.rs +++ b/src/requests.rs @@ -187,7 +187,7 @@ pub async fn get_market(dashboard: Arc>) -> Result<(), anyhow:: if CONFIG.coingecko_api == "enabled" && val != Value::Null { // Check if CoingGecko API returned error if let Some(status) = val.get("status") { - warn!("{}", status["error_message"].as_str().unwrap().to_string()); + warn!("{}", status["error_message"].to_string()); } else { data.price_usd = format!("{:.3}", val["grin"]["usd"].to_string().parse::().unwrap()); data.price_btc = format!("{:.8}", val["grin"]["btc"].to_string().parse::().unwrap());