clippy

Author: cameron1024

catalyst-toolbox/src/bin/cli/rewards/voters.rs

@@ -37,16 +37,6 @@ pub struct VotersRewards {
     /// Number of global votes required to be able to receive voter rewards
     #[structopt(long, default_value)]
     vote_threshold: u64,
-
-    /// Path to a json-encoded map from challenge id to an optional required threshold
-    /// per-challenge in order to receive rewards.
-    #[structopt(long)]
-    per_challenge_threshold: Option<PathBuf>,
-
-    /// Path to the list of proposals active in this election.
-    /// Can be obtained from /api/v0/proposals.
-    #[structopt(long)]
-    proposals: PathBuf,
 }
 
 fn write_rewards_results(
@@ -74,8 +64,6 @@ impl VotersRewards {
             snapshot_info_path,
             votes_count_path,
             vote_threshold,
-            per_challenge_threshold,
-            proposals,
         } = self;
 
         voter_rewards(

catalyst-toolbox/src/ideascale/mod.rs

@@ -123,16 +123,20 @@ pub fn build_challenges(
         .challenges
         .iter()
         .map(|(i, c)| {
+            let is_community = funnels
+                .get(&c.funnel_id)
+                .unwrap_or_else(|| panic!("A funnel with id {} wasn't found", c.funnel_id))
+                .is_community();
+
+            let challenge_type = match is_community {
+                true => "community-choice".to_string(),
+                false => "simple".to_string(),
+            };
+
             (
                 c.id,
                 models::se::Challenge {
-                    challenge_type: funnels
-                        .get(&c.funnel_id)
-                        .unwrap_or_else(|| panic!("A funnel with id {} wasn't found", c.funnel_id))
-                        .is_community()
-                        .then(|| "community-choice")
-                        .unwrap_or("simple")
-                        .to_string(),
+                    challenge_type,
                     challenge_url: c.challenge_url.clone(),
                     description: c.description.to_string(),
                     fund_id: fund.to_string(),

snapshot-lib/src/influence_cap.rs

@@ -49,10 +49,7 @@ pub fn cap_voting_influence(
     mut voters: Vec<SnapshotInfo>,
     threshold: Fraction,
 ) -> Result<Vec<SnapshotInfo>, Error> {
-    voters = voters
-        .into_iter()
-        .filter(|v| v.hir.voting_power > 0.into())
-        .collect();
+    voters.retain(|v| v.hir.voting_power > 0.into());
 
     if voters.is_empty() {
         return Ok(voters);