refactor(validators): make rust linter less unhappy

okp4 · Oct 17, 2022 · 8a9ab45 · 8a9ab45
1 parent 543eb0a
commit 8a9ab45
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 42 deletions.
diff --git a/src/cli/commands/start.rs b/src/cli/commands/start.rs
@@ -9,6 +9,7 @@ use cosmrs::tx::Fee;
 use cosmrs::{bank::MsgSend, Coin};
 use tracing::{error, info};
 
+use crate::cosmos::validators::Validators;
 use crate::{
     cli::{
         config::{DiscordBotConfig, DiscordShardingSection},
@@ -21,7 +22,6 @@ use crate::{
     },
     discord::{discord_client::DiscordActor, discord_server},
 };
-use crate::cosmos::validators::Validators;
 
 #[derive(Command, Debug, Parser)]
 #[clap(arg_required_else_help(true))]
@@ -72,11 +72,11 @@ impl Runnable for StartCmd {
                 .start();
 
             let addr_validators = Validators::new(
-                config.validators.channel_id.clone(),
+                config.validators.channel_id,
                 addr_cosmos_client.clone(),
                 addr_discord_client.clone(),
             )
-                .start();
+            .start();
 
             let addr_tx_handler = TxHandler::<MsgSend>::new(
                 config.chain.chain_id.to_string(),

diff --git a/src/cli/config.rs b/src/cli/config.rs
@@ -163,7 +163,6 @@ pub struct ValidatorsSection {
     pub channel_id: u64,
 }
 
-
 impl Default for ValidatorsSection {
     fn default() -> Self {
         Self {

diff --git a/src/cosmos/client/handlers/get_validators_status.rs b/src/cosmos/client/handlers/get_validators_status.rs
@@ -15,7 +15,10 @@ impl Handler<GetValidatorsStatus> for Client<Channel> {
     fn handle(&mut self, msg: GetValidatorsStatus, _ctx: &mut Self::Context) -> Self::Result {
         let mut validator_client = self.clone().validator();
         Box::pin(async move {
-            info!("handle get validators status request {}", msg.status.as_str_name());
+            info!(
+                "handle get validators status request {}",
+                msg.status.as_str_name()
+            );
 
             let response = validator_client
                 .validators(tonic::Request::new(QueryValidatorsRequest {

diff --git a/src/cosmos/client/messages/validators_status.rs b/src/cosmos/client/messages/validators_status.rs
@@ -13,5 +13,5 @@ pub type GetValidatorsStatusResult = Result<QueryValidatorsResponse, Error>;
 #[rtype(result = "GetValidatorsStatusResult")]
 pub struct GetValidatorsStatus {
     /// status has to be specified
-    pub status: BondStatus
+    pub status: BondStatus,
 }
diff --git a/src/cosmos/tx/mod.rs b/src/cosmos/tx/mod.rs
@@ -8,14 +8,14 @@ pub mod messages;
 use crate::cosmos::client::account::Account;
 use crate::cosmos::client::Client;
 use crate::cosmos::tx::error::Error;
+use crate::cosmos::validators::Validators;
 use crate::discord::discord_client::DiscordActor;
 use actix::Addr;
 use cosmos_sdk_proto::cosmos::auth::v1beta1::BaseAccount;
 use cosmrs::tx::{Body, Fee, Msg, SignDoc, SignerInfo};
 use serenity::model::user::User;
 use std::time::Duration;
 use tonic::transport::Channel;
-use crate::cosmos::validators::Validators;
 
 /// Contains addresses of actors that will be used by the TxHandler
 pub struct Actors {

diff --git a/src/cosmos/validators/handlers/get_new_state.rs b/src/cosmos/validators/handlers/get_new_state.rs
@@ -4,9 +4,9 @@ use tracing::info;
 
 use crate::cosmos::client::messages::validators_status::GetValidatorsStatus;
 use crate::cosmos::tx::error::Error;
-use crate::cosmos::validators::Validators;
 use crate::cosmos::validators::messages::get_state_message::GetStateMessage;
 use crate::cosmos::validators::messages::update_state_message::UpdateStateMessage;
+use crate::cosmos::validators::Validators;
 use crate::discord::discord_client::messages::send_msg::SendMessage;
 
 impl Handler<GetStateMessage> for Validators {
@@ -17,19 +17,23 @@ impl Handler<GetStateMessage> for Validators {
 
         let grpc_client = self.grpc_client.clone();
         let discord_client = self.discord_client.clone();
-        let channel_id = self.channel_id.clone();
+        let channel_id = self.channel_id;
         let validators_current_state = self.validators_current.clone();
-        let self_address = ctx.address().clone();
+        let self_address = ctx.address();
 
         async move {
-            for status in [BondStatus::Unbonded, BondStatus::Bonded, BondStatus::Unbonding] {
-                let _ = grpc_client.send(GetValidatorsStatus { status }).await
-                    .map_err(Error::from).and_then(|response| {
-                    Ok({
-                        response
-                            .map_err(Error::from)
-                            .and_then(|res| Ok(res.validators))
-                            .and_then(|validator_state| {
+            for status in [
+                BondStatus::Unbonded,
+                BondStatus::Bonded,
+                BondStatus::Unbonding,
+            ] {
+                let _ = grpc_client
+                    .send(GetValidatorsStatus { status })
+                    .await
+                    .map_err(Error::from)
+                    .map(|response| {
+                        response.map_err(Error::from).map(|res| res.validators).map(
+                            |validator_state| {
                                 for message in Validators::compute_discord_message(
                                     &validators_current_state,
                                     &validator_state,
@@ -42,14 +46,14 @@ impl Handler<GetStateMessage> for Validators {
                                     });
                                 }
                                 self_address.do_send(UpdateStateMessage {
-                                    validators: validator_state.clone()
+                                    validators: validator_state,
                                 });
-                                Ok({})
-                            })
-                    })
-                });
+                            },
+                        )
+                    });
             }
         }
-            .into_actor(self).wait(ctx);
+        .into_actor(self)
+        .wait(ctx);
     }
 }
diff --git a/src/cosmos/validators/handlers/update_state.rs b/src/cosmos/validators/handlers/update_state.rs
@@ -9,10 +9,11 @@ impl Handler<UpdateStateMessage> for Validators {
     fn handle(&mut self, msg: UpdateStateMessage, _ctx: &mut Self::Context) -> Self::Result {
         debug!("Validators update state");
 
-        msg.validators.clone().iter().for_each(|new_val| {
-            let val_pos = self.validators_current.iter().position(|v|
-                (*v).eq(new_val)
-            );
+        msg.validators.iter().for_each(|new_val| {
+            let val_pos = self
+                .validators_current
+                .iter()
+                .position(|v| (*v).eq(new_val));
             match val_pos {
                 None => {
                     self.validators_current.append(&mut msg.validators.clone());

diff --git a/src/cosmos/validators/messages/get_state_message.rs b/src/cosmos/validators/messages/get_state_message.rs
@@ -5,5 +5,4 @@ pub type GetStateResult = ();
 /// Empty message
 #[derive(Message)]
 #[rtype(result = "GetStateResult")]
-pub struct GetStateMessage {
-}
+pub struct GetStateMessage {}
diff --git a/src/cosmos/validators/messages/mod.rs b/src/cosmos/validators/messages/mod.rs
@@ -1,2 +1,2 @@
-pub mod update_state_message;
 pub(crate) mod get_state_message;
+pub mod update_state_message;
diff --git a/src/cosmos/validators/mod.rs b/src/cosmos/validators/mod.rs
@@ -56,18 +56,18 @@ impl Validators {
     }
 
     fn compute_discord_message(
-        current_validator_state: &Vec<Validator>,
-        new_validator_state: &Vec<Validator>,
+        current_validator_state: &[Validator],
+        new_validator_state: &[Validator],
     ) -> Vec<String> {
         let mut messages: Vec<String> = vec![];
 
         for validator in new_validator_state {
-            let name_to_display = validator.description.as_ref().map_or_else(|| validator.operator_address.clone(),
-                                                                             |d| d.moniker.clone());
+            let name_to_display = validator
+                .description
+                .as_ref()
+                .map_or_else(|| validator.operator_address.clone(), |d| d.moniker.clone());
 
-            let old_state = current_validator_state.iter().find(|v|
-                (**v).eq(validator)
-            );
+            let old_state = current_validator_state.iter().find(|v| (**v).eq(validator));
             match old_state {
                 None => {
                     messages.push(msg_to_str(Message::NewValidator, name_to_display.clone()));
@@ -80,10 +80,12 @@ impl Validators {
                     }
 
                     if validator.status != old_state.status {
-                        messages.push(format!("{} {} ➡️ {}",
-                                              msg_to_str(Message::ChangedStatus, name_to_display.clone()),
-                                              get_status_txt(old_state.status),
-                                              get_status_txt(validator.status)));
+                        messages.push(format!(
+                            "{} {} ➡️ {}",
+                            msg_to_str(Message::ChangedStatus, name_to_display.clone()),
+                            get_status_txt(old_state.status),
+                            get_status_txt(validator.status)
+                        ));
                     }
                 }
             }