fix clippy & run rustfmt

Author: elpiel

adapter/src/lib.rs

@@ -42,15 +42,19 @@ pub fn get_signable_state_root(
     Ok(res)
 }
 
-pub fn get_balance_leaf(is_spender: bool, acc: &Address, amnt: &BigNum) -> Result<[u8; 32], Box<dyn Error>> {
+pub fn get_balance_leaf(
+    is_spender: bool,
+    acc: &Address,
+    amnt: &BigNum,
+) -> Result<[u8; 32], Box<dyn Error>> {
     let address = Token::Address(EthAddress::from_slice(acc.as_bytes()));
     let amount = Token::Uint(
         U256::from_dec_str(&amnt.to_str_radix(10))
             .map_err(|_| ChannelError::InvalidArgument("failed to parse amt".into()))?,
     );
 
     let tokens = if is_spender {
-       vec![Token::String("spender".into()), address, amount]
+        vec![Token::String("spender".into()), address, amount]
     } else {
         vec![address, amount]
     };

primitives/src/balances.rs

@@ -89,12 +89,15 @@ impl<S: BalancesState> Balances<S> {
 
     /// Returns a tuple of the sum of `(earners, spenders)`
     pub fn sum(&self) -> Option<(UnifiedNum, UnifiedNum)> {
-        self.spenders.values().sum::<Option<UnifiedNum>>().map(|spenders| {
-            let earners = self.earners.values().sum::<Option<UnifiedNum>>()?;
+        self.spenders
+            .values()
+            .sum::<Option<UnifiedNum>>()
+            .map(|spenders| {
+                let earners = self.earners.values().sum::<Option<UnifiedNum>>()?;
 
-            Some((earners, spenders))
-        })
-        .flatten()
+                Some((earners, spenders))
+            })
+            .flatten()
     }
 }
 

primitives/src/util/api.rs

@@ -3,8 +3,8 @@ use std::{convert::TryFrom, fmt, str::FromStr};
 use parse_display::Display;
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
-use url::Url;
 pub use url::ParseError;
+use url::Url;
 
 // `url::Url::scheme()` returns lower-cased ASCII string without `:`
 const SCHEMES: [&str; 2] = ["http", "https"];

sentry/src/routes/channel.rs

@@ -246,7 +246,7 @@ async fn create_or_update_spendable_document(
     };
 
     let spendable = Spendable {
-        channel: channel.clone(),
+        channel: *channel,
         deposit: Deposit {
             total,
             still_on_create2,

validator_worker/src/channel.rs

@@ -4,9 +4,7 @@ use crate::{
     sentry_interface::{campaigns::all_campaigns, Validator, Validators},
     SentryApi,
 };
-use primitives::{
-    adapter::Adapter, channel_v5::Channel, config::Config, util::ApiUrl, ChannelId, UnifiedNum,
-};
+use primitives::{adapter::Adapter, channel_v5::Channel, config::Config, util::ApiUrl, ChannelId};
 // use slog::{error, info, Logger};
 use slog::Logger;
 use std::collections::{hash_map::Entry, HashSet};
@@ -20,7 +18,7 @@ pub async fn channel_tick<A: Adapter + 'static>(
 ) -> Result<ChannelId, Error<A::AdapterError>> {
     let tick = channel
         .find_validator(adapter.whoami())
-        .ok_or_else(|| Error::ChannelNotIntendedForUs)?;
+        .ok_or(Error::ChannelNotIntendedForUs)?;
 
     let sentry = SentryApi::init(
         adapter,
@@ -51,13 +49,14 @@ pub async fn channel_tick<A: Adapter + 'static>(
     }
 
     // TODO: Add timeout
-    let _tick_result =
-        match tick {
-            primitives::Validator::Leader(_v) => todo!(),
-            primitives::Validator::Follower(_v) => follower::tick(&sentry, channel, accounting.balances)
+    let _tick_result = match tick {
+        primitives::Validator::Leader(_v) => todo!(),
+        primitives::Validator::Follower(_v) => {
+            follower::tick(&sentry, channel, accounting.balances)
                 .await
-                .map_err(|err| Error::FollowerTick(channel.id(), TickError::Tick(err)))?,
-        };
+                .map_err(|err| Error::FollowerTick(channel.id(), TickError::Tick(err)))?
+        }
+    };
 
     // Validation #3
     // Accounting.balances != NewState.balances

validator_worker/src/core/follower_rules.rs

@@ -69,7 +69,7 @@ pub fn get_health(
     // TODO: Check if taking the difference between the two sums (earners & spenders) is good enough as a health check!
 
     // Because Accounting should always have >= values than the NewState ones
-    let health_penalty = diff_earners * &UnifiedNum::from(1_000) / &diff_spenders;
+    let health_penalty = diff_earners * UnifiedNum::from(1_000) / diff_spenders;
 
     Some(1_000 - health_penalty.to_u64())
 }

validator_worker/src/error.rs

@@ -32,5 +32,5 @@ pub enum Error<AE: AdapterErrorKind + 'static> {
     Overflow,
     #[error("Whoami is neither a Leader or follower in channel")]
     // TODO: Add channel, validatorId, etc.
-    ChannelNotIntendedForUs
-}
+    ChannelNotIntendedForUs,
+}

validator_worker/src/follower.rs

@@ -218,7 +218,7 @@ pub fn is_valid_transition(
     // sum(accounting.balances.spenders) > sum(new_state.balances.spenders)
     // sum(accounting.balances.earners) > sum(new_state.balances.earners)
     let is_valid =
-        !(accounting_spenders > new_state_spenders) || !(accounting_earners > new_state_earners);
+        accounting_spenders <= new_state_spenders || accounting_earners <= new_state_earners;
 
     Ok(is_valid)
 }

validator_worker/src/lib.rs

@@ -4,10 +4,7 @@
 use std::error::Error;
 
 use adapter::{get_balance_leaf, get_signable_state_root};
-use primitives::{
-    balances::CheckedState, merkle_tree::MerkleTree, Balances,
-    ChannelId,
-};
+use primitives::{balances::CheckedState, merkle_tree::MerkleTree, Balances, ChannelId};
 
 pub use self::sentry_interface::{all_channels, SentryApi};
 
@@ -48,7 +45,7 @@ pub(crate) fn get_state_root_hash(
 mod test {
     use super::*;
 
-    use primitives::{util::tests::prep_db::{ADDRESSES, DUMMY_CAMPAIGN, DUMMY_CHANNEL}};
+    use primitives::util::tests::prep_db::{ADDRESSES, DUMMY_CAMPAIGN, DUMMY_CHANNEL};
 
     #[test]
     // TODO: Double check this test - encoded value! after introducing `spenders` ("spender", address, amount)
@@ -85,7 +82,6 @@ mod test {
         let actual_hash =
             get_state_root_hash(channel, &balances, 18).expect("should get state root hash");
 
-        
         assert_eq!(
             "4fad5375c3ef5f8a9d23a8276fed0151164dea72a5891cec8b43e1d190ed430e",
             hex::encode(actual_hash)

validator_worker/src/main.rs

@@ -1,7 +1,7 @@
 #![deny(rust_2018_idioms)]
 #![deny(clippy::all)]
 
-use std::{collections::HashSet, convert::TryFrom, error::Error, time::Duration};
+use std::{convert::TryFrom, error::Error, time::Duration};
 
 use clap::{crate_version, App, Arg};
 use futures::future::{join, join_all};
@@ -18,21 +18,12 @@ use primitives::{
     config::{configuration, Config},
     util::tests::prep_db::{AUTH, IDS},
     util::ApiUrl,
-    Channel,
     ValidatorId,
-    // Campaign,  ChannelId, SpecValidator,
+    // Campaign, ChannelId, SpecValidator,
 };
 use slog::{error, info, Logger};
 use std::fmt::Debug;
-use validator_worker::{
-    channel::{channel_tick, collect_channels},
-    // all_channels,
-    // error::{Error as ValidatorWorkerError, TickError},
-    // follower, leader, sentry_interface,
-    // sentry_interface::{campaigns::all_campaigns, Validators},
-    // SentryApi,
-    sentry_interface::Validators,
-};
+use validator_worker::channel::{channel_tick, collect_channels};
 
 #[derive(Debug, Clone)]
 struct Args<A: Adapter> {
@@ -152,7 +143,7 @@ fn run<A: Adapter + 'static>(
     adapter.unlock()?;
 
     let args = Args {
-        sentry_url: sentry_url.to_owned(),
+        sentry_url,
         config: config.to_owned(),
         adapter,
     };

validator_worker/src/sentry_interface.rs

@@ -5,7 +5,20 @@ use futures::future::{join_all, try_join_all, TryFutureExt};
 use reqwest::{Client, Response};
 use slog::Logger;
 
-use primitives::{{ChannelId, Config, ToETHChecksum, ValidatorId}, Address, adapter::{Adapter, AdapterErrorKind, Error as AdapterError}, balances::{CheckedState, UncheckedState}, channel::Channel as ChannelOld, channel_v5::Channel, sentry::{AccountingResponse, ChannelListResponse, EventAggregateResponse, LastApprovedResponse, SuccessResponse, ValidatorMessageResponse}, spender::Spender, util::ApiUrl, validator::MessageTypes};
+use primitives::{
+    adapter::{Adapter, AdapterErrorKind, Error as AdapterError},
+    balances::{CheckedState, UncheckedState},
+    channel::Channel as ChannelOld,
+    channel_v5::Channel,
+    sentry::{
+        AccountingResponse, ChannelListResponse, EventAggregateResponse, LastApprovedResponse,
+        SuccessResponse, ValidatorMessageResponse,
+    },
+    spender::Spender,
+    util::ApiUrl,
+    validator::MessageTypes,
+    Address, {ChannelId, Config, ToETHChecksum, ValidatorId},
+};
 use thiserror::Error;
 
 pub type PropagationResult<AE> = Result<ValidatorId, (ValidatorId, Error<AE>)>;
@@ -63,14 +76,13 @@ impl<A: Adapter + 'static> SentryApi<A> {
             .build()
             .map_err(Error::BuildingClient)?;
 
-        let whoami =
-            propagate_to
-                .get(&adapter.whoami())
-                .cloned()
-                .ok_or_else(|| Error::WhoamiMissing {
-                    channel: channel.id(),
-                    whoami: adapter.whoami(),
-                })?;
+        let whoami = propagate_to
+            .get(&adapter.whoami())
+            .cloned()
+            .ok_or_else(|| Error::WhoamiMissing {
+                channel: channel.id(),
+                whoami: adapter.whoami(),
+            })?;
 
         Ok(Self {
             adapter,
@@ -87,18 +99,14 @@ impl<A: Adapter + 'static> SentryApi<A> {
         &self,
         messages: &[&MessageTypes],
     ) -> Vec<PropagationResult<A::AdapterError>> {
-        join_all(
-            self.propagate_to
-                .iter()
-                .map(|(validator_id, validator)| {
-                    propagate_to::<A>(
-                        &self.client,
-                        self.channel.id(),
-                        (*validator_id, validator),
-                        messages,
-                    )
-                }),
-        )
+        join_all(self.propagate_to.iter().map(|(validator_id, validator)| {
+            propagate_to::<A>(
+                &self.client,
+                self.channel.id(),
+                (*validator_id, validator),
+                messages,
+            )
+        }))
         .await
     }
 
@@ -109,11 +117,15 @@ impl<A: Adapter + 'static> SentryApi<A> {
     ) -> Result<Option<MessageTypes>, Error<A::AdapterError>> {
         let message_type = message_types.join("+");
 
-        let endpoint = self.whoami.url.join(&format!(
-            "/validator-messages/{}/{}?limit=1",
-            from.to_checksum(),
-            message_type
-        )).expect("Should parse endpoint");
+        let endpoint = self
+            .whoami
+            .url
+            .join(&format!(
+                "/validator-messages/{}/{}?limit=1",
+                from.to_checksum(),
+                message_type
+            ))
+            .expect("Should parse endpoint");
 
         let result = self
             .client
@@ -140,7 +152,8 @@ impl<A: Adapter + 'static> SentryApi<A> {
     ) -> Result<LastApprovedResponse<UncheckedState>, Error<A::AdapterError>> {
         self.client
             .get(
-                self.whoami.url
+                self.whoami
+                    .url
                     .join(&format!("v5/channel/{}/last-approved", channel))
                     .expect("Should not error while creating endpoint"),
             )
@@ -156,7 +169,8 @@ impl<A: Adapter + 'static> SentryApi<A> {
     ) -> Result<LastApprovedResponse<UncheckedState>, Error<A::AdapterError>> {
         self.client
             .get(
-                self.whoami.url
+                self.whoami
+                    .url
                     .join("last-approved?withHeartbeat=true")
                     .expect("Should not error while creating endpoint"),
             )
@@ -167,13 +181,13 @@ impl<A: Adapter + 'static> SentryApi<A> {
     }
 
     // TODO: Pagination & use of `AllSpendersResponse`
-    pub async fn get_all_spenders(&self) -> Result<HashMap<Address, Spender>, Error<A::AdapterError>> {
+    pub async fn get_all_spenders(
+        &self,
+    ) -> Result<HashMap<Address, Spender>, Error<A::AdapterError>> {
         let url = self
-            .whoami.url
-            .join(&format!(
-                "v5/channel/{}/spender/all",
-                self.channel.id()
-            ))
+            .whoami
+            .url
+            .join(&format!("v5/channel/{}/spender/all", self.channel.id()))
             .expect("Should not error when creating endpoint");
 
         self.client
@@ -189,13 +203,14 @@ impl<A: Adapter + 'static> SentryApi<A> {
 
     /// Get the accounting from Sentry
     /// `Balances` should always be in `CheckedState`
-    pub async fn get_accounting(&self, channel: ChannelId) -> Result<AccountingResponse<CheckedState>, Error<A::AdapterError>> {
+    pub async fn get_accounting(
+        &self,
+        channel: ChannelId,
+    ) -> Result<AccountingResponse<CheckedState>, Error<A::AdapterError>> {
         let url = self
-            .whoami.url
-            .join(&format!(
-                "v5/channel/{}/accounting",
-                channel
-            ))
+            .whoami
+            .url
+            .join(&format!("v5/channel/{}/accounting", channel))
             .expect("Should not error when creating endpoint");
 
         self.client
@@ -214,7 +229,8 @@ impl<A: Adapter + 'static> SentryApi<A> {
         after: DateTime<Utc>,
     ) -> Result<EventAggregateResponse, Error<A::AdapterError>> {
         let url = self
-            .whoami.url
+            .whoami
+            .url
             .join(&format!(
                 "events-aggregates?after={}",
                 after.timestamp_millis()
@@ -238,10 +254,10 @@ async fn propagate_to<A: Adapter>(
     (validator_id, validator): (ValidatorId, &Validator),
     messages: &[&MessageTypes],
 ) -> PropagationResult<A::AdapterError> {
-    let endpoint = validator.url.join(&format!(
-        "v5/channel/{}/validator-messages",
-        channel_id
-    )).expect("Should not error when creating endpoint url");
+    let endpoint = validator
+        .url
+        .join(&format!("v5/channel/{}/validator-messages", channel_id))
+        .expect("Should not error when creating endpoint url");
 
     let mut body = HashMap::new();
     body.insert("messages", messages);
@@ -317,7 +333,7 @@ pub mod campaigns {
         sentry_url: &ApiUrl,
         whoami: ValidatorId,
     ) -> Result<Vec<Campaign>, reqwest::Error> {
-    let first_page = fetch_page(sentry_url, 0, whoami).await?;
+        let first_page = fetch_page(sentry_url, 0, whoami).await?;
 
         if first_page.pagination.total_pages < 2 {
             Ok(first_page.campaigns)