review fix

Author: dkijania

catalyst-toolbox/src/bin/cli/stats/voters/active.rs

@@ -1,5 +1,6 @@
 use catalyst_toolbox::stats::distribution::Stats;
 use catalyst_toolbox::stats::voters::calculate_active_wallet_distribution;
+use color_eyre::Report;
 use std::ops::Range;
 use std::path::PathBuf;
 use structopt::StructOpt;
@@ -26,7 +27,7 @@ pub enum Command {
 }
 
 impl ActiveVotersCommand {
-    pub fn exec(&self) -> Result<(), catalyst_toolbox::stats::Error> {
+    pub fn exec(&self) -> Result<(), Report> {
         match self.command {
             Command::Count => calculate_active_wallet_distribution(
                 Stats::new(self.threshold),

catalyst-toolbox/src/bin/cli/stats/voters/mod.rs

@@ -2,6 +2,7 @@ mod active;
 mod initials;
 
 use active::ActiveVotersCommand;
+use color_eyre::Report;
 use initials::InitialVotersCommand;
 use structopt::StructOpt;
 
@@ -12,7 +13,7 @@ pub enum VotersCommand {
 }
 
 impl VotersCommand {
-    pub fn exec(self) -> Result<(), catalyst_toolbox::stats::Error> {
+    pub fn exec(self) -> Result<(), Report> {
         match self {
             Self::Initials(initials) => initials.exec(),
             Self::Active(active) => active.exec(),

catalyst-toolbox/src/stats/distribution.rs

@@ -5,7 +5,7 @@ fn levels(threshold: u64) -> Vec<Range<u64>> {
     vec![
         (0..450),
         (450..threshold),
-        (500..1_000),
+        (threshold..1_000),
         (1_000..2_000),
         (2_000..5_000),
         (5_000..10_000),
@@ -98,7 +98,9 @@ impl Stats {
 }
 
 fn format_big_number(n: u64) -> String {
-    if n % 1_000_000_000 == 0 {
+    if n == 0 {
+        n.to_string()
+    } else if n % 1_000_000_000 == 0 {
         format!("{} MLD", n / 1_000_000)
     } else if n % 1_00000 == 0 {
         format!("{} M", n / 1_000_000)

catalyst-toolbox/src/stats/voters.rs

@@ -13,7 +13,6 @@ use std::path::Path;
 fn blacklist_addresses(genesis: &Block0Configuration) -> Vec<Address> {
     let discrimination = genesis.blockchain_configuration.discrimination;
 
-    #[allow(clippy::needless_collect)]
     genesis
         .blockchain_configuration
         .committees
@@ -40,12 +39,13 @@ fn vote_counts_as_addresses(
     votes_count: VoteCount,
     genesis: &Block0Configuration,
 ) -> Vec<(InitialUTxO, u32)> {
-    votes_count
+    genesis
+        .initial
         .iter()
-        .filter_map(|(address, votes_count)| {
-            for initials in &genesis.initial {
-                if let Initial::Fund(funds) = initials {
-                    if let Some(utxo) = funds.iter().find(|utxo| {
+        .filter_map(|initials| {
+            if let Initial::Fund(funds) = initials {
+                for utxo in funds {
+                    if let Some((_, votes_count)) = votes_count.iter().find(|(address, _)| {
                         account_hex_to_address(
                             address.to_string(),
                             genesis.blockchain_configuration.discrimination,