Merge branch 'main' into nixos-cleanup

Author: garbas

.gitignore

@@ -1,7 +1,12 @@
 /.vscode
+/.vs
+/.idea
+
 
 qr-code.svg
 
 /target
 /venv
 /.direnv
+/.pre-commit-config.yaml
+/result*

Cargo.lock

@@ -37,7 +37,6 @@ rayon = "1.5"
 rust_decimal = "1.16"
 rust_decimal_macros = "1"
 futures = "0.3"
-log = "0.4"
 once_cell = "1.8"
 reqwest = { version = "0.11", features = ["blocking", "json"] }
 rand = "0.8.3"
@@ -61,8 +60,10 @@ symmetric-cipher = { git = "https://github.com/input-output-hk/chain-wallet-libs
 graphql_client = { version = "0.10" }
 gag = "1"
 vit-servicing-station-lib = { git = "https://github.com/input-output-hk/vit-servicing-station.git", branch = "master" }
-env_logger = "0.9"
 snapshot-lib = { path = "../snapshot-lib" }
+fraction = "0.10"
+tracing = "0.1"
+tracing-subscriber = "0.3"
 
 [dev-dependencies]
 rand_chacha = "0.3"

catalyst-toolbox/Cargo.toml

@@ -3,7 +3,7 @@ use structopt::StructOpt;
 pub mod cli;
 
 fn main() -> color_eyre::Result<()> {
-    env_logger::try_init()?;
+    tracing_subscriber::fmt().init();
     color_eyre::install()?;
     cli::Cli::from_args().exec()?;
     Ok(())

catalyst-toolbox/src/bin/catalyst-toolbox.rs

@@ -81,7 +81,7 @@ fn group_by_voter<I: IntoIterator<Item = (Fragment, Option<SpendingCounter>)>>(
                         .or_insert_with(Vec::new)
                         .push(vote_cast);
                 }
-                Err(e) => log::error!("Invalid transaction: {}", e),
+                Err(e) => tracing::error!("Invalid transaction: {}", e),
             }
         }
     }

catalyst-toolbox/src/bin/cli/recovery/votes.rs

@@ -2,8 +2,8 @@ use std::marker::PhantomData;
 
 use ::reqwest::{blocking::Response, StatusCode};
 use color_eyre::eyre::Result;
-use log::warn;
 use serde::Deserialize;
+use tracing::warn;
 
 use self::{rate_limit::RateLimitClient, reqwest::ReqwestClient};
 

catalyst-toolbox/src/http/mod.rs

@@ -7,11 +7,12 @@ use governor::{
 };
 
 use color_eyre::Report;
-use log::debug;
 use serde::Deserialize;
+use tracing::debug;
 
 use super::{HttpClient, HttpResponse};
 
+#[derive(Debug)]
 pub struct RateLimitClient<T: HttpClient> {
     inner: T,
     limiter: Option<RateLimiter<NotKeyed, InMemoryState, DefaultClock>>,

catalyst-toolbox/src/http/rate_limit.rs

@@ -10,6 +10,7 @@ use super::{HttpClient, HttpResponse};
 
 const BASE_IDEASCALE_URL: &str = "https://cardano.ideascale.com/a/rest/v1/";
 
+#[derive(Debug)]
 pub struct ReqwestClient {
     client: Client,
     base_url: Url,

catalyst-toolbox/src/http/reqwest.rs

@@ -9,6 +9,7 @@ pub type Scores = HashMap<u32, f32>;
 pub type Sponsors = HashMap<String, String>;
 
 pub fn get_funds_data(client: &impl HttpClient) -> Result<Vec<Fund>, Report> {
+    info!("getting funds");
     client.get("campaigns/groups")?.json()
 }
 
@@ -25,10 +26,12 @@ pub fn get_proposals_data(
     client: &impl HttpClient,
     challenge_id: u32,
 ) -> Result<Vec<Proposal>, Report> {
+    info!("getting proposal data");
     let path = &format!("campaigns/{}/ideas/0/100000", challenge_id);
     client.get(path)?.json()
 }
 
 pub fn get_funnels_data_for_fund(client: &impl HttpClient) -> Result<Vec<Funnel>, Report> {
+    info!("getting funnels");
     client.get("funnels")?.json()
 }

catalyst-toolbox/src/ideascale/fetch.rs

@@ -79,7 +79,7 @@ pub fn fetch_all(
         // TODO: Handle error better here
         .flat_map(Result::unwrap)
         // filter out non approved or staged proposals
-        .filter(|p| p.approved && filter_proposal_by_stage_type(&p.stage_type, &matches))
+        .filter(|p| p.approved.as_bool() && filter_proposal_by_stage_type(&p.stage_type, &matches))
         .filter(|p| !excluded_proposals.contains(&p.proposal_id))
         .collect();
 
@@ -139,7 +139,7 @@ pub fn build_challenges(
                     id: i.to_string(),
                     rewards_total: c.rewards.to_string(),
                     proposers_rewards: c.rewards.to_string(),
-                    title: c.title.clone(),
+                    title: c.title.as_str().to_string(),
                     highlight: sponsors.get(&c.challenge_url).map(|sponsor| {
                         models::se::Highlight {
                             sponsor: sponsor.clone(),