Explore clippy rules and apply quality of life recommendations

.gitignore

@@ -1,6 +1,6 @@
 # Generated by Cargo
 # will have compiled files and executables
-/target/
+target
 
 # Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
 # More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html

tendermint/src/abci.rs

@@ -1,4 +1,4 @@
-//! Application BlockChain Interface (ABCI)
+//! Application Block Chain Interface (ABCI)
 //!
 //! NOTE: This module contains types for ABCI responses as consumed from RPC
 //! endpoints. It does not contain an ABCI protocol implementation.

tendermint/src/abci/code.rs

@@ -19,17 +19,17 @@ pub enum Code {
 }
 
 impl Default for Code {
-    fn default() -> Code {
-        Code::Ok
+    fn default() -> Self {
+        Self::Ok
     }
 }
 
 impl Code {
     /// Was the response OK?
     pub fn is_ok(self) -> bool {
         match self {
-            Code::Ok => true,
-            Code::Err(_) => false,
+            Self::Ok => true,
+            Self::Err(_) => false,
         }
     }
 
@@ -45,16 +45,16 @@ impl Code {
 }
 
 impl From<u32> for Code {
-    fn from(value: u32) -> Code {
+    fn from(value: u32) -> Self {
         match value {
-            0 => Code::Ok,
-            err => Code::Err(err),
+            0 => Self::Ok,
+            err => Self::Err(err),
         }
     }
 }
 
 impl From<Code> for u32 {
-    fn from(code: Code) -> u32 {
+    fn from(code: Code) -> Self {
         match code {
             Code::Ok => 0,
             Code::Err(err) => err,

tendermint/src/abci/data.rs

@@ -44,7 +44,7 @@ impl FromStr for Data {
             .or_else(|_| hex::decode(s))
             .map_err(|_| ErrorKind::Parse)?;
 
-        Ok(Data(bytes))
+        Ok(Self(bytes))
     }
 }
 

tendermint/src/abci/gas.rs

@@ -18,19 +18,19 @@ pub struct Gas(u64);
 
 impl Gas {
     /// Get the inner integer value
-    pub fn value(self) -> u64 {
+    pub const fn value(self) -> u64 {
         self.0
     }
 }
 
 impl From<u64> for Gas {
-    fn from(amount: u64) -> Gas {
-        Gas(amount)
+    fn from(amount: u64) -> Self {
+        Self(amount)
     }
 }
 
 impl From<Gas> for u64 {
-    fn from(gas: Gas) -> u64 {
+    fn from(gas: Gas) -> Self {
         gas.0
     }
 }

tendermint/src/abci/log.rs

@@ -15,7 +15,7 @@ impl Log {
 
 impl From<&str> for Log {
     fn from(s: &str) -> Self {
-        Log(s.to_owned())
+        Self(s.to_owned())
     }
 }
 

tendermint/src/abci/path.rs

@@ -21,6 +21,6 @@ impl FromStr for Path {
     type Err = Error;
 
     fn from_str(s: &str) -> Result<Self, Error> {
-        Ok(Path(s.to_owned()))
+        Ok(Self(s.to_owned()))
     }
 }

tendermint/src/abci/proof.rs

@@ -33,7 +33,7 @@ impl FromStr for Proof {
 
     fn from_str(s: &str) -> Result<Self, Error> {
         let bytes = Hex::upper_case().decode(s)?;
-        Ok(Proof(bytes))
+        Ok(Self(bytes))
     }
 }
 

tendermint/src/abci/tag.rs

@@ -28,7 +28,7 @@ impl FromStr for Key {
     type Err = Error;
 
     fn from_str(s: &str) -> Result<Self, Error> {
-        Ok(Key(s.into()))
+        Ok(Self(s.into()))
     }
 }
 
@@ -52,7 +52,7 @@ impl FromStr for Value {
     type Err = Error;
 
     fn from_str(s: &str) -> Result<Self, Error> {
-        Ok(Value(s.into()))
+        Ok(Self(s.into()))
     }
 }
 

tendermint/src/abci/transaction.rs

@@ -16,13 +16,14 @@ pub struct Transaction(Vec<u8>);
 
 impl Transaction {
     /// Create a new raw transaction from a byte vector
-    pub fn new<V>(into_vec: V) -> Transaction
+    pub fn new<V>(into_vec: V) -> Self
     where
         V: Into<Vec<u8>>,
     {
-        Transaction(into_vec.into())
+        Self(into_vec.into())
     }
 
+    #[allow(clippy::missing_const_for_fn)]
     /// Convert this transaction into a byte vector
     pub fn into_vec(self) -> Vec<u8> {
         self.0
@@ -68,11 +69,11 @@ pub struct Data {
 
 impl Data {
     /// Create a new transaction data collection
-    pub fn new<I>(into_transactions: I) -> Data
+    pub fn new<I>(into_transactions: I) -> Self
     where
         I: Into<Vec<Transaction>>,
     {
-        Data {
+        Self {
             txs: Some(into_transactions.into()),
         }
     }

tendermint/src/abci/transaction/hash.rs

@@ -1,6 +1,6 @@
 //! Transaction hashes
 
-use crate::error::{Error, ErrorKind};
+use crate::{Error, ErrorKind};
 use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
 use std::{
     fmt::{self, Debug, Display},
@@ -18,8 +18,8 @@ pub struct Hash([u8; LENGTH]);
 
 impl Hash {
     /// Create a new transaction hash from raw bytes
-    pub fn new(bytes: [u8; LENGTH]) -> Hash {
-        Hash(bytes)
+    pub const fn new(bytes: [u8; LENGTH]) -> Self {
+        Self(bytes)
     }
 
     /// Borrow the transaction hash as a byte slice
@@ -36,7 +36,7 @@ impl AsRef<[u8]> for Hash {
 
 impl ConstantTimeEq for Hash {
     #[inline]
-    fn ct_eq(&self, other: &Hash) -> subtle::Choice {
+    fn ct_eq(&self, other: &Self) -> subtle::Choice {
         self.as_bytes().ct_eq(other.as_bytes())
     }
 }
@@ -70,9 +70,9 @@ impl FromStr for Hash {
             return Err(ErrorKind::Parse.into());
         }
 
-        let mut result_bytes = [0u8; LENGTH];
+        let mut result_bytes = [0_u8; LENGTH];
         result_bytes.copy_from_slice(&bytes);
-        Ok(Hash(result_bytes))
+        Ok(Self(result_bytes))
     }
 }
 

tendermint/src/account.rs

@@ -1,6 +1,6 @@
 //! Tendermint accounts
 
-use crate::error::{Error, ErrorKind};
+use crate::{Error, ErrorKind};
 use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
 use sha2::{Digest, Sha256};
 use signatory::{ecdsa::curve::secp256k1, ed25519};
@@ -20,8 +20,8 @@ pub struct Id([u8; LENGTH]);
 
 impl Id {
     /// Create a new account ID from raw bytes
-    pub fn new(bytes: [u8; LENGTH]) -> Id {
-        Id(bytes)
+    pub const fn new(bytes: [u8; LENGTH]) -> Self {
+        Self(bytes)
     }
 
     /// Borrow the account ID as a byte slice
@@ -38,7 +38,7 @@ impl AsRef<[u8]> for Id {
 
 impl ConstantTimeEq for Id {
     #[inline]
-    fn ct_eq(&self, other: &Id) -> subtle::Choice {
+    fn ct_eq(&self, other: &Self) -> subtle::Choice {
         self.as_bytes().ct_eq(other.as_bytes())
     }
 }
@@ -60,21 +60,21 @@ impl Debug for Id {
 
 // TODO: should be RIPEMD160(SHA256(pk))
 impl From<secp256k1::PublicKey> for Id {
-    fn from(pk: secp256k1::PublicKey) -> Id {
+    fn from(pk: secp256k1::PublicKey) -> Self {
         let digest = Sha256::digest(pk.as_bytes());
-        let mut bytes = [0u8; LENGTH];
+        let mut bytes = [0_u8; LENGTH];
         bytes.copy_from_slice(&digest[..LENGTH]);
-        Id(bytes)
+        Self(bytes)
     }
 }
 
 // SHA256(pk)[:20]
 impl From<ed25519::PublicKey> for Id {
-    fn from(pk: ed25519::PublicKey) -> Id {
+    fn from(pk: ed25519::PublicKey) -> Self {
         let digest = Sha256::digest(pk.as_bytes());
-        let mut bytes = [0u8; LENGTH];
+        let mut bytes = [0_u8; LENGTH];
         bytes.copy_from_slice(&digest[..LENGTH]);
-        Id(bytes)
+        Self(bytes)
     }
 }
 
@@ -92,9 +92,9 @@ impl FromStr for Id {
             return Err(ErrorKind::Parse.into());
         }
 
-        let mut result_bytes = [0u8; LENGTH];
+        let mut result_bytes = [0_u8; LENGTH];
         result_bytes.copy_from_slice(&bytes);
-        Ok(Id(result_bytes))
+        Ok(Self(result_bytes))
     }
 }
 

tendermint/src/amino_types.rs

@@ -3,27 +3,31 @@
 
 #![allow(missing_docs)]
 
-pub mod block_id;
-pub mod ed25519;
-pub mod message;
-pub mod ping;
-pub mod proposal;
-pub mod remote_error;
-pub mod signature;
-pub mod time;
-pub mod validate;
-pub mod version;
-pub mod vote;
+mod block_id;
+mod ed25519;
+mod message;
+mod ping;
+mod proposal;
+mod remote_error;
+mod signature;
+mod time;
+mod validate;
+mod version;
+mod vote;
 
 pub use self::{
-    block_id::{BlockId, CanonicalBlockId, CanonicalPartSetHeader, PartsSetHeader},
+    block_id::{BlockId, Canonical as CanonicalBlockId, CanonicalPartSetHeader, PartsSetHeader},
     ed25519::{PubKeyRequest, PubKeyResponse, AMINO_NAME as PUBKEY_AMINO_NAME},
-    ping::{PingRequest, PingResponse, AMINO_NAME as PING_AMINO_NAME},
+    message::Message as AminoMessage,
+    ping::{Request as PingRequest, Response as PingResponse, AMINO_NAME as PING_AMINO_NAME},
     proposal::{SignProposalRequest, SignedProposalResponse, AMINO_NAME as PROPOSAL_AMINO_NAME},
     remote_error::RemoteError,
     signature::{SignableMsg, SignedMsgType},
-    time::TimeMsg,
+    time::Msg as TimeMsg,
     validate::ConsensusMessage,
-    version::ConsensusVersion,
-    vote::{SignVoteRequest, SignedVoteResponse, AMINO_NAME as VOTE_AMINO_NAME},
+    version::Consensus as ConsensusVersion,
+    vote::{
+        Canonical as CanonicalVote, SignVoteRequest, SignedVoteResponse, Vote,
+        AMINO_NAME as VOTE_AMINO_NAME,
+    },
 };

tendermint/src/amino_types/block_id.rs

@@ -17,7 +17,7 @@ pub struct BlockId {
 
 impl BlockId {
     pub fn new(hash: Vec<u8>, parts_header: Option<PartsSetHeader>) -> Self {
-        BlockId { hash, parts_header }
+        Self { hash, parts_header }
     }
 }
 
@@ -35,7 +35,7 @@ impl block::ParseId for BlockId {
 impl From<&block::Id> for BlockId {
     fn from(bid: &block::Id) -> Self {
         let bid_hash = bid.hash.as_bytes();
-        BlockId::new(
+        Self::new(
             bid_hash.to_vec(),
             bid.parts.as_ref().map(PartsSetHeader::from),
         )
@@ -55,14 +55,14 @@ impl ConsensusMessage for BlockId {
 }
 
 #[derive(Clone, PartialEq, Message)]
-pub struct CanonicalBlockId {
+pub struct Canonical {
     #[prost(bytes, tag = "1")]
     pub hash: Vec<u8>,
     #[prost(message, tag = "2")]
     pub parts_header: Option<CanonicalPartSetHeader>,
 }
 
-impl block::ParseId for CanonicalBlockId {
+impl block::ParseId for Canonical {
     fn parse_block_id(&self) -> Result<block::Id, Error> {
         let hash = Hash::new(hash::Algorithm::Sha256, &self.hash)?;
         let parts_header = self
@@ -83,24 +83,22 @@ pub struct PartsSetHeader {
 
 impl PartsSetHeader {
     pub fn new(total: i64, hash: Vec<u8>) -> Self {
-        PartsSetHeader { total, hash }
+        Self { total, hash }
     }
-}
-
-impl From<&parts::Header> for PartsSetHeader {
-    fn from(parts: &parts::Header) -> Self {
-        PartsSetHeader::new(parts.total as i64, parts.hash.as_bytes().to_vec())
-    }
-}
 
-impl PartsSetHeader {
     fn parse_parts_header(&self) -> Option<block::parts::Header> {
         Hash::new(hash::Algorithm::Sha256, &self.hash)
             .map(|hash| block::parts::Header::new(self.total as u64, hash))
             .ok()
     }
 }
 
+impl From<&parts::Header> for PartsSetHeader {
+    fn from(parts: &parts::Header) -> Self {
+        Self::new(parts.total as i64, parts.hash.as_bytes().to_vec())
+    }
+}
+
 impl ConsensusMessage for PartsSetHeader {
     fn validate_basic(&self) -> Result<(), ValidationError> {
         if self.total < 0 {