From b7e300fd6e14df967efaa3244e4aa1f774f6d149 Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Fri, 3 Jan 2020 11:36:40 +0100
Subject: [PATCH 01/55] Set clippy rules in root

---
 tendermint/src/lib.rs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tendermint/src/lib.rs b/tendermint/src/lib.rs
index 5edfdc293..d778da96a 100644
--- a/tendermint/src/lib.rs
+++ b/tendermint/src/lib.rs
@@ -13,6 +13,14 @@
     unused_qualifications
 )]
 #![forbid(unsafe_code)]
+#![deny(
+    clippy::all,
+    clippy::cargo,
+    clippy::nursery,
+    clippy::pedantic,
+    clippy::restriction,
+    clippy::result_unrwap_used
+)]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/tendermint/kms/master/img/tendermint.png",
     html_root_url = "https://docs.rs/tendermint/0.11.0"

From f4bc257730a671b3d8fe696d83b2387e9394528e Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Fri, 3 Jan 2020 13:53:27 +0100
Subject: [PATCH 02/55] Remove Error prefix in kind enum

---
 tendermint/src/abci/transaction/hash.rs     |  2 +-
 tendermint/src/account.rs                   |  2 +-
 tendermint/src/block/height.rs              |  2 +-
 tendermint/src/chain/id.rs                  |  2 +-
 tendermint/src/config.rs                    |  7 +----
 tendermint/src/config/node_key.rs           |  5 +---
 tendermint/src/config/priv_validator_key.rs |  7 +----
 tendermint/src/error.rs                     | 32 ++++++++++-----------
 tendermint/src/hash.rs                      |  2 +-
 tendermint/src/lib.rs                       |  6 ++--
 tendermint/src/net.rs                       |  3 +-
 tendermint/src/node/id.rs                   |  2 +-
 tendermint/src/public_key.rs                |  2 +-
 tendermint/src/time.rs                      |  2 +-
 tendermint/src/timeout.rs                   |  2 +-
 15 files changed, 32 insertions(+), 46 deletions(-)

diff --git a/tendermint/src/abci/transaction/hash.rs b/tendermint/src/abci/transaction/hash.rs
index 3d90c3740..745199e48 100644
--- a/tendermint/src/abci/transaction/hash.rs
+++ b/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},
diff --git a/tendermint/src/account.rs b/tendermint/src/account.rs
index 59045c4e7..a50aee39d 100644
--- a/tendermint/src/account.rs
+++ b/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};
diff --git a/tendermint/src/block/height.rs b/tendermint/src/block/height.rs
index 1934af69e..0ec04435f 100644
--- a/tendermint/src/block/height.rs
+++ b/tendermint/src/block/height.rs
@@ -1,4 +1,4 @@
-use crate::error::{Error, ErrorKind};
+use crate::{Error, ErrorKind};
 use serde::{de::Error as _, Deserialize, Deserializer, Serialize, Serializer};
 use std::{
     convert::TryFrom,
diff --git a/tendermint/src/chain/id.rs b/tendermint/src/chain/id.rs
index 85279ad26..fc7c3ebf0 100644
--- a/tendermint/src/chain/id.rs
+++ b/tendermint/src/chain/id.rs
@@ -1,6 +1,6 @@
 //! Tendermint blockchain identifiers
 
-use crate::error::{Error, ErrorKind};
+use crate::{Error, ErrorKind};
 use serde::{de::Error as _, Deserialize, Deserializer, Serialize, Serializer};
 use std::{
     cmp::Ordering,
diff --git a/tendermint/src/config.rs b/tendermint/src/config.rs
index d483cc522..060744e43 100644
--- a/tendermint/src/config.rs
+++ b/tendermint/src/config.rs
@@ -11,12 +11,7 @@ mod priv_validator_key;
 
 pub use self::{node_key::NodeKey, priv_validator_key::PrivValidatorKey};
 
-use crate::{
-    abci::tag,
-    error::{Error, ErrorKind},
-    genesis::Genesis,
-    net, node, Moniker, Timeout,
-};
+use crate::{abci::tag, genesis::Genesis, net, node, Error, ErrorKind, Moniker, Timeout};
 use serde::{de, de::Error as _, ser, Deserialize, Serialize};
 use std::{
     collections::BTreeMap,
diff --git a/tendermint/src/config/node_key.rs b/tendermint/src/config/node_key.rs
index e68c627d8..bd9d8f918 100644
--- a/tendermint/src/config/node_key.rs
+++ b/tendermint/src/config/node_key.rs
@@ -1,10 +1,7 @@
 //! Node keys
 
-use crate::{
-    error::{Error, ErrorKind},
-    private_key::PrivateKey,
-};
 use crate::{node, public_key::PublicKey};
+use crate::{private_key::PrivateKey, Error, ErrorKind};
 use serde::{Deserialize, Serialize};
 use std::{fs, path::Path};
 
diff --git a/tendermint/src/config/priv_validator_key.rs b/tendermint/src/config/priv_validator_key.rs
index 0ba4189e7..aa9a009b8 100644
--- a/tendermint/src/config/priv_validator_key.rs
+++ b/tendermint/src/config/priv_validator_key.rs
@@ -1,12 +1,7 @@
 //! Validator private keys
 
 use crate::public_key::TendermintKey;
-use crate::{
-    account,
-    error::{Error, ErrorKind},
-    private_key::PrivateKey,
-    public_key::PublicKey,
-};
+use crate::{account, private_key::PrivateKey, public_key::PublicKey, Error, ErrorKind};
 use serde::{Deserialize, Serialize};
 use std::{fs, path::Path};
 
diff --git a/tendermint/src/error.rs b/tendermint/src/error.rs
index ef13ba75b..f8231c5b2 100644
--- a/tendermint/src/error.rs
+++ b/tendermint/src/error.rs
@@ -22,7 +22,7 @@ macro_rules! err {
 #[derive(Debug)]
 pub struct Error {
     /// Contextual information about the error
-    inner: Context<ErrorKind>,
+    inner: Context<Kind>,
 
     /// Optional message to associate with the error
     msg: Option<String>,
@@ -32,7 +32,7 @@ impl Error {
     /// Create a new error from the given context and optional message
     pub fn new<C>(context: C, msg: Option<String>) -> Self
     where
-        C: Into<Context<ErrorKind>>,
+        C: Into<Context<Kind>>,
     {
         Self {
             inner: context.into(),
@@ -40,8 +40,8 @@ impl Error {
         }
     }
 
-    /// Obtain the error's `ErrorKind`
-    pub fn kind(&self) -> &ErrorKind {
+    /// Obtain the error's `Kind`
+    pub fn kind(&self) -> &Kind {
         self.inner.get_context()
     }
 
@@ -71,39 +71,39 @@ impl Fail for Error {
     }
 }
 
-impl From<ErrorKind> for Error {
-    fn from(kind: ErrorKind) -> Self {
+impl From<Kind> for Error {
+    fn from(kind: Kind) -> Self {
         Error::new(kind, None)
     }
 }
 
 impl From<chrono::ParseError> for Error {
     fn from(err: chrono::ParseError) -> Error {
-        err!(ErrorKind::Parse, err)
+        err!(Kind::Parse, err)
     }
 }
 
 impl From<io::Error> for Error {
     fn from(err: io::Error) -> Self {
-        err!(ErrorKind::Io, err)
+        err!(Kind::Io, err)
     }
 }
 
 impl From<prost::DecodeError> for Error {
     fn from(err: prost::DecodeError) -> Self {
-        err!(ErrorKind::Parse, err)
+        err!(Kind::Parse, err)
     }
 }
 
 impl From<prost::EncodeError> for Error {
     fn from(err: prost::EncodeError) -> Self {
-        err!(ErrorKind::Parse, err)
+        err!(Kind::Parse, err)
     }
 }
 
 impl From<serde_json::error::Error> for Error {
     fn from(err: serde_json::error::Error) -> Self {
-        err!(ErrorKind::Parse, err)
+        err!(Kind::Parse, err)
     }
 }
 
@@ -112,28 +112,28 @@ impl From<signatory::signature::Error> for Error {
         use std::error::Error as _;
 
         if let Some(source) = err.source() {
-            err!(ErrorKind::Crypto, "signature error: {}", source)
+            err!(Kind::Crypto, "signature error: {}", source)
         } else {
-            err!(ErrorKind::Crypto, "signature error")
+            err!(Kind::Crypto, "signature error")
         }
     }
 }
 
 impl From<subtle_encoding::Error> for Error {
     fn from(err: subtle_encoding::Error) -> Error {
-        err!(ErrorKind::Parse, err)
+        err!(Kind::Parse, err)
     }
 }
 
 impl From<toml::de::Error> for Error {
     fn from(err: toml::de::Error) -> Self {
-        err!(ErrorKind::Parse, err)
+        err!(Kind::Parse, err)
     }
 }
 
 /// Kinds of errors
 #[derive(Clone, Eq, PartialEq, Debug, Fail)]
-pub enum ErrorKind {
+pub enum Kind {
     /// Cryptographic operation failed
     #[fail(display = "cryptographic error")]
     Crypto,
diff --git a/tendermint/src/hash.rs b/tendermint/src/hash.rs
index 236ee4114..1c9471c9f 100644
--- a/tendermint/src/hash.rs
+++ b/tendermint/src/hash.rs
@@ -1,6 +1,6 @@
 //! Hash functions and their outputs
 
-use crate::error::{Error, ErrorKind};
+use crate::{Error, ErrorKind};
 use serde::{de::Error as _, Deserialize, Deserializer, Serialize, Serializer};
 use std::{
     fmt::{self, Debug, Display},
diff --git a/tendermint/src/lib.rs b/tendermint/src/lib.rs
index d778da96a..9c8e8335c 100644
--- a/tendermint/src/lib.rs
+++ b/tendermint/src/lib.rs
@@ -12,8 +12,7 @@
     unused_import_braces,
     unused_qualifications
 )]
-#![forbid(unsafe_code)]
-#![deny(
+#![allow(
     clippy::all,
     clippy::cargo,
     clippy::nursery,
@@ -21,6 +20,7 @@
     clippy::restriction,
     clippy::result_unrwap_used
 )]
+#![forbid(clippy::module_name_repetitions)]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/tendermint/kms/master/img/tendermint.png",
     html_root_url = "https://docs.rs/tendermint/0.11.0"
@@ -69,7 +69,7 @@ pub mod vote;
 pub use crate::genesis::Genesis;
 pub use crate::{
     block::Block,
-    error::{Error, ErrorKind},
+    error::{Error, Kind as ErrorKind},
     hash::Hash,
     moniker::Moniker,
     public_key::{PublicKey, TendermintKey},
diff --git a/tendermint/src/net.rs b/tendermint/src/net.rs
index fe8d419ad..45043147f 100644
--- a/tendermint/src/net.rs
+++ b/tendermint/src/net.rs
@@ -1,8 +1,7 @@
 //! Remote addresses (`tcp://` or `unix://`)
 
 use crate::{
-    error::{Error, ErrorKind},
-    node,
+    node, {Error, ErrorKind},
 };
 use serde::{de::Error as _, Deserialize, Deserializer, Serialize, Serializer};
 use std::{
diff --git a/tendermint/src/node/id.rs b/tendermint/src/node/id.rs
index b2c56b980..ff61b1e20 100644
--- a/tendermint/src/node/id.rs
+++ b/tendermint/src/node/id.rs
@@ -1,6 +1,6 @@
 //! Tendermint node IDs
 
-use crate::error::{Error, ErrorKind};
+use crate::{Error, ErrorKind};
 use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
 use sha2::{Digest, Sha256};
 use signatory::ed25519;
diff --git a/tendermint/src/public_key.rs b/tendermint/src/public_key.rs
index 229a029b0..54f82c90d 100644
--- a/tendermint/src/public_key.rs
+++ b/tendermint/src/public_key.rs
@@ -1,6 +1,6 @@
 //! Public keys used in Tendermint networks
 
-use crate::error::{Error, ErrorKind};
+use crate::{Error, ErrorKind};
 use serde::{de::Error as _, Deserialize, Deserializer, Serialize, Serializer};
 use signatory::{ecdsa::curve::secp256k1, ed25519};
 use std::{
diff --git a/tendermint/src/time.rs b/tendermint/src/time.rs
index 52e089b9d..d7dd86f39 100644
--- a/tendermint/src/time.rs
+++ b/tendermint/src/time.rs
@@ -1,6 +1,6 @@
 //! Timestamps used by Tendermint blockchains
 
-use crate::error::{Error, ErrorKind};
+use crate::{Error, ErrorKind};
 use chrono::{DateTime, SecondsFormat, Utc};
 use serde::{Deserialize, Serialize};
 use std::fmt;
diff --git a/tendermint/src/timeout.rs b/tendermint/src/timeout.rs
index 23177b6f1..637856a71 100644
--- a/tendermint/src/timeout.rs
+++ b/tendermint/src/timeout.rs
@@ -82,7 +82,7 @@ impl Serialize for Timeout {
 #[cfg(test)]
 mod tests {
     use super::Timeout;
-    use crate::error::ErrorKind;
+    use crate::ErrorKind;
 
     #[test]
     fn parse_seconds() {

From 4d82f360f8102bd706a45392620764fe1e56c364 Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Fri, 3 Jan 2020 13:58:34 +0100
Subject: [PATCH 03/55] Remove superfluours Info suffix

---
 tendermint/src/node/info.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tendermint/src/node/info.rs b/tendermint/src/node/info.rs
index 11cc44b62..d138dd992 100644
--- a/tendermint/src/node/info.rs
+++ b/tendermint/src/node/info.rs
@@ -8,7 +8,7 @@ use std::fmt::{self, Display};
 #[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
 pub struct Info {
     /// Protocol version information
-    pub protocol_version: ProtocolVersionInfo,
+    pub protocol_version: ProtocolVersion,
 
     /// Node ID
     pub id: node::Id,
@@ -29,12 +29,12 @@ pub struct Info {
     pub moniker: Moniker,
 
     /// Other status information
-    pub other: OtherInfo,
+    pub other: Other,
 }
 
 /// Protocol version information
 #[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
-pub struct ProtocolVersionInfo {
+pub struct ProtocolVersion {
     /// P2P protocol version
     #[serde(
         serialize_with = "serializers::serialize_u64",
@@ -86,7 +86,7 @@ impl Display for ListenAddress {
 
 /// Other information
 #[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
-pub struct OtherInfo {
+pub struct Other {
     /// TX index status
     pub tx_index: TxIndexStatus,
 

From ae598b753439d0a8605e4c102c0e3165edc9895c Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Fri, 3 Jan 2020 13:59:49 +0100
Subject: [PATCH 04/55] Remove superfluours Params suffix

---
 tendermint/src/consensus/params.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tendermint/src/consensus/params.rs b/tendermint/src/consensus/params.rs
index cbe051297..5a16fbe62 100644
--- a/tendermint/src/consensus/params.rs
+++ b/tendermint/src/consensus/params.rs
@@ -13,12 +13,12 @@ pub struct Params {
     pub evidence: evidence::Params,
 
     /// Validator parameters
-    pub validator: ValidatorParams,
+    pub validator: Validator,
 }
 
 /// Validator consensus parameters
 #[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq)]
-pub struct ValidatorParams {
+pub struct Validator {
     /// Allowed algorithms for validator signing
     pub pub_key_types: Vec<public_key::Algorithm>,
 }

From f1f4f9ffdd5ca47ba18d3f8ab709b0b3737e5010 Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Fri, 3 Jan 2020 14:08:32 +0100
Subject: [PATCH 05/55] Remove superfluours Config suffix

---
 tendermint/src/config.rs   | 30 +++++++++++++++---------------
 tendermint/tests/config.rs |  6 +++++-
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/tendermint/src/config.rs b/tendermint/src/config.rs
index 9ac32ad52..3bf519134 100644
--- a/tendermint/src/config.rs
+++ b/tendermint/src/config.rs
@@ -2,7 +2,7 @@
 //!
 //! This module contains types which correspond to the following config files:
 //!
-//! - `config.toml`: `config::TendermintConfig`
+//! - `config.toml`: `config::Tendermint`
 //! - `node_key.rs`: `config::node_key::NodeKey`
 //! - `priv_validator_key.rs`: `config::priv_validator_key::PrivValidatorKey`
 
@@ -22,7 +22,7 @@ use std::{
 
 /// Tendermint `config.toml` file
 #[derive(Clone, Debug, Deserialize, Serialize)]
-pub struct TendermintConfig {
+pub struct Tendermint {
     /// TCP or UNIX socket address of the ABCI application,
     /// or the name of an ABCI application compiled in with the Tendermint binary.
     pub proxy_app: net::Address,
@@ -78,25 +78,25 @@ pub struct TendermintConfig {
     pub filter_peers: bool,
 
     /// rpc server configuration options
-    pub rpc: RpcConfig,
+    pub rpc: Rpc,
 
     /// peer to peer configuration options
-    pub p2p: P2PConfig,
+    pub p2p: P2P,
 
     /// mempool configuration options
-    pub mempool: MempoolConfig,
+    pub mempool: Mempool,
 
     /// consensus configuration options
-    pub consensus: ConsensusConfig,
+    pub consensus: Consensus,
 
     /// transactions indexer configuration options
-    pub tx_index: TxIndexConfig,
+    pub tx_index: TxIndex,
 
     /// instrumentation configuration options
-    pub instrumentation: InstrumentationConfig,
+    pub instrumentation: Instrumentation,
 }
 
-impl TendermintConfig {
+impl Tendermint {
     /// Parse Tendermint `config.toml`
     pub fn parse_toml<T: AsRef<str>>(toml_string: T) -> Result<Self, Error> {
         Ok(toml::from_str(toml_string.as_ref())?)
@@ -255,7 +255,7 @@ pub enum AbciMode {
 
 /// Tendermint `config.toml` file's `[rpc]` section
 #[derive(Clone, Debug, Deserialize, Serialize)]
-pub struct RpcConfig {
+pub struct Rpc {
     /// TCP or UNIX socket address for the RPC server to listen on
     pub laddr: net::Address,
 
@@ -358,7 +358,7 @@ impl fmt::Display for CorsHeader {
 
 /// peer to peer configuration options
 #[derive(Clone, Debug, Deserialize, Serialize)]
-pub struct P2PConfig {
+pub struct P2P {
     /// Address to listen for incoming connections
     pub laddr: net::Address,
 
@@ -439,7 +439,7 @@ pub struct P2PConfig {
 
 /// mempool configuration options
 #[derive(Clone, Debug, Deserialize, Serialize)]
-pub struct MempoolConfig {
+pub struct Mempool {
     /// Recheck enabled
     pub recheck: bool,
 
@@ -464,7 +464,7 @@ pub struct MempoolConfig {
 
 /// consensus configuration options
 #[derive(Clone, Debug, Deserialize, Serialize)]
-pub struct ConsensusConfig {
+pub struct Consensus {
     /// Path to WAL file
     pub wal_file: PathBuf,
 
@@ -507,7 +507,7 @@ pub struct ConsensusConfig {
 
 /// transactions indexer configuration options
 #[derive(Clone, Debug, Deserialize, Serialize)]
-pub struct TxIndexConfig {
+pub struct TxIndex {
     /// What indexer to use for transactions
     #[serde(default)]
     pub indexer: TxIndexer,
@@ -547,7 +547,7 @@ impl Default for TxIndexer {
 
 /// instrumentation configuration options
 #[derive(Clone, Debug, Deserialize, Serialize)]
-pub struct InstrumentationConfig {
+pub struct Instrumentation {
     /// When `true`, Prometheus metrics are served under /metrics on
     /// PrometheusListenAddr.
     pub prometheus: bool,
diff --git a/tendermint/tests/config.rs b/tendermint/tests/config.rs
index 4fbad50f2..c14ce8ad5 100644
--- a/tendermint/tests/config.rs
+++ b/tendermint/tests/config.rs
@@ -4,7 +4,11 @@
 
 mod files {
     use std::{fs, path::PathBuf, time::Duration};
-    use tendermint::{config::*, net, node};
+    use tendermint::config::{
+        AbciMode, DbBackend, LogFormat, NodeKey, PrivValidatorKey, Tendermint as TendermintConfig,
+        TxIndexer,
+    };
+    use tendermint::{net, node};
 
     /// Read a fixture file from the `support/config` directory
     fn read_fixture(name: &str) -> String {

From 6f423a788bbad2a067a29b0dc7c3a616a5b723a0 Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Fri, 3 Jan 2020 14:10:00 +0100
Subject: [PATCH 06/55] Remove superfluours Id suffix

---
 tendermint/src/block.rs    | 2 +-
 tendermint/src/block/id.rs | 2 +-
 tendermint/src/chain.rs    | 2 +-
 tendermint/src/chain/id.rs | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tendermint/src/block.rs b/tendermint/src/block.rs
index 3cccbf888..bd1f56fde 100644
--- a/tendermint/src/block.rs
+++ b/tendermint/src/block.rs
@@ -13,7 +13,7 @@ pub use self::{
     commit::*,
     header::{parse_non_empty_block_id, Header},
     height::*,
-    id::{Id, ParseId},
+    id::{Id, Parse as ParseId},
     meta::Meta,
     size::Size,
 };
diff --git a/tendermint/src/block/id.rs b/tendermint/src/block/id.rs
index 37ceff027..4a299ecfb 100644
--- a/tendermint/src/block/id.rs
+++ b/tendermint/src/block/id.rs
@@ -68,7 +68,7 @@ impl FromStr for Id {
 }
 
 /// Parse `block::Id` from a type
-pub trait ParseId {
+pub trait Parse {
     /// Parse `block::Id`, or return an `Error` if parsing failed
     fn parse_block_id(&self) -> Result<Id, Error>;
 }
diff --git a/tendermint/src/chain.rs b/tendermint/src/chain.rs
index f8550a1d3..ef7ea762d 100644
--- a/tendermint/src/chain.rs
+++ b/tendermint/src/chain.rs
@@ -4,6 +4,6 @@ pub mod id;
 mod info;
 
 pub use self::{
-    id::{Id, ParseId},
+    id::{Id, Parse as ParseId},
     info::*,
 };
diff --git a/tendermint/src/chain/id.rs b/tendermint/src/chain/id.rs
index fc7c3ebf0..a0f372be0 100644
--- a/tendermint/src/chain/id.rs
+++ b/tendermint/src/chain/id.rs
@@ -122,7 +122,7 @@ impl<'de> Deserialize<'de> for Id {
 }
 
 /// Parse `chain::Id` from a type
-pub trait ParseId {
+pub trait Parse {
     /// Parse `chain::Id`, or return an `Error` if parsing failed
     fn parse_chain_id(&self) -> Result<Id, Error>;
 }

From e2220a1ae5b3a472d63da358ec44ca03d5f6ee21 Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Fri, 3 Jan 2020 14:16:48 +0100
Subject: [PATCH 07/55] Remove superfluours Version suffix

---
 tendermint/src/amino_types.rs         | 2 +-
 tendermint/src/amino_types/version.rs | 8 ++++----
 tendermint/src/block.rs               | 2 +-
 tendermint/src/block/height.rs        | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tendermint/src/amino_types.rs b/tendermint/src/amino_types.rs
index 448c4f009..0a27ff458 100644
--- a/tendermint/src/amino_types.rs
+++ b/tendermint/src/amino_types.rs
@@ -24,6 +24,6 @@ pub use self::{
     signature::{SignableMsg, SignedMsgType},
     time::TimeMsg,
     validate::ConsensusMessage,
-    version::ConsensusVersion,
+    version::Consensus as ConsensusVersion,
     vote::{SignVoteRequest, SignedVoteResponse, AMINO_NAME as VOTE_AMINO_NAME},
 };
diff --git a/tendermint/src/amino_types/version.rs b/tendermint/src/amino_types/version.rs
index b9561654f..587ca939b 100644
--- a/tendermint/src/amino_types/version.rs
+++ b/tendermint/src/amino_types/version.rs
@@ -1,7 +1,7 @@
-use crate::block::*;
+use crate::block::header;
 
 #[derive(Clone, Message)]
-pub struct ConsensusVersion {
+pub struct Consensus {
     /// Block version
     #[prost(uint64, tag = "1")]
     pub block: u64,
@@ -11,9 +11,9 @@ pub struct ConsensusVersion {
     pub app: u64,
 }
 
-impl From<&header::Version> for ConsensusVersion {
+impl From<&header::Version> for Consensus {
     fn from(version: &header::Version) -> Self {
-        ConsensusVersion {
+        Consensus {
             block: version.block,
             app: version.app,
         }
diff --git a/tendermint/src/block.rs b/tendermint/src/block.rs
index bd1f56fde..64c1686a5 100644
--- a/tendermint/src/block.rs
+++ b/tendermint/src/block.rs
@@ -12,7 +12,7 @@ mod size;
 pub use self::{
     commit::*,
     header::{parse_non_empty_block_id, Header},
-    height::*,
+    height::{Height, Parse as ParseHeight},
     id::{Id, Parse as ParseId},
     meta::Meta,
     size::Size,
diff --git a/tendermint/src/block/height.rs b/tendermint/src/block/height.rs
index 0ec04435f..1cfcee991 100644
--- a/tendermint/src/block/height.rs
+++ b/tendermint/src/block/height.rs
@@ -95,7 +95,7 @@ impl Serialize for Height {
 }
 
 /// Parse `block::Height` from a type
-pub trait ParseHeight {
+pub trait Parse {
     /// Parse `block::Height`, or return an `Error` if parsing failed
     fn parse_block_height(&self) -> Result<Height, Error>;
 }

From 2810c8939bf9232c6742313a4c11274f3022297f Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Fri, 3 Jan 2020 16:39:32 +0100
Subject: [PATCH 08/55] Remove superfluous BlockId suffix

---
 tendermint/src/amino_types.rs          | 2 +-
 tendermint/src/amino_types/block_id.rs | 4 ++--
 tendermint/src/amino_types/proposal.rs | 2 +-
 tendermint/src/amino_types/vote.rs     | 3 +--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/tendermint/src/amino_types.rs b/tendermint/src/amino_types.rs
index 0a27ff458..72db73d7e 100644
--- a/tendermint/src/amino_types.rs
+++ b/tendermint/src/amino_types.rs
@@ -16,7 +16,7 @@ pub mod version;
 pub 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},
     proposal::{SignProposalRequest, SignedProposalResponse, AMINO_NAME as PROPOSAL_AMINO_NAME},
diff --git a/tendermint/src/amino_types/block_id.rs b/tendermint/src/amino_types/block_id.rs
index f3701c0bc..422098c58 100644
--- a/tendermint/src/amino_types/block_id.rs
+++ b/tendermint/src/amino_types/block_id.rs
@@ -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
diff --git a/tendermint/src/amino_types/proposal.rs b/tendermint/src/amino_types/proposal.rs
index a018a2d15..965f2aa70 100644
--- a/tendermint/src/amino_types/proposal.rs
+++ b/tendermint/src/amino_types/proposal.rs
@@ -1,9 +1,9 @@
 use super::{
-    block_id::{BlockId, CanonicalBlockId, CanonicalPartSetHeader},
     remote_error::RemoteError,
     signature::{SignableMsg, SignedMsgType},
     time::TimeMsg,
     validate::{ConsensusMessage, ValidationError, ValidationErrorKind::*},
+    BlockId, CanonicalBlockId, CanonicalPartSetHeader,
 };
 use crate::{
     block::{self, ParseId},
diff --git a/tendermint/src/amino_types/vote.rs b/tendermint/src/amino_types/vote.rs
index 57b787970..3a7482932 100644
--- a/tendermint/src/amino_types/vote.rs
+++ b/tendermint/src/amino_types/vote.rs
@@ -1,10 +1,9 @@
 use super::{
-    block_id::{BlockId, CanonicalBlockId, CanonicalPartSetHeader},
     remote_error::RemoteError,
     signature::SignableMsg,
     time::TimeMsg,
     validate::{ConsensusMessage, ValidationError, ValidationErrorKind::*},
-    SignedMsgType,
+    BlockId, CanonicalBlockId, CanonicalPartSetHeader, SignedMsgType,
 };
 use crate::amino_types::PartsSetHeader;
 use crate::{

From faf0fe66af8213cb49113b52622a518eae1513f2 Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Fri, 3 Jan 2020 16:43:50 +0100
Subject: [PATCH 09/55] Remove superfluous Amino prefix

---
 tendermint/src/amino_types.rs         | 1 +
 tendermint/src/amino_types/message.rs | 4 ++--
 tendermint/src/amino_types/vote.rs    | 2 +-
 tendermint/src/block/header.rs        | 2 +-
 tendermint/src/validator.rs           | 2 +-
 tendermint/src/vote.rs                | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/tendermint/src/amino_types.rs b/tendermint/src/amino_types.rs
index 72db73d7e..b248455d6 100644
--- a/tendermint/src/amino_types.rs
+++ b/tendermint/src/amino_types.rs
@@ -18,6 +18,7 @@ pub mod vote;
 pub use self::{
     block_id::{BlockId, Canonical as CanonicalBlockId, CanonicalPartSetHeader, PartsSetHeader},
     ed25519::{PubKeyRequest, PubKeyResponse, AMINO_NAME as PUBKEY_AMINO_NAME},
+    message::Message as AminoMessage,
     ping::{PingRequest, PingResponse, AMINO_NAME as PING_AMINO_NAME},
     proposal::{SignProposalRequest, SignedProposalResponse, AMINO_NAME as PROPOSAL_AMINO_NAME},
     remote_error::RemoteError,
diff --git a/tendermint/src/amino_types/message.rs b/tendermint/src/amino_types/message.rs
index 9600699ef..35458675a 100644
--- a/tendermint/src/amino_types/message.rs
+++ b/tendermint/src/amino_types/message.rs
@@ -3,7 +3,7 @@ use std::convert::TryInto;
 
 /// Extend the original prost::Message trait with a few helper functions in order to
 /// reduce boiler-plate code (and without modifying the prost-amino dependency).
-pub trait AminoMessage: prost_amino::Message {
+pub trait Message: prost_amino::Message {
     /// Directly amino encode a prost-amino message into a freshly created Vec<u8>.
     /// This can be useful when passing those bytes directly to a hasher, or,
     /// to reduce boiler plate code when working with the encoded bytes.
@@ -34,6 +34,6 @@ pub trait AminoMessage: prost_amino::Message {
         res
     }
 }
-impl<M: prost_amino::Message> AminoMessage for M {
+impl<M: prost_amino::Message> Message for M {
     // blanket impl
 }
diff --git a/tendermint/src/amino_types/vote.rs b/tendermint/src/amino_types/vote.rs
index 3a7482932..c9926e808 100644
--- a/tendermint/src/amino_types/vote.rs
+++ b/tendermint/src/amino_types/vote.rs
@@ -239,7 +239,7 @@ impl ConsensusMessage for Vote {
 mod tests {
     use super::super::PartsSetHeader;
     use super::*;
-    use crate::amino_types::message::AminoMessage;
+    use crate::amino_types::AminoMessage;
     use crate::amino_types::SignedMsgType;
     use chrono::{DateTime, Utc};
 
diff --git a/tendermint/src/block/header.rs b/tendermint/src/block/header.rs
index 427177569..c4a76275c 100644
--- a/tendermint/src/block/header.rs
+++ b/tendermint/src/block/header.rs
@@ -2,7 +2,7 @@
 use crate::merkle::simple_hash_from_byte_vectors;
 use crate::serializers;
 use crate::{account, amino_types, block, chain, lite, Hash, Time};
-use amino_types::{message::AminoMessage, BlockId, ConsensusVersion, TimeMsg};
+use amino_types::{AminoMessage, BlockId, ConsensusVersion, TimeMsg};
 use serde::{de::Error as _, Deserialize, Deserializer, Serialize};
 use std::str::FromStr;
 
diff --git a/tendermint/src/validator.rs b/tendermint/src/validator.rs
index dc2090ec6..8802562eb 100644
--- a/tendermint/src/validator.rs
+++ b/tendermint/src/validator.rs
@@ -1,6 +1,6 @@
 //! Tendermint validators
 
-use crate::amino_types::message::AminoMessage;
+use crate::amino_types::AminoMessage;
 use crate::{account, lite, merkle, vote, Hash, PublicKey};
 use serde::{de::Error as _, Deserialize, Deserializer, Serialize, Serializer};
 use signatory::{
diff --git a/tendermint/src/vote.rs b/tendermint/src/vote.rs
index 38070e9ff..a2e509fb1 100644
--- a/tendermint/src/vote.rs
+++ b/tendermint/src/vote.rs
@@ -4,7 +4,7 @@ mod power;
 
 pub use self::power::Power;
 use crate::amino_types;
-use crate::amino_types::message::AminoMessage;
+use crate::amino_types::AminoMessage;
 use crate::{account, block, Signature, Time};
 use {
     crate::serializers,

From 827285ef3d78fd1118f54224e597bca3df0ffe43 Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Fri, 3 Jan 2020 16:45:13 +0100
Subject: [PATCH 10/55] Remove superfluous Ping prefix

---
 tendermint/src/amino_types.rs      | 2 +-
 tendermint/src/amino_types/ping.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tendermint/src/amino_types.rs b/tendermint/src/amino_types.rs
index b248455d6..8f309a010 100644
--- a/tendermint/src/amino_types.rs
+++ b/tendermint/src/amino_types.rs
@@ -19,7 +19,7 @@ pub use self::{
     block_id::{BlockId, Canonical as CanonicalBlockId, CanonicalPartSetHeader, PartsSetHeader},
     ed25519::{PubKeyRequest, PubKeyResponse, AMINO_NAME as PUBKEY_AMINO_NAME},
     message::Message as AminoMessage,
-    ping::{PingRequest, PingResponse, AMINO_NAME as PING_AMINO_NAME},
+    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},
diff --git a/tendermint/src/amino_types/ping.rs b/tendermint/src/amino_types/ping.rs
index 60fd6425d..4b5d0e8b4 100644
--- a/tendermint/src/amino_types/ping.rs
+++ b/tendermint/src/amino_types/ping.rs
@@ -2,8 +2,8 @@ pub const AMINO_NAME: &str = "tendermint/remotesigner/PingRequest";
 
 #[derive(Clone, PartialEq, Message)]
 #[amino_name = "tendermint/remotesigner/PingRequest"]
-pub struct PingRequest {}
+pub struct Request {}
 
 #[derive(Clone, PartialEq, Message)]
 #[amino_name = "tendermint/remotesigner/PingResponse"]
-pub struct PingResponse {}
+pub struct Response {}

From 17c7996283593973aa135e1dc2c11e9de6d631dc Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Fri, 3 Jan 2020 16:48:10 +0100
Subject: [PATCH 11/55] Remove superfluous RemoteError prefix

---
 tendermint/src/amino_types/remote_error.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tendermint/src/amino_types/remote_error.rs b/tendermint/src/amino_types/remote_error.rs
index 8c867166c..2bcdfbc8e 100644
--- a/tendermint/src/amino_types/remote_error.rs
+++ b/tendermint/src/amino_types/remote_error.rs
@@ -11,7 +11,7 @@ pub struct RemoteError {
 // <https://github.com/tendermint/tendermint/blob/master/privval/errors.go>
 #[derive(Copy, Clone, Debug, Eq, PartialEq)]
 #[repr(i32)]
-pub enum RemoteErrorCode {
+pub enum Code {
     /// Generic error code useful when the others don't apply
     RemoteSignerError = 1,
 
@@ -23,7 +23,7 @@ impl RemoteError {
     /// Create a new double signing error with the given message
     pub fn double_sign(height: i64) -> Self {
         RemoteError {
-            code: RemoteErrorCode::DoubleSignError as i32,
+            code: Code::DoubleSignError as i32,
             description: format!("double signing requested at height: {}", height),
         }
     }

From 2d7607d1596fa56f19d75a6d28db5851063f16c9 Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Fri, 3 Jan 2020 16:48:10 +0100
Subject: [PATCH 12/55] Remove superfluous RemoteError prefix

---
 tendermint/src/amino_types/remote_error.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tendermint/src/amino_types/remote_error.rs b/tendermint/src/amino_types/remote_error.rs
index 2bcdfbc8e..9b2067558 100644
--- a/tendermint/src/amino_types/remote_error.rs
+++ b/tendermint/src/amino_types/remote_error.rs
@@ -11,7 +11,8 @@ pub struct RemoteError {
 // <https://github.com/tendermint/tendermint/blob/master/privval/errors.go>
 #[derive(Copy, Clone, Debug, Eq, PartialEq)]
 #[repr(i32)]
-pub enum Code {
+enum Code {
+    #[allow(dead_code)]
     /// Generic error code useful when the others don't apply
     RemoteSignerError = 1,
 

From 5ddb642b2edb8a3b21815a1211652557e082e7d4 Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Fri, 3 Jan 2020 16:59:21 +0100
Subject: [PATCH 13/55] Lock down amino module surface

---
 tendermint/src/amino_types.rs | 26 ++++++++++++++------------
 tendermint/src/vote.rs        |  9 ++++-----
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/tendermint/src/amino_types.rs b/tendermint/src/amino_types.rs
index 8f309a010..d04dc94a1 100644
--- a/tendermint/src/amino_types.rs
+++ b/tendermint/src/amino_types.rs
@@ -3,17 +3,17 @@
 
 #![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, Canonical as CanonicalBlockId, CanonicalPartSetHeader, PartsSetHeader},
@@ -26,5 +26,7 @@ pub use self::{
     time::TimeMsg,
     validate::ConsensusMessage,
     version::Consensus as ConsensusVersion,
-    vote::{SignVoteRequest, SignedVoteResponse, AMINO_NAME as VOTE_AMINO_NAME},
+    vote::{
+        CanonicalVote, SignVoteRequest, SignedVoteResponse, Vote, AMINO_NAME as VOTE_AMINO_NAME,
+    },
 };
diff --git a/tendermint/src/vote.rs b/tendermint/src/vote.rs
index a2e509fb1..8c4b63be8 100644
--- a/tendermint/src/vote.rs
+++ b/tendermint/src/vote.rs
@@ -3,8 +3,7 @@
 mod power;
 
 pub use self::power::Power;
-use crate::amino_types;
-use crate::amino_types::AminoMessage;
+use crate::amino_types::{self, AminoMessage};
 use crate::{account, block, Signature, Time};
 use {
     crate::serializers,
@@ -72,7 +71,7 @@ impl Vote {
 /// SignedVote is the union of a canonicalized vote, the signature on
 /// the sign bytes of that vote and the id of the validator who signed it.
 pub struct SignedVote {
-    vote: amino_types::vote::CanonicalVote,
+    vote: amino_types::CanonicalVote,
     validator_address: account::Id,
     signature: Signature,
 }
@@ -81,12 +80,12 @@ impl SignedVote {
     /// Create new SignedVote from provided canonicalized vote, validator id, and
     /// the signature of that validator.
     pub fn new(
-        vote: amino_types::vote::Vote,
+        vote: amino_types::Vote,
         chain_id: &str,
         validator_address: account::Id,
         signature: Signature,
     ) -> SignedVote {
-        let canonical_vote = amino_types::vote::CanonicalVote::new(vote, chain_id);
+        let canonical_vote = amino_types::CanonicalVote::new(vote, chain_id);
         SignedVote {
             vote: canonical_vote,
             signature,

From 7e3b87fa1b69bc2dd5bbeaa03f1ca127591712f2 Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Fri, 3 Jan 2020 17:09:00 +0100
Subject: [PATCH 14/55] Remove superfluous Time prefix

---
 tendermint/src/amino_types.rs          |  2 +-
 tendermint/src/amino_types/proposal.rs |  3 +--
 tendermint/src/amino_types/time.rs     | 14 +++++++-------
 tendermint/src/amino_types/vote.rs     |  3 +--
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/tendermint/src/amino_types.rs b/tendermint/src/amino_types.rs
index d04dc94a1..39480058c 100644
--- a/tendermint/src/amino_types.rs
+++ b/tendermint/src/amino_types.rs
@@ -23,7 +23,7 @@ pub use self::{
     proposal::{SignProposalRequest, SignedProposalResponse, AMINO_NAME as PROPOSAL_AMINO_NAME},
     remote_error::RemoteError,
     signature::{SignableMsg, SignedMsgType},
-    time::TimeMsg,
+    time::Msg as TimeMsg,
     validate::ConsensusMessage,
     version::Consensus as ConsensusVersion,
     vote::{
diff --git a/tendermint/src/amino_types/proposal.rs b/tendermint/src/amino_types/proposal.rs
index 965f2aa70..533444179 100644
--- a/tendermint/src/amino_types/proposal.rs
+++ b/tendermint/src/amino_types/proposal.rs
@@ -1,9 +1,8 @@
 use super::{
     remote_error::RemoteError,
     signature::{SignableMsg, SignedMsgType},
-    time::TimeMsg,
     validate::{ConsensusMessage, ValidationError, ValidationErrorKind::*},
-    BlockId, CanonicalBlockId, CanonicalPartSetHeader,
+    BlockId, CanonicalBlockId, CanonicalPartSetHeader, TimeMsg,
 };
 use crate::{
     block::{self, ParseId},
diff --git a/tendermint/src/amino_types/time.rs b/tendermint/src/amino_types/time.rs
index af942c1dc..e0d01f31b 100644
--- a/tendermint/src/amino_types/time.rs
+++ b/tendermint/src/amino_types/time.rs
@@ -8,7 +8,7 @@ use chrono::{TimeZone, Utc};
 use std::time::{Duration, SystemTime, UNIX_EPOCH};
 
 #[derive(Clone, PartialEq, Message)]
-pub struct TimeMsg {
+pub struct Msg {
     // TODO(ismail): switch to protobuf's well known type as soon as
     // https://github.com/tendermint/go-amino/pull/224 was merged
     // and tendermint caught up on the latest amino release.
@@ -18,26 +18,26 @@ pub struct TimeMsg {
     pub nanos: i32,
 }
 
-impl ParseTimestamp for TimeMsg {
+impl ParseTimestamp for Msg {
     fn parse_timestamp(&self) -> Result<Time, Error> {
         Ok(Utc.timestamp(self.seconds, self.nanos as u32).into())
     }
 }
 
-impl From<Time> for TimeMsg {
-    fn from(ts: Time) -> TimeMsg {
+impl From<Time> for Msg {
+    fn from(ts: Time) -> Msg {
         // TODO: non-panicking method for getting this?
         let duration = ts.duration_since(Time::unix_epoch()).unwrap();
         let seconds = duration.as_secs() as i64;
         let nanos = duration.subsec_nanos() as i32;
 
-        TimeMsg { seconds, nanos }
+        Msg { seconds, nanos }
     }
 }
 
 /// Converts `Time` to a `SystemTime`.
-impl From<TimeMsg> for SystemTime {
-    fn from(time: TimeMsg) -> SystemTime {
+impl From<Msg> for SystemTime {
+    fn from(time: Msg) -> SystemTime {
         if time.seconds >= 0 {
             UNIX_EPOCH + Duration::new(time.seconds as u64, time.nanos as u32)
         } else {
diff --git a/tendermint/src/amino_types/vote.rs b/tendermint/src/amino_types/vote.rs
index c9926e808..bab1ff469 100644
--- a/tendermint/src/amino_types/vote.rs
+++ b/tendermint/src/amino_types/vote.rs
@@ -1,9 +1,8 @@
 use super::{
     remote_error::RemoteError,
     signature::SignableMsg,
-    time::TimeMsg,
     validate::{ConsensusMessage, ValidationError, ValidationErrorKind::*},
-    BlockId, CanonicalBlockId, CanonicalPartSetHeader, SignedMsgType,
+    BlockId, CanonicalBlockId, CanonicalPartSetHeader, SignedMsgType, TimeMsg,
 };
 use crate::amino_types::PartsSetHeader;
 use crate::{

From d3dc4b9a642ea219a31732d465cd07ff5ff827a1 Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Fri, 3 Jan 2020 17:11:37 +0100
Subject: [PATCH 15/55] Remove superfluous Vote suffix

---
 tendermint/src/amino_types.rs      |  3 ++-
 tendermint/src/amino_types/vote.rs | 24 ++++++++++++------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/tendermint/src/amino_types.rs b/tendermint/src/amino_types.rs
index 39480058c..df39b7ecf 100644
--- a/tendermint/src/amino_types.rs
+++ b/tendermint/src/amino_types.rs
@@ -27,6 +27,7 @@ pub use self::{
     validate::ConsensusMessage,
     version::Consensus as ConsensusVersion,
     vote::{
-        CanonicalVote, SignVoteRequest, SignedVoteResponse, Vote, AMINO_NAME as VOTE_AMINO_NAME,
+        Canonical as CanonicalVote, SignVoteRequest, SignedVoteResponse, Vote,
+        AMINO_NAME as VOTE_AMINO_NAME,
     },
 };
diff --git a/tendermint/src/amino_types/vote.rs b/tendermint/src/amino_types/vote.rs
index bab1ff469..0babff847 100644
--- a/tendermint/src/amino_types/vote.rs
+++ b/tendermint/src/amino_types/vote.rs
@@ -93,7 +93,7 @@ pub struct SignedVoteResponse {
 }
 
 #[derive(Clone, PartialEq, Message)]
-pub struct CanonicalVote {
+pub struct Canonical {
     #[prost(uint32, tag = "1")]
     pub vote_type: u32,
     #[prost(sfixed64)]
@@ -108,21 +108,21 @@ pub struct CanonicalVote {
     pub chain_id: String,
 }
 
-impl chain::ParseId for CanonicalVote {
+impl chain::ParseId for Canonical {
     fn parse_chain_id(&self) -> Result<chain::Id, Error> {
         self.chain_id.parse()
     }
 }
 
-impl block::ParseHeight for CanonicalVote {
+impl block::ParseHeight for Canonical {
     fn parse_block_height(&self) -> Result<block::Height, Error> {
         block::Height::try_from(self.height)
     }
 }
 
-impl CanonicalVote {
-    pub fn new(vote: Vote, chain_id: &str) -> CanonicalVote {
-        CanonicalVote {
+impl Canonical {
+    pub fn new(vote: Vote, chain_id: &str) -> Canonical {
+        Canonical {
             vote_type: vote.vote_type,
             chain_id: chain_id.to_string(),
             block_id: match vote.block_id {
@@ -161,7 +161,7 @@ impl SignableMsg for SignVoteRequest {
             vo.signature = vec![];
         }
         let vote = svr.vote.unwrap();
-        let cv = CanonicalVote::new(vote, chain_id.as_str());
+        let cv = Canonical::new(vote, chain_id.as_str());
 
         cv.encode_length_delimited(sign_bytes)?;
 
@@ -312,7 +312,7 @@ mod tests {
 
     #[test]
     fn test_sign_bytes_compatibility() {
-        let cv = CanonicalVote::new(Vote::default(), "");
+        let cv = Canonical::new(Vote::default(), "");
         let mut got = vec![];
         // SignBytes are encoded using MarshalBinary and not MarshalBinaryBare
         cv.encode_length_delimited(&mut got).unwrap();
@@ -328,7 +328,7 @@ mod tests {
             vt_precommit.round = 1;
             vt_precommit.vote_type = SignedMsgType::PreCommit.to_u32(); // precommit
             println!("{:?}", vt_precommit);
-            let cv_precommit = CanonicalVote::new(vt_precommit, "");
+            let cv_precommit = Canonical::new(vt_precommit, "");
             let got = AminoMessage::bytes_vec(&cv_precommit);
             let want = vec![
                 0x8,  // (field_number << 3) | wire_type
@@ -350,7 +350,7 @@ mod tests {
             vt_prevote.round = 1;
             vt_prevote.vote_type = SignedMsgType::PreVote.to_u32();
 
-            let cv_prevote = CanonicalVote::new(vt_prevote, "");
+            let cv_prevote = Canonical::new(vt_prevote, "");
 
             let got = AminoMessage::bytes_vec(&cv_prevote);
 
@@ -373,7 +373,7 @@ mod tests {
             vt_no_type.height = 1;
             vt_no_type.round = 1;
 
-            let cv = CanonicalVote::new(vt_no_type, "");
+            let cv = Canonical::new(vt_no_type, "");
             let got = AminoMessage::bytes_vec(&cv);
 
             let want = vec![
@@ -392,7 +392,7 @@ mod tests {
             no_vote_type2.height = 1;
             no_vote_type2.round = 1;
 
-            let with_chain_id = CanonicalVote::new(no_vote_type2, "test_chain_id");
+            let with_chain_id = Canonical::new(no_vote_type2, "test_chain_id");
             got = AminoMessage::bytes_vec(&with_chain_id);
             let want = vec![
                 0x11, // (field_number << 3) | wire_type

From 61dce9930f0c003a7a543fef5f842668ec2be5ec Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Fri, 3 Jan 2020 17:14:35 +0100
Subject: [PATCH 16/55] Remove superfluous Vote suffix

---
 tendermint/src/block/signed_header.rs |  6 +++---
 tendermint/src/vote.rs                | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tendermint/src/block/signed_header.rs b/tendermint/src/block/signed_header.rs
index 1d0fb717e..6d07c5a98 100644
--- a/tendermint/src/block/signed_header.rs
+++ b/tendermint/src/block/signed_header.rs
@@ -1,7 +1,7 @@
 //! SignedHeader contains commit and and block header.
 //! It is what the rpc endpoint /commit returns and hence can be used by a
 //! light client.
-use crate::{block, hash, lite, lite::Error, validator::Set, vote::SignedVote};
+use crate::{block, hash, lite, lite::Error, validator::Set, vote};
 use serde::{Deserialize, Serialize};
 
 /// Signed block headers
@@ -29,14 +29,14 @@ impl lite::SignedHeader for SignedHeader {
 impl SignedHeader {
     /// This is a private helper method to iterate over the underlying
     /// votes to compute the voting power (see `voting_power_in` below).
-    fn iter(&self) -> Vec<Option<SignedVote>> {
+    fn iter(&self) -> Vec<Option<vote::Signed>> {
         let chain_id = self.header.chain_id.to_string();
         let mut votes = self.commit.precommits.clone().into_vec();
         votes
             .drain(..)
             .map(|opt| {
                 opt.map(|vote| {
-                    SignedVote::new(
+                    vote::Signed::new(
                         (&vote).into(),
                         &chain_id,
                         vote.validator_address,
diff --git a/tendermint/src/vote.rs b/tendermint/src/vote.rs
index 8c4b63be8..e392695a2 100644
--- a/tendermint/src/vote.rs
+++ b/tendermint/src/vote.rs
@@ -68,25 +68,25 @@ impl Vote {
     }
 }
 
-/// SignedVote is the union of a canonicalized vote, the signature on
+/// Signed is the union of a canonicalized vote, the signature on
 /// the sign bytes of that vote and the id of the validator who signed it.
-pub struct SignedVote {
+pub struct Signed {
     vote: amino_types::CanonicalVote,
     validator_address: account::Id,
     signature: Signature,
 }
 
-impl SignedVote {
-    /// Create new SignedVote from provided canonicalized vote, validator id, and
+impl Signed {
+    /// Create new Signed from provided canonicalized vote, validator id, and
     /// the signature of that validator.
     pub fn new(
         vote: amino_types::Vote,
         chain_id: &str,
         validator_address: account::Id,
         signature: Signature,
-    ) -> SignedVote {
+    ) -> Signed {
         let canonical_vote = amino_types::CanonicalVote::new(vote, chain_id);
-        SignedVote {
+        Signed {
             vote: canonical_vote,
             signature,
             validator_address,

From a0c842fb449d4c5870fda5de4d5aa44683d154e5 Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Fri, 3 Jan 2020 17:58:48 +0100
Subject: [PATCH 17/55] Use markdown emphasize & link for types

---
 tendermint/src/abci.rs                |  2 +-
 tendermint/src/amino_types/message.rs |  2 +-
 tendermint/src/block/signed_header.rs |  2 +-
 tendermint/src/lib.rs                 |  2 +-
 tendermint/src/lite/types.rs          | 18 +++++++++---------
 tendermint/src/lite/verifier.rs       |  8 ++++----
 tendermint/src/validator.rs           | 10 +++++-----
 7 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/tendermint/src/abci.rs b/tendermint/src/abci.rs
index eeeabcab8..1beb9f119 100644
--- a/tendermint/src/abci.rs
+++ b/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.
diff --git a/tendermint/src/amino_types/message.rs b/tendermint/src/amino_types/message.rs
index 35458675a..1587be177 100644
--- a/tendermint/src/amino_types/message.rs
+++ b/tendermint/src/amino_types/message.rs
@@ -1,7 +1,7 @@
 use prost_amino::encoding::encoded_len_varint;
 use std::convert::TryInto;
 
-/// Extend the original prost::Message trait with a few helper functions in order to
+/// Extend the original [`prost::Message`] trait with a few helper functions in order to
 /// reduce boiler-plate code (and without modifying the prost-amino dependency).
 pub trait Message: prost_amino::Message {
     /// Directly amino encode a prost-amino message into a freshly created Vec<u8>.
diff --git a/tendermint/src/block/signed_header.rs b/tendermint/src/block/signed_header.rs
index 6d07c5a98..09b91598a 100644
--- a/tendermint/src/block/signed_header.rs
+++ b/tendermint/src/block/signed_header.rs
@@ -1,4 +1,4 @@
-//! SignedHeader contains commit and and block header.
+//! [`SignedHeader`] contains commit and and block header.
 //! It is what the rpc endpoint /commit returns and hence can be used by a
 //! light client.
 use crate::{block, hash, lite, lite::Error, validator::Set, vote};
diff --git a/tendermint/src/lib.rs b/tendermint/src/lib.rs
index 9c8e8335c..34fc2a1c3 100644
--- a/tendermint/src/lib.rs
+++ b/tendermint/src/lib.rs
@@ -20,7 +20,7 @@
     clippy::restriction,
     clippy::result_unrwap_used
 )]
-#![forbid(clippy::module_name_repetitions)]
+#![forbid(clippy::doc_markdown)]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/tendermint/kms/master/img/tendermint.png",
     html_root_url = "https://docs.rs/tendermint/0.11.0"
diff --git a/tendermint/src/lite/types.rs b/tendermint/src/lite/types.rs
index bbc45c7c5..00dfcf559 100644
--- a/tendermint/src/lite/types.rs
+++ b/tendermint/src/lite/types.rs
@@ -7,14 +7,14 @@ use crate::Hash;
 use failure::_core::fmt::Debug;
 use std::time::SystemTime;
 
-/// TrustedState stores the latest state trusted by a lite client,
+/// [`TrustedState`] stores the latest state trusted by a lite client,
 /// including the last header (at height h-1) and the validator set
 /// (at height h) to use to verify the next header.
 pub trait TrustedState {
     type LastHeader: SignedHeader;
     type ValidatorSet: ValidatorSet;
 
-    /// Initialize the TrustedState with the given signed header and validator set.
+    /// Initialize the [`TrustedState`] with the given signed header and validator set.
     /// Note that if the height of the passed in header is h-1, the passed in validator set
     /// must have been requested for height h.
     fn new(last_header: &Self::LastHeader, vals: &Self::ValidatorSet) -> Self;
@@ -23,7 +23,7 @@ pub trait TrustedState {
     fn validators(&self) -> &Self::ValidatorSet; // height H
 }
 
-/// SignedHeader bundles a Header and a Commit for convenience.
+/// [`SignedHeader`] bundles a Header and a Commit for convenience.
 pub trait SignedHeader {
     type Header: Header;
     type Commit: Commit;
@@ -38,7 +38,7 @@ pub trait SignedHeader {
 /// set that should sign the next header.
 pub trait Header: Debug {
     /// The header's notion of (bft-)time.
-    /// We assume it can be converted to SystemTime.
+    /// We assume it can be converted to [`SystemTime`].
     type Time: Into<SystemTime>;
 
     fn height(&self) -> Height;
@@ -50,7 +50,7 @@ pub trait Header: Debug {
     fn hash(&self) -> Hash;
 }
 
-/// ValidatorSet is the full validator set.
+/// [`ValidatorSet`] is the full validator set.
 /// It exposes its hash, which should match whats in a header,
 /// and its total power. It also has an underlying
 /// Validator type which can be used for verifying signatures.
@@ -101,20 +101,20 @@ pub trait Commit {
     fn votes_len(&self) -> usize;
 }
 
-/// TrustThreshold defines what fraction of the total voting power of a known
+/// [`TrustThreshold`] defines what fraction of the total voting power of a known
 /// and trusted validator set is sufficient for a commit to be
 /// accepted going forward.
 /// The default implementation returns true, iff at least a third of the trusted
 /// voting power signed (in other words at least one honest validator signed).
 /// Some clients might require more than +1/3 and can implement their own
-/// TrustLevel which can be passed into all relevant methods.
+/// [`TrustLevel`] which can be passed into all relevant methods.
 pub trait TrustThreshold {
     fn is_enough_power(&self, signed_voting_power: u64, total_voting_power: u64) -> bool {
         signed_voting_power * 3 > total_voting_power
     }
 }
 
-/// Requester can be used to request `SignedHeaders` and `ValidatorSet`s for a
+/// Requester can be used to request [`SignedHeader`]s and [`ValidatorSet`]s for a
 /// given height, e.g., by talking to a tendermint fullnode through RPC.
 pub trait Requester {
     // TODO(Liamsi): consider putting this trait and the Store into a separate module / file...
@@ -144,7 +144,7 @@ pub trait Store {
     /// If it does not exist return an error.
     /// If h=0, return the latest trusted state.
     /// TODO: use an enum instead of special-casing 0, see
-    /// https://github.com/interchainio/tendermint-rs/issues/118
+    /// [rpc: map height=0 to no parameters in the http call](https://github.com/interchainio/tendermint-rs/issues/118)
     fn get(&self, h: Height) -> Result<&Self::TrustedState, Error>;
 }
 
diff --git a/tendermint/src/lite/verifier.rs b/tendermint/src/lite/verifier.rs
index 66441335d..cfe7374e6 100644
--- a/tendermint/src/lite/verifier.rs
+++ b/tendermint/src/lite/verifier.rs
@@ -17,7 +17,7 @@ use std::cmp::Ordering;
 use std::time::{Duration, SystemTime};
 
 /// Returns an error if the header has expired according to the given
-/// trusting_period and current time. If so, the verifier must be reset subjectively.
+/// `trusting_period` and current time. If so, the verifier must be reset subjectively.
 pub fn is_within_trust_period<H>(
     last_header: &H,
     trusting_period: &Duration,
@@ -74,7 +74,7 @@ where
 
 /// Verify that +2/3 of the correct validator set signed this commit.
 /// NOTE: These validators are expected to be the correct validators for the commit,
-/// but since we're using voting_power_in, we can't actually detect if there's
+/// but since we're using `voting_power_in`, we can't actually detect if there's
 /// votes from validators not in the set.
 pub fn verify_commit_full<C>(vals: &C::ValidatorSet, commit: &C) -> Result<(), Error>
 where
@@ -96,8 +96,8 @@ where
 
 /// Verify that +1/3 of the given validator set signed this commit.
 /// NOTE the given validators do not necessarily correspond to the validator set for this commit,
-/// but there may be some intersection. The trust_level parameter allows clients to require more
-/// than +1/3 by implementing the TrustLevel trait accordingly.
+/// but there may be some intersection. The `trust_level` parameter allows clients to require more
+/// than +1/3 by implementing the `TrustLevel` trait accordingly.
 pub fn verify_commit_trusting<C, L>(
     validators: &C::ValidatorSet,
     commit: &C,
diff --git a/tendermint/src/validator.rs b/tendermint/src/validator.rs
index 8802562eb..911d20dd3 100644
--- a/tendermint/src/validator.rs
+++ b/tendermint/src/validator.rs
@@ -94,7 +94,7 @@ impl Info {
         self.voting_power.value()
     }
 
-    /// Verify the given signature against the given sign_bytes using the validators
+    /// Verify the given signature against the given `sign_bytes` using the validators
     /// public key.
     pub fn verify_signature(&self, sign_bytes: &[u8], signature: &[u8]) -> bool {
         if let Some(pk) = &self.pub_key.ed25519() {
@@ -128,7 +128,7 @@ impl Info {
     }
 }
 
-/// InfoHashable is the form of the validator used for computing the Merkle tree.
+/// [`InfoHashable`] is the form of the validator used for computing the Merkle tree.
 /// It does not include the address, as that is redundant with the pubkey,
 /// nor the proposer priority, as that changes with every block even if the validator set didn't.
 /// It contains only the pubkey and the voting power, and is amino encoded.
@@ -141,7 +141,7 @@ struct InfoHashable {
     voting_power: u64,
 }
 
-/// Info -> InfoHashable
+/// Info -> [`InfoHashable`]
 impl From<&Info> for InfoHashable {
     fn from(info: &Info) -> InfoHashable {
         InfoHashable {
@@ -205,10 +205,10 @@ pub struct Update {
 }
 
 /// Validator updates use a slightly different public key format than the one
-/// implemented in `tendermint::PublicKey`.
+/// implemented in [`tendermint::PublicKey`].
 ///
 /// This is an internal thunk type to parse the `validator_updates` format and
-/// then convert to `tendermint::PublicKey` in `deserialize_public_key` below.
+/// then convert to [`tendermint::PublicKey`] in `deserialize_public_key` below.
 #[derive(Serialize, Deserialize)]
 #[serde(tag = "type", content = "data")]
 enum PK {

From bad770b6ed2e5fd9517adb4fcfd8dc7fee928e3a Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Fri, 3 Jan 2020 17:59:24 +0100
Subject: [PATCH 18/55] Use _ for literal suffix

---
 tendermint/src/abci/transaction/hash.rs | 2 +-
 tendermint/src/account.rs               | 6 +++---
 tendermint/src/amino_types/ed25519.rs   | 2 +-
 tendermint/src/amino_types/vote.rs      | 2 +-
 tendermint/src/block/signed_header.rs   | 2 +-
 tendermint/src/chain/id.rs              | 2 +-
 tendermint/src/consensus/state.rs       | 6 +++---
 tendermint/src/hash.rs                  | 4 ++--
 tendermint/src/lib.rs                   | 2 +-
 tendermint/src/merkle.rs                | 4 ++--
 tendermint/src/node/id.rs               | 4 ++--
 tendermint/src/private_key.rs           | 2 +-
 tendermint/src/validator.rs             | 2 +-
 13 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/tendermint/src/abci/transaction/hash.rs b/tendermint/src/abci/transaction/hash.rs
index 745199e48..9a6416fc5 100644
--- a/tendermint/src/abci/transaction/hash.rs
+++ b/tendermint/src/abci/transaction/hash.rs
@@ -70,7 +70,7 @@ 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))
     }
diff --git a/tendermint/src/account.rs b/tendermint/src/account.rs
index a50aee39d..28ba9be7c 100644
--- a/tendermint/src/account.rs
+++ b/tendermint/src/account.rs
@@ -62,7 +62,7 @@ impl Debug for Id {
 impl From<secp256k1::PublicKey> for Id {
     fn from(pk: secp256k1::PublicKey) -> Id {
         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)
     }
@@ -72,7 +72,7 @@ impl From<secp256k1::PublicKey> for Id {
 impl From<ed25519::PublicKey> for Id {
     fn from(pk: ed25519::PublicKey) -> Id {
         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)
     }
@@ -92,7 +92,7 @@ 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))
     }
diff --git a/tendermint/src/amino_types/ed25519.rs b/tendermint/src/amino_types/ed25519.rs
index 41bcd6842..3df98755c 100644
--- a/tendermint/src/amino_types/ed25519.rs
+++ b/tendermint/src/amino_types/ed25519.rs
@@ -24,7 +24,7 @@ impl From<PubKeyResponse> for PublicKey {
     // This does not check if the underlying pub_key_ed25519 has the right size.
     // The caller needs to make sure that this is actually the case.
     fn from(response: PubKeyResponse) -> PublicKey {
-        let mut public_key = [0u8; PUBLIC_KEY_SIZE];
+        let mut public_key = [0_u8; PUBLIC_KEY_SIZE];
         public_key.copy_from_slice(response.pub_key_ed25519.as_ref());
         PublicKey::Ed25519(signatory::ed25519::PublicKey::new(public_key))
     }
diff --git a/tendermint/src/amino_types/vote.rs b/tendermint/src/amino_types/vote.rs
index 0babff847..12123a7db 100644
--- a/tendermint/src/amino_types/vote.rs
+++ b/tendermint/src/amino_types/vote.rs
@@ -437,7 +437,7 @@ mod tests {
             }),
             // signature: None,
             signature: vec![
-                130u8, 246, 183, 50, 153, 248, 28, 57, 51, 142, 55, 217, 194, 24, 134, 212, 233,
+                130_u8, 246, 183, 50, 153, 248, 28, 57, 51, 142, 55, 217, 194, 24, 134, 212, 233,
                 100, 211, 10, 24, 174, 179, 117, 41, 65, 141, 134, 149, 239, 65, 174, 217, 42, 6,
                 184, 112, 17, 7, 97, 255, 221, 252, 16, 60, 144, 30, 212, 167, 39, 67, 35, 118,
                 192, 133, 130, 193, 115, 32, 206, 152, 91, 173, 10,
diff --git a/tendermint/src/block/signed_header.rs b/tendermint/src/block/signed_header.rs
index 09b91598a..997ae616a 100644
--- a/tendermint/src/block/signed_header.rs
+++ b/tendermint/src/block/signed_header.rs
@@ -61,7 +61,7 @@ impl lite::Commit for SignedHeader {
     fn voting_power_in(&self, validators: &Set) -> Result<u64, Error> {
         // NOTE we don't know the validators that committed this block,
         // so we have to check for each vote if its validator is already known.
-        let mut signed_power = 0u64;
+        let mut signed_power = 0_u64;
         for vote_opt in &self.iter() {
             // skip absent and nil votes
             // NOTE: do we want to check the validity of votes
diff --git a/tendermint/src/chain/id.rs b/tendermint/src/chain/id.rs
index a0f372be0..06ec9a40e 100644
--- a/tendermint/src/chain/id.rs
+++ b/tendermint/src/chain/id.rs
@@ -76,7 +76,7 @@ impl FromStr for Id {
             }
         }
 
-        let mut bytes = [0u8; MAX_LENGTH];
+        let mut bytes = [0_u8; MAX_LENGTH];
         bytes[..name.as_bytes().len()].copy_from_slice(name.as_bytes());
         Ok(Id(bytes))
     }
diff --git a/tendermint/src/consensus/state.rs b/tendermint/src/consensus/state.rs
index 37f18d499..b76a9f39a 100644
--- a/tendermint/src/consensus/state.rs
+++ b/tendermint/src/consensus/state.rs
@@ -75,21 +75,21 @@ mod tests {
     #[test]
     fn state_ord_test() {
         let new = State {
-            height: block::Height::from(9001u64),
+            height: block::Height::from(9001_u64),
             round: 0,
             step: 0,
             block_id: None,
         };
 
         let old = State {
-            height: block::Height::from(1001u64),
+            height: block::Height::from(1001_u64),
             round: 1,
             step: 0,
             block_id: None,
         };
 
         let older = State {
-            height: block::Height::from(1001u64),
+            height: block::Height::from(1001_u64),
             round: 0,
             step: 0,
             block_id: None,
diff --git a/tendermint/src/hash.rs b/tendermint/src/hash.rs
index 1c9471c9f..5db935a97 100644
--- a/tendermint/src/hash.rs
+++ b/tendermint/src/hash.rs
@@ -32,7 +32,7 @@ impl Hash {
         match alg {
             Algorithm::Sha256 => {
                 if bytes.len() == SHA256_HASH_SIZE {
-                    let mut h = [0u8; SHA256_HASH_SIZE];
+                    let mut h = [0_u8; SHA256_HASH_SIZE];
                     h.copy_from_slice(bytes);
                     Ok(Hash::Sha256(h))
                 } else {
@@ -46,7 +46,7 @@ impl Hash {
     pub fn from_hex_upper(alg: Algorithm, s: &str) -> Result<Hash, Error> {
         match alg {
             Algorithm::Sha256 => {
-                let mut h = [0u8; SHA256_HASH_SIZE];
+                let mut h = [0_u8; SHA256_HASH_SIZE];
                 Hex::upper_case().decode_to_slice(s.as_bytes(), &mut h)?;
                 Ok(Hash::Sha256(h))
             }
diff --git a/tendermint/src/lib.rs b/tendermint/src/lib.rs
index 34fc2a1c3..4129ec0f8 100644
--- a/tendermint/src/lib.rs
+++ b/tendermint/src/lib.rs
@@ -20,7 +20,7 @@
     clippy::restriction,
     clippy::result_unrwap_used
 )]
-#![forbid(clippy::doc_markdown)]
+#![forbid(clippy::unseparated_literal_suffix)]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/tendermint/kms/master/img/tendermint.png",
     html_root_url = "https://docs.rs/tendermint/0.11.0"
diff --git a/tendermint/src/merkle.rs b/tendermint/src/merkle.rs
index f34f0cc5f..c3452baaf 100644
--- a/tendermint/src/merkle.rs
+++ b/tendermint/src/merkle.rs
@@ -51,7 +51,7 @@ fn leaf_hash(bytes: &[u8]) -> Hash {
     let digest = Sha256::digest(&leaf_bytes);
 
     // copy the GenericArray out
-    let mut hash_bytes = [0u8; HASH_SIZE];
+    let mut hash_bytes = [0_u8; HASH_SIZE];
     hash_bytes.copy_from_slice(&digest);
     hash_bytes
 }
@@ -68,7 +68,7 @@ fn inner_hash(left: &[u8], right: &[u8]) -> Hash {
     let digest = Sha256::digest(&inner_bytes);
 
     // copy the GenericArray out
-    let mut hash_bytes = [0u8; HASH_SIZE];
+    let mut hash_bytes = [0_u8; HASH_SIZE];
     hash_bytes.copy_from_slice(&digest);
     hash_bytes
 }
diff --git a/tendermint/src/node/id.rs b/tendermint/src/node/id.rs
index ff61b1e20..8574ff934 100644
--- a/tendermint/src/node/id.rs
+++ b/tendermint/src/node/id.rs
@@ -61,7 +61,7 @@ impl Debug for Id {
 impl From<ed25519::PublicKey> for Id {
     fn from(pk: ed25519::PublicKey) -> Id {
         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)
     }
@@ -81,7 +81,7 @@ 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))
     }
diff --git a/tendermint/src/private_key.rs b/tendermint/src/private_key.rs
index 6832fe046..7fd277a40 100644
--- a/tendermint/src/private_key.rs
+++ b/tendermint/src/private_key.rs
@@ -73,7 +73,7 @@ impl<'de> Deserialize<'de> for Ed25519Keypair {
     fn deserialize<D: de::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
         let string = Zeroizing::new(String::deserialize(deserializer)?);
 
-        let mut keypair_bytes = [0u8; ED25519_KEYPAIR_SIZE];
+        let mut keypair_bytes = [0_u8; ED25519_KEYPAIR_SIZE];
         let decoded_len = Base64::default()
             .decode_to_slice(string.as_bytes(), &mut keypair_bytes)
             .map_err(|_| D::Error::custom("invalid Ed25519 keypair"))?;
diff --git a/tendermint/src/validator.rs b/tendermint/src/validator.rs
index 911d20dd3..d94e4a0ed 100644
--- a/tendermint/src/validator.rs
+++ b/tendermint/src/validator.rs
@@ -48,7 +48,7 @@ impl lite::ValidatorSet for Set {
     }
 
     fn total_power(&self) -> u64 {
-        self.validators.iter().fold(0u64, |total, val_info| {
+        self.validators.iter().fold(0_u64, |total, val_info| {
             total + val_info.voting_power.value()
         })
     }

From 63c673cb3888a05843e643e7d5d0b706318432a2 Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Fri, 3 Jan 2020 18:05:34 +0100
Subject: [PATCH 19/55] Make clippy rule exception for db names

---
 tendermint/src/config.rs | 1 +
 tendermint/src/lib.rs    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tendermint/src/config.rs b/tendermint/src/config.rs
index 3bf519134..3b1a1acfe 100644
--- a/tendermint/src/config.rs
+++ b/tendermint/src/config.rs
@@ -136,6 +136,7 @@ impl Tendermint {
 }
 
 /// Database backend
+#[allow(clippy::pub_enum_variant_names)]
 #[derive(Copy, Clone, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
 pub enum DbBackend {
     /// LevelDB backend
diff --git a/tendermint/src/lib.rs b/tendermint/src/lib.rs
index 4129ec0f8..b7789d6dd 100644
--- a/tendermint/src/lib.rs
+++ b/tendermint/src/lib.rs
@@ -20,7 +20,7 @@
     clippy::restriction,
     clippy::result_unrwap_used
 )]
-#![forbid(clippy::unseparated_literal_suffix)]
+#![deny(clippy::pub_enum_variant_names)]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/tendermint/kms/master/img/tendermint.png",
     html_root_url = "https://docs.rs/tendermint/0.11.0"

From 56d1f4814e41b803f9308a2840cd4e2c57cfb03e Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Fri, 3 Jan 2020 18:12:02 +0100
Subject: [PATCH 20/55] Remove print statements

---
 tendermint/src/amino_types/vote.rs | 3 ---
 tendermint/src/lib.rs              | 5 ++---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/tendermint/src/amino_types/vote.rs b/tendermint/src/amino_types/vote.rs
index 12123a7db..f531cfb92 100644
--- a/tendermint/src/amino_types/vote.rs
+++ b/tendermint/src/amino_types/vote.rs
@@ -305,8 +305,6 @@ mod tests {
             113, 134, 241, 104, 95, 33, 242, 72, 42, 244, 251, 52, 70, 168, 75, 53, 56, 213, 187,
             3,
         ];
-        let svr = SignVoteRequest::decode(got.clone()).unwrap();
-        println!("got back: {:?}", svr);
         assert_eq!(got, want);
     }
 
@@ -327,7 +325,6 @@ mod tests {
             vt_precommit.height = 1;
             vt_precommit.round = 1;
             vt_precommit.vote_type = SignedMsgType::PreCommit.to_u32(); // precommit
-            println!("{:?}", vt_precommit);
             let cv_precommit = Canonical::new(vt_precommit, "");
             let got = AminoMessage::bytes_vec(&cv_precommit);
             let want = vec![
diff --git a/tendermint/src/lib.rs b/tendermint/src/lib.rs
index b7789d6dd..ab9bb3514 100644
--- a/tendermint/src/lib.rs
+++ b/tendermint/src/lib.rs
@@ -17,10 +17,9 @@
     clippy::cargo,
     clippy::nursery,
     clippy::pedantic,
-    clippy::restriction,
-    clippy::result_unrwap_used
+    clippy::restriction
 )]
-#![deny(clippy::pub_enum_variant_names)]
+#![forbid(clippy::result_unrwap_used, clippy::print_stdout)]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/tendermint/kms/master/img/tendermint.png",
     html_root_url = "https://docs.rs/tendermint/0.11.0"

From 7bf10930980bb6ce3ac2bf500290ec0e448aa5a7 Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Fri, 3 Jan 2020 18:20:40 +0100
Subject: [PATCH 21/55] Replace similiar names

---
 tendermint/src/lib.rs           | 2 +-
 tendermint/src/lite/verifier.rs | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/tendermint/src/lib.rs b/tendermint/src/lib.rs
index ab9bb3514..ba8324135 100644
--- a/tendermint/src/lib.rs
+++ b/tendermint/src/lib.rs
@@ -19,7 +19,7 @@
     clippy::pedantic,
     clippy::restriction
 )]
-#![forbid(clippy::result_unrwap_used, clippy::print_stdout)]
+#![forbid(clippy::result_unrwap_used, clippy::similar_names)]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/tendermint/kms/master/img/tendermint.png",
     html_root_url = "https://docs.rs/tendermint/0.11.0"
diff --git a/tendermint/src/lite/verifier.rs b/tendermint/src/lite/verifier.rs
index cfe7374e6..480b1bda4 100644
--- a/tendermint/src/lite/verifier.rs
+++ b/tendermint/src/lite/verifier.rs
@@ -322,9 +322,8 @@ where
     }
 
     // Get the pivot height for bisection.
-    let trusted_h = trusted_sh.header().height().value();
-    let untrusted_h = untrusted_height.value();
-    let pivot_height = Height::from((trusted_h + untrusted_h) / 2);
+    let trusted_height = trusted_sh.header().height().value();
+    let pivot_height = Height::from((trusted_height + untrusted_height.value()) / 2);
 
     // Recursive call to update to the pivot height.
     // When this completes, we will either return an error or

From a01d234bdc5ca8067cc77c179e530428fdfd9806 Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Fri, 3 Jan 2020 22:50:50 +0100
Subject: [PATCH 22/55] Allow multiple crate versions

It's hard to avoid multiple crate versions given current transient
dependencies, some of them we control and we are following up to bring
most of them on par:

https://github.com/tendermint/amino_rs/pull/20
---
 tendermint/src/lib.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tendermint/src/lib.rs b/tendermint/src/lib.rs
index ba8324135..26bf03a1c 100644
--- a/tendermint/src/lib.rs
+++ b/tendermint/src/lib.rs
@@ -12,14 +12,15 @@
     unused_import_braces,
     unused_qualifications
 )]
-#![allow(
+#![deny(
     clippy::all,
     clippy::cargo,
     clippy::nursery,
     clippy::pedantic,
     clippy::restriction
 )]
-#![forbid(clippy::result_unrwap_used, clippy::similar_names)]
+#![forbid(clippy::result_unrwap_used)]
+#![allow(clippy::multiple_crate_versions)]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/tendermint/kms/master/img/tendermint.png",
     html_root_url = "https://docs.rs/tendermint/0.11.0"

From 41cbd02d62a86cb55d70c57d80b68247aa03afb7 Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Sat, 4 Jan 2020 08:38:10 +0100
Subject: [PATCH 23/55] Consolidate impl blocks

---
 tendermint/src/amino_types/block_id.rs | 14 ++++-----
 tendermint/src/lib.rs                  |  5 ++--
 tendermint/src/validator.rs            | 40 +++++++++++---------------
 3 files changed, 26 insertions(+), 33 deletions(-)

diff --git a/tendermint/src/amino_types/block_id.rs b/tendermint/src/amino_types/block_id.rs
index 422098c58..6297547e4 100644
--- a/tendermint/src/amino_types/block_id.rs
+++ b/tendermint/src/amino_types/block_id.rs
@@ -85,15 +85,7 @@ impl PartsSetHeader {
     pub fn new(total: i64, hash: Vec<u8>) -> Self {
         PartsSetHeader { 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))
@@ -101,6 +93,12 @@ impl PartsSetHeader {
     }
 }
 
+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 ConsensusMessage for PartsSetHeader {
     fn validate_basic(&self) -> Result<(), ValidationError> {
         if self.total < 0 {
diff --git a/tendermint/src/lib.rs b/tendermint/src/lib.rs
index 26bf03a1c..e6494b93b 100644
--- a/tendermint/src/lib.rs
+++ b/tendermint/src/lib.rs
@@ -12,14 +12,15 @@
     unused_import_braces,
     unused_qualifications
 )]
-#![deny(
+#![allow(
     clippy::all,
     clippy::cargo,
     clippy::nursery,
     clippy::pedantic,
     clippy::restriction
 )]
-#![forbid(clippy::result_unrwap_used)]
+#![allow(clippy::result_unwrap_used)]
+#![forbid(clippy::multiple_inherent_impl)]
 #![allow(clippy::multiple_crate_versions)]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/tendermint/kms/master/img/tendermint.png",
diff --git a/tendermint/src/validator.rs b/tendermint/src/validator.rs
index d94e4a0ed..e89e1518a 100644
--- a/tendermint/src/validator.rs
+++ b/tendermint/src/validator.rs
@@ -24,9 +24,7 @@ impl Set {
         vals.sort_by(|v1, v2| v1.address.partial_cmp(&v2.address).unwrap());
         Set { validators: vals }
     }
-}
 
-impl Set {
     /// Returns the validator with the given Id if its in the Set.
     pub fn validator(&self, val_id: account::Id) -> Option<Info> {
         self.validators
@@ -89,6 +87,23 @@ pub struct Info {
 }
 
 impl Info {
+    /// Create a new validator.
+    pub fn new(pk: PublicKey, vp: vote::Power) -> Info {
+        Info {
+            address: account::Id::from(pk),
+            pub_key: pk,
+            voting_power: vp,
+            proposer_priority: None,
+        }
+    }
+
+    // returns the bytes to be hashed into the Merkle tree -
+    // the leaves of the tree. this is an amino encoding of the
+    // pubkey and voting power, so it includes the pubkey's amino prefix.
+    fn hash_bytes(&self) -> Vec<u8> {
+        AminoMessage::bytes_vec(&InfoHashable::from(self))
+    }
+
     /// Return the voting power of the validator.
     pub fn power(&self) -> u64 {
         self.voting_power.value()
@@ -116,18 +131,6 @@ impl From<PublicKey> for account::Id {
     }
 }
 
-impl Info {
-    /// Create a new validator.
-    pub fn new(pk: PublicKey, vp: vote::Power) -> Info {
-        Info {
-            address: account::Id::from(pk),
-            pub_key: pk,
-            voting_power: vp,
-            proposer_priority: None,
-        }
-    }
-}
-
 /// [`InfoHashable`] is the form of the validator used for computing the Merkle tree.
 /// It does not include the address, as that is redundant with the pubkey,
 /// nor the proposer priority, as that changes with every block even if the validator set didn't.
@@ -151,15 +154,6 @@ impl From<&Info> for InfoHashable {
     }
 }
 
-// returns the bytes to be hashed into the Merkle tree -
-// the leaves of the tree. this is an amino encoding of the
-// pubkey and voting power, so it includes the pubkey's amino prefix.
-impl Info {
-    fn hash_bytes(&self) -> Vec<u8> {
-        AminoMessage::bytes_vec(&InfoHashable::from(self))
-    }
-}
-
 /// Proposer priority
 #[derive(Copy, Clone, Debug, Eq, PartialEq, PartialOrd, Ord)]
 pub struct ProposerPriority(i64);

From 67f735866d358e025c5c836cc40781e97ac97120 Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Sat, 4 Jan 2020 09:56:22 +0100
Subject: [PATCH 24/55] Use Self consistently

---
 .gitignore                                    |  2 +-
 tendermint/src/abci/code.rs                   | 16 +++---
 tendermint/src/abci/data.rs                   |  2 +-
 tendermint/src/abci/gas.rs                    |  6 +-
 tendermint/src/abci/log.rs                    |  2 +-
 tendermint/src/abci/path.rs                   |  2 +-
 tendermint/src/abci/proof.rs                  |  2 +-
 tendermint/src/abci/tag.rs                    |  4 +-
 tendermint/src/abci/transaction.rs            |  8 +--
 tendermint/src/abci/transaction/hash.rs       |  8 +--
 tendermint/src/account.rs                     | 16 +++---
 tendermint/src/amino_types/block_id.rs        |  8 +--
 tendermint/src/amino_types/ed25519.rs         |  8 +--
 tendermint/src/amino_types/remote_error.rs    |  2 +-
 tendermint/src/amino_types/signature.rs       | 14 ++---
 tendermint/src/amino_types/time.rs            |  6 +-
 tendermint/src/amino_types/validate.rs        |  2 +-
 tendermint/src/amino_types/version.rs         |  2 +-
 tendermint/src/amino_types/vote.rs            |  6 +-
 tendermint/src/block/height.rs                | 18 +++---
 tendermint/src/block/parts.rs                 |  2 +-
 tendermint/src/block/signed_header.rs         |  2 +-
 tendermint/src/chain/id.rs                    | 10 ++--
 tendermint/src/channel/id.rs                  |  6 +-
 tendermint/src/config.rs                      |  6 +-
 tendermint/src/consensus/state.rs             |  4 +-
 tendermint/src/error.rs                       | 10 +++-
 tendermint/src/evidence.rs                    | 10 ++--
 tendermint/src/hash.rs                        | 16 +++---
 tendermint/src/lib.rs                         |  4 +-
 tendermint/src/lite/verifier.rs               | 18 +++---
 tendermint/src/moniker.rs                     |  2 +-
 tendermint/src/net.rs                         |  8 +--
 tendermint/src/node/id.rs                     | 14 ++---
 tendermint/src/node/info.rs                   | 10 ++--
 tendermint/src/private_key.rs                 | 10 ++--
 tendermint/src/public_key.rs                  | 50 ++++++++---------
 tendermint/src/rpc/client.rs                  |  2 +-
 tendermint/src/rpc/endpoint/blockchain.rs     |  4 +-
 .../src/rpc/endpoint/broadcast/tx_async.rs    |  4 +-
 .../src/rpc/endpoint/broadcast/tx_commit.rs   |  4 +-
 .../src/rpc/endpoint/broadcast/tx_sync.rs     |  4 +-
 tendermint/src/rpc/error.rs                   | 54 +++++++++---------
 tendermint/src/rpc/id.rs                      |  2 +-
 tendermint/src/rpc/method.rs                  | 56 +++++++++----------
 tendermint/src/rpc/version.rs                 |  4 +-
 tendermint/src/signature.rs                   |  6 +-
 tendermint/src/time.rs                        | 29 +++++-----
 tendermint/src/timeout.rs                     |  8 +--
 tendermint/src/validator.rs                   | 22 ++++----
 tendermint/src/vote.rs                        | 12 ++--
 tendermint/src/vote/power.rs                  |  8 +--
 52 files changed, 268 insertions(+), 267 deletions(-)

diff --git a/.gitignore b/.gitignore
index 671ef8999..c6be0907a 100644
--- a/.gitignore
+++ b/.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
diff --git a/tendermint/src/abci/code.rs b/tendermint/src/abci/code.rs
index 6b0809447..d63b9c511 100644
--- a/tendermint/src/abci/code.rs
+++ b/tendermint/src/abci/code.rs
@@ -19,8 +19,8 @@ pub enum Code {
 }
 
 impl Default for Code {
-    fn default() -> Code {
-        Code::Ok
+    fn default() -> Self {
+        Self::Ok
     }
 }
 
@@ -28,8 +28,8 @@ 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,
diff --git a/tendermint/src/abci/data.rs b/tendermint/src/abci/data.rs
index 1a60d8ed6..4a77b963f 100644
--- a/tendermint/src/abci/data.rs
+++ b/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))
     }
 }
 
diff --git a/tendermint/src/abci/gas.rs b/tendermint/src/abci/gas.rs
index 4d90cccdb..0b9352258 100644
--- a/tendermint/src/abci/gas.rs
+++ b/tendermint/src/abci/gas.rs
@@ -24,13 +24,13 @@ impl Gas {
 }
 
 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
     }
 }
diff --git a/tendermint/src/abci/log.rs b/tendermint/src/abci/log.rs
index 668acf006..cfefd4010 100644
--- a/tendermint/src/abci/log.rs
+++ b/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())
     }
 }
 
diff --git a/tendermint/src/abci/path.rs b/tendermint/src/abci/path.rs
index 09f63bea5..0e37c9e45 100644
--- a/tendermint/src/abci/path.rs
+++ b/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()))
     }
 }
diff --git a/tendermint/src/abci/proof.rs b/tendermint/src/abci/proof.rs
index 8429da8a5..ce2607717 100644
--- a/tendermint/src/abci/proof.rs
+++ b/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))
     }
 }
 
diff --git a/tendermint/src/abci/tag.rs b/tendermint/src/abci/tag.rs
index a7b313e5c..d6d7193ac 100644
--- a/tendermint/src/abci/tag.rs
+++ b/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()))
     }
 }
 
diff --git a/tendermint/src/abci/transaction.rs b/tendermint/src/abci/transaction.rs
index 690a02eb9..912292c9d 100644
--- a/tendermint/src/abci/transaction.rs
+++ b/tendermint/src/abci/transaction.rs
@@ -16,11 +16,11 @@ 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())
     }
 
     /// Convert this transaction into a byte vector
@@ -68,11 +68,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()),
         }
     }
diff --git a/tendermint/src/abci/transaction/hash.rs b/tendermint/src/abci/transaction/hash.rs
index 9a6416fc5..c740afd8f 100644
--- a/tendermint/src/abci/transaction/hash.rs
+++ b/tendermint/src/abci/transaction/hash.rs
@@ -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 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())
     }
 }
@@ -72,7 +72,7 @@ impl FromStr for Hash {
 
         let mut result_bytes = [0_u8; LENGTH];
         result_bytes.copy_from_slice(&bytes);
-        Ok(Hash(result_bytes))
+        Ok(Self(result_bytes))
     }
 }
 
diff --git a/tendermint/src/account.rs b/tendermint/src/account.rs
index 28ba9be7c..0004fd358 100644
--- a/tendermint/src/account.rs
+++ b/tendermint/src/account.rs
@@ -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 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 = [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 = [0_u8; LENGTH];
         bytes.copy_from_slice(&digest[..LENGTH]);
-        Id(bytes)
+        Self(bytes)
     }
 }
 
@@ -94,7 +94,7 @@ impl FromStr for Id {
 
         let mut result_bytes = [0_u8; LENGTH];
         result_bytes.copy_from_slice(&bytes);
-        Ok(Id(result_bytes))
+        Ok(Self(result_bytes))
     }
 }
 
diff --git a/tendermint/src/amino_types/block_id.rs b/tendermint/src/amino_types/block_id.rs
index 6297547e4..2a1181cc7 100644
--- a/tendermint/src/amino_types/block_id.rs
+++ b/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),
         )
@@ -83,7 +83,7 @@ pub struct PartsSetHeader {
 
 impl PartsSetHeader {
     pub fn new(total: i64, hash: Vec<u8>) -> Self {
-        PartsSetHeader { total, hash }
+        Self { total, hash }
     }
 
     fn parse_parts_header(&self) -> Option<block::parts::Header> {
@@ -95,7 +95,7 @@ impl PartsSetHeader {
 
 impl From<&parts::Header> for PartsSetHeader {
     fn from(parts: &parts::Header) -> Self {
-        PartsSetHeader::new(parts.total as i64, parts.hash.as_bytes().to_vec())
+        Self::new(parts.total as i64, parts.hash.as_bytes().to_vec())
     }
 }
 
diff --git a/tendermint/src/amino_types/ed25519.rs b/tendermint/src/amino_types/ed25519.rs
index 3df98755c..7c393ae90 100644
--- a/tendermint/src/amino_types/ed25519.rs
+++ b/tendermint/src/amino_types/ed25519.rs
@@ -23,17 +23,17 @@ pub struct PubKeyRequest {}
 impl From<PubKeyResponse> for PublicKey {
     // This does not check if the underlying pub_key_ed25519 has the right size.
     // The caller needs to make sure that this is actually the case.
-    fn from(response: PubKeyResponse) -> PublicKey {
+    fn from(response: PubKeyResponse) -> Self {
         let mut public_key = [0_u8; PUBLIC_KEY_SIZE];
         public_key.copy_from_slice(response.pub_key_ed25519.as_ref());
-        PublicKey::Ed25519(signatory::ed25519::PublicKey::new(public_key))
+        Self::Ed25519(signatory::ed25519::PublicKey::new(public_key))
     }
 }
 
 impl From<PublicKey> for PubKeyResponse {
-    fn from(public_key: PublicKey) -> PubKeyResponse {
+    fn from(public_key: PublicKey) -> Self {
         match public_key {
-            PublicKey::Ed25519(ref pk) => PubKeyResponse {
+            PublicKey::Ed25519(ref pk) => Self {
                 pub_key_ed25519: pk.as_bytes().to_vec(),
             },
             PublicKey::Secp256k1(_) => panic!("secp256k1 PubKeyResponse unimplemented"),
diff --git a/tendermint/src/amino_types/remote_error.rs b/tendermint/src/amino_types/remote_error.rs
index 9b2067558..920d9b6ac 100644
--- a/tendermint/src/amino_types/remote_error.rs
+++ b/tendermint/src/amino_types/remote_error.rs
@@ -23,7 +23,7 @@ enum Code {
 impl RemoteError {
     /// Create a new double signing error with the given message
     pub fn double_sign(height: i64) -> Self {
-        RemoteError {
+        Self {
             code: Code::DoubleSignError as i32,
             description: format!("double signing requested at height: {}", height),
         }
diff --git a/tendermint/src/amino_types/signature.rs b/tendermint/src/amino_types/signature.rs
index 97932c0a3..6dab7523e 100644
--- a/tendermint/src/amino_types/signature.rs
+++ b/tendermint/src/amino_types/signature.rs
@@ -39,19 +39,19 @@ impl SignedMsgType {
     pub fn to_u32(self) -> u32 {
         match self {
             // Votes
-            SignedMsgType::PreVote => 0x01,
-            SignedMsgType::PreCommit => 0x02,
+            Self::PreVote => 0x01,
+            Self::PreCommit => 0x02,
             // Proposals
-            SignedMsgType::Proposal => 0x20,
+            Self::Proposal => 0x20,
         }
     }
 
     #[allow(dead_code)]
-    fn from(data: u32) -> Result<SignedMsgType, DecodeError> {
+    fn from(data: u32) -> Result<Self, DecodeError> {
         match data {
-            0x01 => Ok(SignedMsgType::PreVote),
-            0x02 => Ok(SignedMsgType::PreCommit),
-            0x20 => Ok(SignedMsgType::Proposal),
+            0x01 => Ok(Self::PreVote),
+            0x02 => Ok(Self::PreCommit),
+            0x20 => Ok(Self::Proposal),
             _ => Err(DecodeError::new("Invalid vote type")),
         }
     }
diff --git a/tendermint/src/amino_types/time.rs b/tendermint/src/amino_types/time.rs
index e0d01f31b..edbae7f1d 100644
--- a/tendermint/src/amino_types/time.rs
+++ b/tendermint/src/amino_types/time.rs
@@ -25,19 +25,19 @@ impl ParseTimestamp for Msg {
 }
 
 impl From<Time> for Msg {
-    fn from(ts: Time) -> Msg {
+    fn from(ts: Time) -> Self {
         // TODO: non-panicking method for getting this?
         let duration = ts.duration_since(Time::unix_epoch()).unwrap();
         let seconds = duration.as_secs() as i64;
         let nanos = duration.subsec_nanos() as i32;
 
-        Msg { seconds, nanos }
+        Self { seconds, nanos }
     }
 }
 
 /// Converts `Time` to a `SystemTime`.
 impl From<Msg> for SystemTime {
-    fn from(time: Msg) -> SystemTime {
+    fn from(time: Msg) -> Self {
         if time.seconds >= 0 {
             UNIX_EPOCH + Duration::new(time.seconds as u64, time.nanos as u32)
         } else {
diff --git a/tendermint/src/amino_types/validate.rs b/tendermint/src/amino_types/validate.rs
index 26984b135..e0c4632ac 100644
--- a/tendermint/src/amino_types/validate.rs
+++ b/tendermint/src/amino_types/validate.rs
@@ -37,6 +37,6 @@ impl ToString for ValidationError {
 
 impl From<ValidationErrorKind> for ValidationError {
     fn from(kind: ValidationErrorKind) -> Self {
-        ValidationError(kind)
+        Self(kind)
     }
 }
diff --git a/tendermint/src/amino_types/version.rs b/tendermint/src/amino_types/version.rs
index 587ca939b..67b2d2e49 100644
--- a/tendermint/src/amino_types/version.rs
+++ b/tendermint/src/amino_types/version.rs
@@ -13,7 +13,7 @@ pub struct Consensus {
 
 impl From<&header::Version> for Consensus {
     fn from(version: &header::Version) -> Self {
-        Consensus {
+        Self {
             block: version.block,
             app: version.app,
         }
diff --git a/tendermint/src/amino_types/vote.rs b/tendermint/src/amino_types/vote.rs
index f531cfb92..a643e4c8b 100644
--- a/tendermint/src/amino_types/vote.rs
+++ b/tendermint/src/amino_types/vote.rs
@@ -52,7 +52,7 @@ impl Vote {
 
 impl From<&vote::Vote> for Vote {
     fn from(vote: &vote::Vote) -> Self {
-        Vote {
+        Self {
             vote_type: vote.vote_type.to_u32(),
             height: vote.height.value() as i64, // TODO potential overflow :-/
             round: vote.round as i64,
@@ -121,8 +121,8 @@ impl block::ParseHeight for Canonical {
 }
 
 impl Canonical {
-    pub fn new(vote: Vote, chain_id: &str) -> Canonical {
-        Canonical {
+    pub fn new(vote: Vote, chain_id: &str) -> Self {
+        Self {
             vote_type: vote.vote_type,
             chain_id: chain_id.to_string(),
             block_id: match vote.block_id {
diff --git a/tendermint/src/block/height.rs b/tendermint/src/block/height.rs
index 1cfcee991..1c46b540b 100644
--- a/tendermint/src/block/height.rs
+++ b/tendermint/src/block/height.rs
@@ -21,7 +21,7 @@ impl Height {
 
     /// Increment the block height by 1
     pub fn increment(self) -> Self {
-        Height(self.0.checked_add(1).unwrap())
+        Self(self.0.checked_add(1).unwrap())
     }
 }
 
@@ -33,7 +33,7 @@ impl Debug for Height {
 
 impl Default for Height {
     fn default() -> Self {
-        Height(1)
+        Self(1)
     }
 }
 
@@ -46,9 +46,9 @@ impl Display for Height {
 impl TryFrom<i64> for Height {
     type Error = Error;
 
-    fn try_from(n: i64) -> Result<Height, Error> {
+    fn try_from(n: i64) -> Result<Self, Error> {
         if n >= 0 {
-            Ok(Height(n as u64))
+            Ok(Self(n as u64))
         } else {
             Err(ErrorKind::OutOfRange.into())
         }
@@ -56,20 +56,20 @@ impl TryFrom<i64> for Height {
 }
 
 impl From<u64> for Height {
-    fn from(n: u64) -> Height {
-        Height(n)
+    fn from(n: u64) -> Self {
+        Self(n)
     }
 }
 
 impl From<Height> for u64 {
-    fn from(height: Height) -> u64 {
+    fn from(height: Height) -> Self {
         height.0
     }
 }
 
 impl From<Height> for i64 {
-    fn from(height: Height) -> i64 {
-        height.0 as i64
+    fn from(height: Height) -> Self {
+        height.0 as Self
     }
 }
 
diff --git a/tendermint/src/block/parts.rs b/tendermint/src/block/parts.rs
index 61e2d2170..2454dcbfa 100644
--- a/tendermint/src/block/parts.rs
+++ b/tendermint/src/block/parts.rs
@@ -23,6 +23,6 @@ pub struct Header {
 impl Header {
     /// Create a new parts header
     pub fn new(total: u64, hash: Hash) -> Self {
-        Header { total, hash }
+        Self { total, hash }
     }
 }
diff --git a/tendermint/src/block/signed_header.rs b/tendermint/src/block/signed_header.rs
index 997ae616a..04904b408 100644
--- a/tendermint/src/block/signed_header.rs
+++ b/tendermint/src/block/signed_header.rs
@@ -15,7 +15,7 @@ pub struct SignedHeader {
 
 impl lite::SignedHeader for SignedHeader {
     type Header = block::Header;
-    type Commit = SignedHeader;
+    type Commit = Self;
 
     fn header(&self) -> &block::Header {
         &self.header
diff --git a/tendermint/src/chain/id.rs b/tendermint/src/chain/id.rs
index 06ec9a40e..a7ff2bc86 100644
--- a/tendermint/src/chain/id.rs
+++ b/tendermint/src/chain/id.rs
@@ -56,7 +56,7 @@ impl Display for Id {
 }
 
 impl<'a> From<&'a str> for Id {
-    fn from(s: &str) -> Id {
+    fn from(s: &str) -> Self {
         Self::from_str(s).unwrap()
     }
 }
@@ -78,7 +78,7 @@ impl FromStr for Id {
 
         let mut bytes = [0_u8; MAX_LENGTH];
         bytes[..name.as_bytes().len()].copy_from_slice(name.as_bytes());
-        Ok(Id(bytes))
+        Ok(Self(bytes))
     }
 }
 
@@ -89,19 +89,19 @@ impl Hash for Id {
 }
 
 impl PartialOrd for Id {
-    fn partial_cmp(&self, other: &Id) -> Option<Ordering> {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
         Some(self.cmp(other))
     }
 }
 
 impl Ord for Id {
-    fn cmp(&self, other: &Id) -> Ordering {
+    fn cmp(&self, other: &Self) -> Ordering {
         self.as_str().cmp(other.as_str())
     }
 }
 
 impl PartialEq for Id {
-    fn eq(&self, other: &Id) -> bool {
+    fn eq(&self, other: &Self) -> bool {
         self.as_str() == other.as_str()
     }
 }
diff --git a/tendermint/src/channel/id.rs b/tendermint/src/channel/id.rs
index f9d94c705..46a4798f9 100644
--- a/tendermint/src/channel/id.rs
+++ b/tendermint/src/channel/id.rs
@@ -12,13 +12,13 @@ impl Id {
 }
 
 impl From<Id> for u64 {
-    fn from(id: Id) -> u64 {
+    fn from(id: Id) -> Self {
         id.value()
     }
 }
 
 impl From<u64> for Id {
-    fn from(id: u64) -> Id {
-        Id(id)
+    fn from(id: u64) -> Self {
+        Self(id)
     }
 }
diff --git a/tendermint/src/config.rs b/tendermint/src/config.rs
index 3b1a1acfe..a37fe13e5 100644
--- a/tendermint/src/config.rs
+++ b/tendermint/src/config.rs
@@ -199,7 +199,7 @@ impl FromStr for LogLevel {
             }
         }
 
-        Ok(LogLevel(levels))
+        Ok(Self(levels))
     }
 }
 
@@ -541,8 +541,8 @@ pub enum TxIndexer {
 }
 
 impl Default for TxIndexer {
-    fn default() -> TxIndexer {
-        TxIndexer::Kv
+    fn default() -> Self {
+        Self::Kv
     }
 }
 
diff --git a/tendermint/src/consensus/state.rs b/tendermint/src/consensus/state.rs
index b76a9f39a..ec84467ff 100644
--- a/tendermint/src/consensus/state.rs
+++ b/tendermint/src/consensus/state.rs
@@ -48,7 +48,7 @@ impl fmt::Display for State {
 }
 
 impl Ord for State {
-    fn cmp(&self, other: &State) -> Ordering {
+    fn cmp(&self, other: &Self) -> Ordering {
         match self.height.cmp(&other.height) {
             Ordering::Greater => Ordering::Greater,
             Ordering::Less => Ordering::Less,
@@ -62,7 +62,7 @@ impl Ord for State {
 }
 
 impl PartialOrd for State {
-    fn partial_cmp(&self, other: &State) -> Option<Ordering> {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
         Some(self.cmp(other))
     }
 }
diff --git a/tendermint/src/error.rs b/tendermint/src/error.rs
index f8231c5b2..f1b9f0a44 100644
--- a/tendermint/src/error.rs
+++ b/tendermint/src/error.rs
@@ -1,5 +1,9 @@
 //! Error types
 
+// TODO(xla): Clippy fires false positives in macros:
+// https://github.com/rust-lang/rust-clippy/issues/4887
+#![allow(clippy::use_self)]
+
 use failure::*;
 use std::{
     fmt::{self, Display},
@@ -73,12 +77,12 @@ impl Fail for Error {
 
 impl From<Kind> for Error {
     fn from(kind: Kind) -> Self {
-        Error::new(kind, None)
+        Self::new(kind, None)
     }
 }
 
 impl From<chrono::ParseError> for Error {
-    fn from(err: chrono::ParseError) -> Error {
+    fn from(err: chrono::ParseError) -> Self {
         err!(Kind::Parse, err)
     }
 }
@@ -120,7 +124,7 @@ impl From<signatory::signature::Error> for Error {
 }
 
 impl From<subtle_encoding::Error> for Error {
-    fn from(err: subtle_encoding::Error) -> Error {
+    fn from(err: subtle_encoding::Error) -> Self {
         err!(Kind::Parse, err)
     }
 }
diff --git a/tendermint/src/evidence.rs b/tendermint/src/evidence.rs
index ff0d81d73..688e9fe15 100644
--- a/tendermint/src/evidence.rs
+++ b/tendermint/src/evidence.rs
@@ -17,12 +17,12 @@ pub struct Evidence(Vec<u8>);
 
 impl Evidence {
     /// Create a new raw evidence value from a byte vector
-    pub fn new<V>(into_vec: V) -> Evidence
+    pub fn new<V>(into_vec: V) -> Self
     where
         V: Into<Vec<u8>>,
     {
         // TODO(tarcieri): parse/validate evidence contents from amino messages
-        Evidence(into_vec.into())
+        Self(into_vec.into())
     }
 
     /// Serialize this evidence as an Amino message bytestring
@@ -36,7 +36,7 @@ impl<'de> Deserialize<'de> for Evidence {
         let bytes = base64::decode(String::deserialize(deserializer)?.as_bytes())
             .map_err(|e| D::Error::custom(format!("{}", e)))?;
 
-        Ok(Evidence::new(bytes))
+        Ok(Self::new(bytes))
     }
 }
 
@@ -58,11 +58,11 @@ pub struct Data {
 
 impl Data {
     /// Create a new evidence data collection
-    pub fn new<I>(into_evidence: I) -> Data
+    pub fn new<I>(into_evidence: I) -> Self
     where
         I: Into<Vec<Evidence>>,
     {
-        Data {
+        Self {
             evidence: Some(into_evidence.into()),
         }
     }
diff --git a/tendermint/src/hash.rs b/tendermint/src/hash.rs
index 5db935a97..c96dfa33a 100644
--- a/tendermint/src/hash.rs
+++ b/tendermint/src/hash.rs
@@ -28,13 +28,13 @@ pub enum Hash {
 impl Hash {
     #[allow(clippy::new_ret_no_self)]
     /// Create a new `Hash` with the given algorithm type
-    pub fn new(alg: Algorithm, bytes: &[u8]) -> Result<Hash, Error> {
+    pub fn new(alg: Algorithm, bytes: &[u8]) -> Result<Self, Error> {
         match alg {
             Algorithm::Sha256 => {
                 if bytes.len() == SHA256_HASH_SIZE {
                     let mut h = [0_u8; SHA256_HASH_SIZE];
                     h.copy_from_slice(bytes);
-                    Ok(Hash::Sha256(h))
+                    Ok(Self::Sha256(h))
                 } else {
                     Err(ErrorKind::Parse.into())
                 }
@@ -43,12 +43,12 @@ impl Hash {
     }
 
     /// Decode a `Hash` from upper-case hexadecimal
-    pub fn from_hex_upper(alg: Algorithm, s: &str) -> Result<Hash, Error> {
+    pub fn from_hex_upper(alg: Algorithm, s: &str) -> Result<Self, Error> {
         match alg {
             Algorithm::Sha256 => {
                 let mut h = [0_u8; SHA256_HASH_SIZE];
                 Hex::upper_case().decode_to_slice(s.as_bytes(), &mut h)?;
-                Ok(Hash::Sha256(h))
+                Ok(Self::Sha256(h))
             }
         }
     }
@@ -56,14 +56,14 @@ impl Hash {
     /// Return the digest algorithm used to produce this hash
     pub fn algorithm(self) -> Algorithm {
         match self {
-            Hash::Sha256(_) => Algorithm::Sha256,
+            Self::Sha256(_) => Algorithm::Sha256,
         }
     }
 
     /// Borrow the `Hash` as a byte slice
     pub fn as_bytes(&self) -> &[u8] {
         match self {
-            Hash::Sha256(ref h) => h.as_ref(),
+            Self::Sha256(ref h) => h.as_ref(),
         }
     }
 }
@@ -71,7 +71,7 @@ impl Hash {
 impl Debug for Hash {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
-            Hash::Sha256(_) => write!(f, "Hash::Sha256({})", self),
+            Self::Sha256(_) => write!(f, "Hash::Sha256({})", self),
         }
     }
 }
@@ -79,7 +79,7 @@ impl Debug for Hash {
 impl Display for Hash {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let hex = match self {
-            Hash::Sha256(ref h) => Hex::upper_case().encode_to_string(h).unwrap(),
+            Self::Sha256(ref h) => Hex::upper_case().encode_to_string(h).unwrap(),
         };
 
         write!(f, "{}", hex)
diff --git a/tendermint/src/lib.rs b/tendermint/src/lib.rs
index e6494b93b..43c4f7bfd 100644
--- a/tendermint/src/lib.rs
+++ b/tendermint/src/lib.rs
@@ -20,8 +20,8 @@
     clippy::restriction
 )]
 #![allow(clippy::result_unwrap_used)]
-#![forbid(clippy::multiple_inherent_impl)]
-#![allow(clippy::multiple_crate_versions)]
+#![allow(clippy::implicit_return, clippy::multiple_crate_versions)]
+#![deny(clippy::use_self)]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/tendermint/kms/master/img/tendermint.png",
     html_root_url = "https://docs.rs/tendermint/0.11.0"
diff --git a/tendermint/src/lite/verifier.rs b/tendermint/src/lite/verifier.rs
index 480b1bda4..48b2263f8 100644
--- a/tendermint/src/lite/verifier.rs
+++ b/tendermint/src/lite/verifier.rs
@@ -349,8 +349,8 @@ mod tests {
     }
 
     impl MockHeader {
-        fn new(height: u64, time: SystemTime, vals: Hash, next_vals: Hash) -> MockHeader {
-            MockHeader {
+        fn new(height: u64, time: SystemTime, vals: Hash, next_vals: Hash) -> Self {
+            Self {
                 height,
                 time,
                 vals,
@@ -393,8 +393,8 @@ mod tests {
     }
 
     impl MockValSet {
-        fn new(vals: Vec<usize>) -> MockValSet {
-            MockValSet { vals }
+        fn new(vals: Vec<usize>) -> Self {
+            Self { vals }
         }
     }
 
@@ -422,8 +422,8 @@ mod tests {
     }
 
     impl MockCommit {
-        fn new(hash: Hash, vals: Vec<Option<usize>>) -> MockCommit {
-            MockCommit { hash, vals }
+        fn new(hash: Hash, vals: Vec<Option<usize>>) -> Self {
+            Self { hash, vals }
         }
     }
 
@@ -466,7 +466,7 @@ mod tests {
 
     impl MockSignedHeader {
         fn new(header: MockHeader, commit: MockCommit) -> Self {
-            MockSignedHeader { header, commit }
+            Self { header, commit }
         }
     }
 
@@ -492,8 +492,8 @@ mod tests {
         type ValidatorSet = MockValSet;
 
         // XXX: how to do this without cloning?!
-        fn new(header: &Self::LastHeader, vals: &Self::ValidatorSet) -> MockState {
-            MockState {
+        fn new(header: &Self::LastHeader, vals: &Self::ValidatorSet) -> Self {
+            Self {
                 header: header.clone(),
                 vals: vals.clone(),
             }
diff --git a/tendermint/src/moniker.rs b/tendermint/src/moniker.rs
index b5ca283da..474c41661 100644
--- a/tendermint/src/moniker.rs
+++ b/tendermint/src/moniker.rs
@@ -15,7 +15,7 @@ impl FromStr for Moniker {
     type Err = Error;
 
     fn from_str(s: &str) -> Result<Self, Error> {
-        Ok(Moniker(s.to_owned()))
+        Ok(Self(s.to_owned()))
     }
 }
 
diff --git a/tendermint/src/net.rs b/tendermint/src/net.rs
index 45043147f..c91136850 100644
--- a/tendermint/src/net.rs
+++ b/tendermint/src/net.rs
@@ -48,8 +48,8 @@ impl<'de> Deserialize<'de> for Address {
 impl Display for Address {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
-            Address::Tcp { host, port, .. } => write!(f, "{}{}:{}", TCP_PREFIX, host, port),
-            Address::Unix { path } => write!(f, "{}{}", UNIX_PREFIX, path.display()),
+            Self::Tcp { host, port, .. } => write!(f, "{}{}:{}", TCP_PREFIX, host, port),
+            Self::Unix { path } => write!(f, "{}{}", UNIX_PREFIX, path.display()),
         }
     }
 }
@@ -61,7 +61,7 @@ impl FromStr for Address {
         if addr.starts_with(TCP_PREFIX) {
             Self::parse_tcp_addr(&addr[TCP_PREFIX.len()..])
         } else if addr.starts_with(UNIX_PREFIX) {
-            Ok(Address::Unix {
+            Ok(Self::Unix {
                 path: PathBuf::from(&addr[UNIX_PREFIX.len()..]),
             })
         } else if addr.contains("://") {
@@ -118,7 +118,7 @@ impl Address {
             )
         })?;
 
-        Ok(Address::Tcp {
+        Ok(Self::Tcp {
             peer_id,
             host,
             port,
diff --git a/tendermint/src/node/id.rs b/tendermint/src/node/id.rs
index 8574ff934..842bea58c 100644
--- a/tendermint/src/node/id.rs
+++ b/tendermint/src/node/id.rs
@@ -21,8 +21,8 @@ pub struct Id([u8; LENGTH]);
 
 impl Id {
     /// Create a new Node ID from raw bytes
-    pub fn new(bytes: [u8; LENGTH]) -> Id {
-        Id(bytes)
+    pub fn new(bytes: [u8; LENGTH]) -> Self {
+        Self(bytes)
     }
 
     /// Borrow the node ID as a byte slice
@@ -38,7 +38,7 @@ impl AsRef<[u8]> for Id {
 }
 
 impl ConstantTimeEq for Id {
-    fn ct_eq(&self, other: &Id) -> subtle::Choice {
+    fn ct_eq(&self, other: &Self) -> subtle::Choice {
         self.as_bytes().ct_eq(other.as_bytes())
     }
 }
@@ -59,11 +59,11 @@ impl Debug for Id {
 }
 
 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 = [0_u8; LENGTH];
         bytes.copy_from_slice(&digest[..LENGTH]);
-        Id(bytes)
+        Self(bytes)
     }
 }
 
@@ -83,12 +83,12 @@ impl FromStr for Id {
 
         let mut result_bytes = [0_u8; LENGTH];
         result_bytes.copy_from_slice(&bytes);
-        Ok(Id(result_bytes))
+        Ok(Self(result_bytes))
     }
 }
 
 impl PartialEq for Id {
-    fn eq(&self, other: &Id) -> bool {
+    fn eq(&self, other: &Self) -> bool {
         self.ct_eq(other).into()
     }
 }
diff --git a/tendermint/src/node/info.rs b/tendermint/src/node/info.rs
index d138dd992..575271f3e 100644
--- a/tendermint/src/node/info.rs
+++ b/tendermint/src/node/info.rs
@@ -63,8 +63,8 @@ pub struct ListenAddress(String);
 
 impl ListenAddress {
     /// Construct `ListenAddress`
-    pub fn new(s: String) -> ListenAddress {
-        ListenAddress(s)
+    pub fn new(s: String) -> Self {
+        Self(s)
     }
 
     /// Convert `ListenAddress` to a `net::Address`
@@ -107,13 +107,13 @@ pub enum TxIndexStatus {
 }
 
 impl Default for TxIndexStatus {
-    fn default() -> TxIndexStatus {
-        TxIndexStatus::On
+    fn default() -> Self {
+        Self::On
     }
 }
 
 impl From<TxIndexStatus> for bool {
-    fn from(status: TxIndexStatus) -> bool {
+    fn from(status: TxIndexStatus) -> Self {
         match status {
             TxIndexStatus::On => true,
             TxIndexStatus::Off => false,
diff --git a/tendermint/src/private_key.rs b/tendermint/src/private_key.rs
index 7fd277a40..48f2b8612 100644
--- a/tendermint/src/private_key.rs
+++ b/tendermint/src/private_key.rs
@@ -24,14 +24,14 @@ impl PrivateKey {
     /// Get the public key associated with this private key
     pub fn public_key(&self) -> PublicKey {
         match self {
-            PrivateKey::Ed25519(private_key) => private_key.public_key(),
+            Self::Ed25519(private_key) => private_key.public_key(),
         }
     }
 
     /// If applicable, borrow the Ed25519 keypair
     pub fn ed25519_keypair(&self) -> Option<&Ed25519Keypair> {
         match self {
-            PrivateKey::Ed25519(keypair) => Some(keypair),
+            Self::Ed25519(keypair) => Some(keypair),
         }
     }
 }
@@ -64,8 +64,8 @@ impl Ed25519Keypair {
 }
 
 impl<'a> From<&'a Ed25519Keypair> for ed25519::Seed {
-    fn from(keypair: &'a Ed25519Keypair) -> ed25519::Seed {
-        ed25519::Seed::from_keypair(&keypair.0[..]).unwrap()
+    fn from(keypair: &'a Ed25519Keypair) -> Self {
+        Self::from_keypair(&keypair.0[..]).unwrap()
     }
 }
 
@@ -82,7 +82,7 @@ impl<'de> Deserialize<'de> for Ed25519Keypair {
             return Err(D::Error::custom("invalid Ed25519 keypair size"));
         }
 
-        Ok(Ed25519Keypair(keypair_bytes))
+        Ok(Self(keypair_bytes))
     }
 }
 
diff --git a/tendermint/src/public_key.rs b/tendermint/src/public_key.rs
index 54f82c90d..bce642b2c 100644
--- a/tendermint/src/public_key.rs
+++ b/tendermint/src/public_key.rs
@@ -35,21 +35,19 @@ pub enum PublicKey {
 
 impl PublicKey {
     /// From raw secp256k1 public key bytes
-    pub fn from_raw_secp256k1(bytes: &[u8]) -> Option<PublicKey> {
-        Some(PublicKey::Secp256k1(secp256k1::PublicKey::from_bytes(
-            bytes,
-        )?))
+    pub fn from_raw_secp256k1(bytes: &[u8]) -> Option<Self> {
+        Some(Self::Secp256k1(secp256k1::PublicKey::from_bytes(bytes)?))
     }
 
     /// From raw Ed25519 public key bytes
-    pub fn from_raw_ed25519(bytes: &[u8]) -> Option<PublicKey> {
-        Some(PublicKey::Ed25519(ed25519::PublicKey::from_bytes(bytes)?))
+    pub fn from_raw_ed25519(bytes: &[u8]) -> Option<Self> {
+        Some(Self::Ed25519(ed25519::PublicKey::from_bytes(bytes)?))
     }
 
     /// Get Ed25519 public key
     pub fn ed25519(self) -> Option<ed25519::PublicKey> {
         match self {
-            PublicKey::Ed25519(pk) => Some(pk),
+            Self::Ed25519(pk) => Some(pk),
             _ => None,
         }
     }
@@ -57,8 +55,8 @@ impl PublicKey {
     /// Serialize this key as raw bytes
     pub fn as_bytes(self) -> Vec<u8> {
         match self {
-            PublicKey::Ed25519(ref pk) => pk.as_bytes(),
-            PublicKey::Secp256k1(ref pk) => pk.as_bytes(),
+            Self::Ed25519(ref pk) => pk.as_bytes(),
+            Self::Secp256k1(ref pk) => pk.as_bytes(),
         }
         .to_vec()
     }
@@ -66,13 +64,13 @@ impl PublicKey {
     /// Serialize this key as amino bytes
     pub fn to_amino_bytes(self) -> Vec<u8> {
         match self {
-            PublicKey::Ed25519(ref pk) => {
+            Self::Ed25519(ref pk) => {
                 //Amino prefix for Pubkey
                 let mut key_bytes = vec![0x16, 0x24, 0xDE, 0x64, 0x20];
                 key_bytes.extend(pk.as_bytes());
                 key_bytes
             }
-            PublicKey::Secp256k1(ref pk) => {
+            Self::Secp256k1(ref pk) => {
                 let mut key_bytes = vec![0xEB, 0x5A, 0xE9, 0x87, 0x21];
                 key_bytes.extend(pk.as_bytes());
                 key_bytes
@@ -92,14 +90,14 @@ impl PublicKey {
 }
 
 impl From<ed25519::PublicKey> for PublicKey {
-    fn from(pk: ed25519::PublicKey) -> PublicKey {
-        PublicKey::Ed25519(pk)
+    fn from(pk: ed25519::PublicKey) -> Self {
+        Self::Ed25519(pk)
     }
 }
 
 impl From<secp256k1::PublicKey> for PublicKey {
-    fn from(pk: secp256k1::PublicKey) -> PublicKey {
-        PublicKey::Secp256k1(pk)
+    fn from(pk: secp256k1::PublicKey) -> Self {
+        Self::Secp256k1(pk)
     }
 }
 
@@ -115,18 +113,16 @@ pub enum TendermintKey {
 
 impl TendermintKey {
     /// Create a new account key from a `PublicKey`
-    pub fn new_account_key(public_key: PublicKey) -> Result<TendermintKey, Error> {
+    pub fn new_account_key(public_key: PublicKey) -> Result<Self, Error> {
         match public_key {
-            PublicKey::Ed25519(_) | PublicKey::Secp256k1(_) => {
-                Ok(TendermintKey::AccountKey(public_key))
-            }
+            PublicKey::Ed25519(_) | PublicKey::Secp256k1(_) => Ok(Self::AccountKey(public_key)),
         }
     }
 
     /// Create a new consensus key from a `PublicKey`
-    pub fn new_consensus_key(public_key: PublicKey) -> Result<TendermintKey, Error> {
+    pub fn new_consensus_key(public_key: PublicKey) -> Result<Self, Error> {
         match public_key {
-            PublicKey::Ed25519(_) => Ok(TendermintKey::AccountKey(public_key)),
+            PublicKey::Ed25519(_) => Ok(Self::AccountKey(public_key)),
             _ => Err(err!(
                 ErrorKind::InvalidKey,
                 "only ed25519 consensus keys are supported"
@@ -140,8 +136,8 @@ impl Deref for TendermintKey {
 
     fn deref(&self) -> &PublicKey {
         match self {
-            TendermintKey::AccountKey(key) => key,
-            TendermintKey::ConsensusKey(key) => key,
+            Self::AccountKey(key) => key,
+            Self::ConsensusKey(key) => key,
         }
     }
 }
@@ -160,8 +156,8 @@ impl Algorithm {
     /// Get the string label for this algorithm
     pub fn as_str(&self) -> &str {
         match self {
-            Algorithm::Ed25519 => "ed25519",
-            Algorithm::Secp256k1 => "secp256k1",
+            Self::Ed25519 => "ed25519",
+            Self::Secp256k1 => "secp256k1",
         }
     }
 }
@@ -177,8 +173,8 @@ impl FromStr for Algorithm {
 
     fn from_str(s: &str) -> Result<Self, Error> {
         match s {
-            "ed25519" => Ok(Algorithm::Ed25519),
-            "secp256k1" => Ok(Algorithm::Secp256k1),
+            "ed25519" => Ok(Self::Ed25519),
+            "secp256k1" => Ok(Self::Secp256k1),
             _ => Err(ErrorKind::Parse.into()),
         }
     }
diff --git a/tendermint/src/rpc/client.rs b/tendermint/src/rpc/client.rs
index 73655cb7c..8fd8d08c8 100644
--- a/tendermint/src/rpc/client.rs
+++ b/tendermint/src/rpc/client.rs
@@ -21,7 +21,7 @@ pub struct Client {
 impl Client {
     /// Create a new Tendermint RPC client, connecting to the given address
     pub async fn new(address: &net::Address) -> Result<Self, Error> {
-        let client = Client {
+        let client = Self {
             address: address.clone(),
         };
         client.health().await?;
diff --git a/tendermint/src/rpc/endpoint/blockchain.rs b/tendermint/src/rpc/endpoint/blockchain.rs
index 3d6e35e32..1d88b0f04 100644
--- a/tendermint/src/rpc/endpoint/blockchain.rs
+++ b/tendermint/src/rpc/endpoint/blockchain.rs
@@ -27,8 +27,8 @@ impl Request {
 }
 
 impl From<Range<block::Height>> for Request {
-    fn from(range: Range<block::Height>) -> Request {
-        Request::new(range.start, range.end)
+    fn from(range: Range<block::Height>) -> Self {
+        Self::new(range.start, range.end)
     }
 }
 
diff --git a/tendermint/src/rpc/endpoint/broadcast/tx_async.rs b/tendermint/src/rpc/endpoint/broadcast/tx_async.rs
index 69fec9370..e2585e70a 100644
--- a/tendermint/src/rpc/endpoint/broadcast/tx_async.rs
+++ b/tendermint/src/rpc/endpoint/broadcast/tx_async.rs
@@ -15,8 +15,8 @@ pub struct Request {
 
 impl Request {
     /// Create a new async transaction broadcast RPC request
-    pub fn new(tx: Transaction) -> Request {
-        Request { tx }
+    pub fn new(tx: Transaction) -> Self {
+        Self { tx }
     }
 }
 
diff --git a/tendermint/src/rpc/endpoint/broadcast/tx_commit.rs b/tendermint/src/rpc/endpoint/broadcast/tx_commit.rs
index c1b4fa44b..e68d4cfde 100644
--- a/tendermint/src/rpc/endpoint/broadcast/tx_commit.rs
+++ b/tendermint/src/rpc/endpoint/broadcast/tx_commit.rs
@@ -20,8 +20,8 @@ pub struct Request {
 
 impl Request {
     /// Create a new commit transaction broadcast RPC request
-    pub fn new(tx: Transaction) -> Request {
-        Request { tx }
+    pub fn new(tx: Transaction) -> Self {
+        Self { tx }
     }
 }
 
diff --git a/tendermint/src/rpc/endpoint/broadcast/tx_sync.rs b/tendermint/src/rpc/endpoint/broadcast/tx_sync.rs
index 8fc48ca4b..e1d35c4bc 100644
--- a/tendermint/src/rpc/endpoint/broadcast/tx_sync.rs
+++ b/tendermint/src/rpc/endpoint/broadcast/tx_sync.rs
@@ -15,8 +15,8 @@ pub struct Request {
 
 impl Request {
     /// Create a new sync transaction broadcast RPC request
-    pub fn new(tx: Transaction) -> Request {
-        Request { tx }
+    pub fn new(tx: Transaction) -> Self {
+        Self { tx }
     }
 }
 
diff --git a/tendermint/src/rpc/error.rs b/tendermint/src/rpc/error.rs
index 974a734cb..74ed7b8c8 100644
--- a/tendermint/src/rpc/error.rs
+++ b/tendermint/src/rpc/error.rs
@@ -19,10 +19,10 @@ pub struct Error {
 
 impl Error {
     /// Create a new RPC error
-    pub fn new(code: Code, data: Option<String>) -> Error {
+    pub fn new(code: Code, data: Option<String>) -> Self {
         let message = code.to_string();
 
-        Error {
+        Self {
             code,
             message,
             data,
@@ -30,8 +30,8 @@ impl Error {
     }
 
     /// Create a low-level HTTP error
-    pub fn http_error(message: impl Into<String>) -> Error {
-        Error {
+    pub fn http_error(message: impl Into<String>) -> Self {
+        Self {
             code: Code::HttpError,
             message: message.into(),
             data: None,
@@ -39,29 +39,29 @@ impl Error {
     }
 
     /// Create a new invalid parameter error
-    pub fn invalid_params(data: &str) -> Error {
-        Error::new(Code::InvalidParams, Some(data.to_string()))
+    pub fn invalid_params(data: &str) -> Self {
+        Self::new(Code::InvalidParams, Some(data.to_string()))
     }
 
     /// Create a new method-not-found error
-    pub fn method_not_found(name: &str) -> Error {
-        Error::new(Code::MethodNotFound, Some(name.to_string()))
+    pub fn method_not_found(name: &str) -> Self {
+        Self::new(Code::MethodNotFound, Some(name.to_string()))
     }
 
     /// Create a new parse error
-    pub fn parse_error<E>(error: E) -> Error
+    pub fn parse_error<E>(error: E) -> Self
     where
         E: Display,
     {
-        Error::new(Code::ParseError, Some(error.to_string()))
+        Self::new(Code::ParseError, Some(error.to_string()))
     }
 
     /// Create a new server error
-    pub fn server_error<D>(data: D) -> Error
+    pub fn server_error<D>(data: D) -> Self
     where
         D: Display,
     {
-        Error::new(Code::ServerError, Some(data.to_string()))
+        Self::new(Code::ServerError, Some(data.to_string()))
     }
 
     /// Obtain the `rpc::error::Code` for this error
@@ -102,14 +102,14 @@ impl Fail for Error {
 }
 
 impl From<http::Error> for Error {
-    fn from(http_error: http::Error) -> Error {
-        Error::http_error(http_error.to_string())
+    fn from(http_error: http::Error) -> Self {
+        Self::http_error(http_error.to_string())
     }
 }
 
 impl From<hyper::Error> for Error {
-    fn from(hyper_error: hyper::Error) -> Error {
-        Error::http_error(hyper_error.to_string())
+    fn from(hyper_error: hyper::Error) -> Self {
+        Self::http_error(hyper_error.to_string())
     }
 }
 
@@ -160,22 +160,22 @@ impl Code {
 }
 
 impl From<i32> for Code {
-    fn from(value: i32) -> Code {
+    fn from(value: i32) -> Self {
         match value {
-            0 => Code::HttpError,
-            -32700 => Code::ParseError,
-            -32600 => Code::InvalidRequest,
-            -32601 => Code::MethodNotFound,
-            -32602 => Code::InvalidParams,
-            -32603 => Code::InternalError,
-            -32000 => Code::ServerError,
-            other => Code::Other(other),
+            0 => Self::HttpError,
+            -32700 => Self::ParseError,
+            -32600 => Self::InvalidRequest,
+            -32601 => Self::MethodNotFound,
+            -32602 => Self::InvalidParams,
+            -32603 => Self::InternalError,
+            -32000 => Self::ServerError,
+            other => Self::Other(other),
         }
     }
 }
 
 impl From<Code> for i32 {
-    fn from(code: Code) -> i32 {
+    fn from(code: Code) -> Self {
         match code {
             Code::HttpError => 0,
             Code::ParseError => -32700,
@@ -191,7 +191,7 @@ impl From<Code> for i32 {
 
 impl<'de> Deserialize<'de> for Code {
     fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
-        Ok(Code::from(i32::deserialize(deserializer)?))
+        Ok(Self::from(i32::deserialize(deserializer)?))
     }
 }
 
diff --git a/tendermint/src/rpc/id.rs b/tendermint/src/rpc/id.rs
index dfcd7768d..888287834 100644
--- a/tendermint/src/rpc/id.rs
+++ b/tendermint/src/rpc/id.rs
@@ -18,7 +18,7 @@ impl Id {
             .set_version(uuid::Version::Random)
             .build();
 
-        Id(uuid.to_string())
+        Self(uuid.to_string())
     }
 }
 
diff --git a/tendermint/src/rpc/method.rs b/tendermint/src/rpc/method.rs
index 4fb62a4b7..8ea3ccd13 100644
--- a/tendermint/src/rpc/method.rs
+++ b/tendermint/src/rpc/method.rs
@@ -59,20 +59,20 @@ impl Method {
     /// Get a static string which represents this method name
     pub fn as_str(self) -> &'static str {
         match self {
-            Method::AbciInfo => "abci_info",
-            Method::AbciQuery => "abci_query",
-            Method::Block => "block",
-            Method::BlockResults => "block_results",
-            Method::Blockchain => "blockchain",
-            Method::BroadcastTxAsync => "broadcast_tx_async",
-            Method::BroadcastTxSync => "broadcast_tx_sync",
-            Method::BroadcastTxCommit => "broadcast_tx_commit",
-            Method::Commit => "commit",
-            Method::Genesis => "genesis",
-            Method::Health => "health",
-            Method::NetInfo => "net_info",
-            Method::Status => "status",
-            Method::Validators => "validators",
+            Self::AbciInfo => "abci_info",
+            Self::AbciQuery => "abci_query",
+            Self::Block => "block",
+            Self::BlockResults => "block_results",
+            Self::Blockchain => "blockchain",
+            Self::BroadcastTxAsync => "broadcast_tx_async",
+            Self::BroadcastTxSync => "broadcast_tx_sync",
+            Self::BroadcastTxCommit => "broadcast_tx_commit",
+            Self::Commit => "commit",
+            Self::Genesis => "genesis",
+            Self::Health => "health",
+            Self::NetInfo => "net_info",
+            Self::Status => "status",
+            Self::Validators => "validators",
         }
     }
 }
@@ -82,20 +82,20 @@ impl FromStr for Method {
 
     fn from_str(s: &str) -> Result<Self, Error> {
         Ok(match s {
-            "abci_info" => Method::AbciInfo,
-            "abci_query" => Method::AbciQuery,
-            "block" => Method::Block,
-            "block_results" => Method::BlockResults,
-            "blockchain" => Method::Blockchain,
-            "broadcast_tx_async" => Method::BroadcastTxAsync,
-            "broadcast_tx_sync" => Method::BroadcastTxSync,
-            "broadcast_tx_commit" => Method::BroadcastTxCommit,
-            "commit" => Method::Commit,
-            "genesis" => Method::Genesis,
-            "health" => Method::Health,
-            "net_info" => Method::NetInfo,
-            "status" => Method::Status,
-            "validators" => Method::Validators,
+            "abci_info" => Self::AbciInfo,
+            "abci_query" => Self::AbciQuery,
+            "block" => Self::Block,
+            "block_results" => Self::BlockResults,
+            "blockchain" => Self::Blockchain,
+            "broadcast_tx_async" => Self::BroadcastTxAsync,
+            "broadcast_tx_sync" => Self::BroadcastTxSync,
+            "broadcast_tx_commit" => Self::BroadcastTxCommit,
+            "commit" => Self::Commit,
+            "genesis" => Self::Genesis,
+            "health" => Self::Health,
+            "net_info" => Self::NetInfo,
+            "status" => Self::Status,
+            "validators" => Self::Validators,
             other => return Err(Error::method_not_found(other)),
         })
     }
diff --git a/tendermint/src/rpc/version.rs b/tendermint/src/rpc/version.rs
index 13471dcaf..a126c84be 100644
--- a/tendermint/src/rpc/version.rs
+++ b/tendermint/src/rpc/version.rs
@@ -18,7 +18,7 @@ pub struct Version(String);
 impl Version {
     /// Get the currently supported JSONRPC version
     pub fn current() -> Self {
-        Version(SUPPORTED_VERSION.to_owned())
+        Self(SUPPORTED_VERSION.to_owned())
     }
 
     /// Is this JSONRPC version supported?
@@ -49,6 +49,6 @@ impl FromStr for Version {
     type Err = Error;
 
     fn from_str(s: &str) -> Result<Self, Error> {
-        Ok(Version(s.to_owned()))
+        Ok(Self(s.to_owned()))
     }
 }
diff --git a/tendermint/src/signature.rs b/tendermint/src/signature.rs
index 324880ddb..b767a1cfa 100644
--- a/tendermint/src/signature.rs
+++ b/tendermint/src/signature.rs
@@ -15,7 +15,7 @@ impl Signature {
     /// Return the algorithm used to create this particular signature
     pub fn algorithm(self) -> Algorithm {
         match self {
-            Signature::Ed25519(_) => Algorithm::Ed25519,
+            Self::Ed25519(_) => Algorithm::Ed25519,
         }
     }
 
@@ -28,7 +28,7 @@ impl Signature {
 impl AsRef<[u8]> for Signature {
     fn as_ref(&self) -> &[u8] {
         match self {
-            Signature::Ed25519(sig) => sig.as_ref(),
+            Self::Ed25519(sig) => sig.as_ref(),
         }
     }
 }
@@ -38,7 +38,7 @@ impl<'de> Deserialize<'de> for Signature {
         let bytes = base64::decode(String::deserialize(deserializer)?.as_bytes())
             .map_err(|e| D::Error::custom(format!("{}", e)))?;
 
-        Ok(Signature::Ed25519(
+        Ok(Self::Ed25519(
             signatory::ed25519::Signature::from_bytes(&bytes)
                 .map_err(|e| D::Error::custom(format!("{}", e)))?,
         ))
diff --git a/tendermint/src/time.rs b/tendermint/src/time.rs
index d7dd86f39..8d39c4f9d 100644
--- a/tendermint/src/time.rs
+++ b/tendermint/src/time.rs
@@ -16,7 +16,7 @@ pub struct Time(DateTime<Utc>);
 impl Time {
     /// Get a `Timestamp` representing the current wall clock time
     pub fn now() -> Self {
-        Time(Utc::now())
+        Self(Utc::now())
     }
 
     /// Get the `UNIX_EPOCH` time ("1970-01-01 00:00:00 UTC") as a `Timestamp`
@@ -26,7 +26,7 @@ impl Time {
 
     /// Calculate the amount of time which has passed since another `Timestamp`
     /// as a `std::time::Duration`
-    pub fn duration_since(&self, other: Time) -> Result<Duration, Error> {
+    pub fn duration_since(&self, other: Self) -> Result<Duration, Error> {
         self.0
             .signed_duration_since(other.0)
             .to_std()
@@ -34,8 +34,8 @@ impl Time {
     }
 
     /// Parse a timestamp from an RFC 3339 date
-    pub fn parse_from_rfc3339(s: &str) -> Result<Time, Error> {
-        Ok(Time(DateTime::parse_from_rfc3339(s)?.with_timezone(&Utc)))
+    pub fn parse_from_rfc3339(s: &str) -> Result<Self, Error> {
+        Ok(Self(DateTime::parse_from_rfc3339(s)?.with_timezone(&Utc)))
     }
 
     /// Return an RFC 3339 and ISO 8601 date and time string with 6 subseconds digits and Z.
@@ -60,43 +60,44 @@ impl FromStr for Time {
     type Err = Error;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        Time::parse_from_rfc3339(s)
+        Self::parse_from_rfc3339(s)
     }
 }
 
 impl From<DateTime<Utc>> for Time {
-    fn from(t: DateTime<Utc>) -> Time {
-        Time(t)
+    fn from(t: DateTime<Utc>) -> Self {
+        Self(t)
     }
 }
 
 impl From<Time> for DateTime<Utc> {
+    #![allow(clippy::use_self)]
     fn from(t: Time) -> DateTime<Utc> {
         t.0
     }
 }
 
 impl From<SystemTime> for Time {
-    fn from(t: SystemTime) -> Time {
-        Time(t.into())
+    fn from(t: SystemTime) -> Self {
+        Self(t.into())
     }
 }
 
 impl From<Time> for SystemTime {
-    fn from(t: Time) -> SystemTime {
+    fn from(t: Time) -> Self {
         t.to_system_time().unwrap()
     }
 }
 
 impl From<TAI64N> for Time {
-    fn from(t: TAI64N) -> Time {
-        Time(t.to_datetime_utc())
+    fn from(t: TAI64N) -> Self {
+        Self(t.to_datetime_utc())
     }
 }
 
 impl From<Time> for TAI64N {
-    fn from(t: Time) -> TAI64N {
-        TAI64N::from_datetime_utc(&t.0)
+    fn from(t: Time) -> Self {
+        Self::from_datetime_utc(&t.0)
     }
 }
 
diff --git a/tendermint/src/timeout.rs b/tendermint/src/timeout.rs
index 637856a71..253fcef65 100644
--- a/tendermint/src/timeout.rs
+++ b/tendermint/src/timeout.rs
@@ -15,13 +15,13 @@ impl Deref for Timeout {
 }
 
 impl From<Duration> for Timeout {
-    fn from(duration: Duration) -> Timeout {
-        Timeout(duration)
+    fn from(duration: Duration) -> Self {
+        Self(duration)
     }
 }
 
 impl From<Timeout> for Duration {
-    fn from(timeout: Timeout) -> Duration {
+    fn from(timeout: Timeout) -> Self {
         timeout.0
     }
 }
@@ -53,7 +53,7 @@ impl FromStr for Timeout {
             _ => unreachable!(),
         };
 
-        Ok(Timeout(duration))
+        Ok(Self(duration))
     }
 }
 
diff --git a/tendermint/src/validator.rs b/tendermint/src/validator.rs
index e89e1518a..0537f8420 100644
--- a/tendermint/src/validator.rs
+++ b/tendermint/src/validator.rs
@@ -20,9 +20,9 @@ pub struct Set {
 impl Set {
     /// Create a new validator set.
     /// vals is mutable so it can be sorted by address.
-    pub fn new(mut vals: Vec<Info>) -> Set {
+    pub fn new(mut vals: Vec<Info>) -> Self {
         vals.sort_by(|v1, v2| v1.address.partial_cmp(&v2.address).unwrap());
-        Set { validators: vals }
+        Self { validators: vals }
     }
 
     /// Returns the validator with the given Id if its in the Set.
@@ -88,8 +88,8 @@ pub struct Info {
 
 impl Info {
     /// Create a new validator.
-    pub fn new(pk: PublicKey, vp: vote::Power) -> Info {
-        Info {
+    pub fn new(pk: PublicKey, vp: vote::Power) -> Self {
+        Self {
             address: account::Id::from(pk),
             pub_key: pk,
             voting_power: vp,
@@ -123,10 +123,10 @@ impl Info {
 }
 
 impl From<PublicKey> for account::Id {
-    fn from(pub_key: PublicKey) -> account::Id {
+    fn from(pub_key: PublicKey) -> Self {
         match pub_key {
-            PublicKey::Ed25519(pk) => account::Id::from(pk),
-            PublicKey::Secp256k1(pk) => account::Id::from(pk),
+            PublicKey::Ed25519(pk) => Self::from(pk),
+            PublicKey::Secp256k1(pk) => Self::from(pk),
         }
     }
 }
@@ -146,8 +146,8 @@ struct InfoHashable {
 
 /// Info -> [`InfoHashable`]
 impl From<&Info> for InfoHashable {
-    fn from(info: &Info) -> InfoHashable {
-        InfoHashable {
+    fn from(info: &Info) -> Self {
+        Self {
             pub_key: info.pub_key.as_bytes(),
             voting_power: info.voting_power.value(),
         }
@@ -166,14 +166,14 @@ impl ProposerPriority {
 }
 
 impl From<ProposerPriority> for i64 {
-    fn from(priority: ProposerPriority) -> i64 {
+    fn from(priority: ProposerPriority) -> Self {
         priority.value()
     }
 }
 
 impl<'de> Deserialize<'de> for ProposerPriority {
     fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
-        Ok(ProposerPriority(
+        Ok(Self(
             String::deserialize(deserializer)?
                 .parse()
                 .map_err(|e| D::Error::custom(format!("{}", e)))?,
diff --git a/tendermint/src/vote.rs b/tendermint/src/vote.rs
index e392695a2..ab5d49aca 100644
--- a/tendermint/src/vote.rs
+++ b/tendermint/src/vote.rs
@@ -84,9 +84,9 @@ impl Signed {
         chain_id: &str,
         validator_address: account::Id,
         signature: Signature,
-    ) -> Signed {
+    ) -> Self {
         let canonical_vote = amino_types::CanonicalVote::new(vote, chain_id);
-        Signed {
+        Self {
             vote: canonical_vote,
             signature,
             validator_address,
@@ -122,10 +122,10 @@ pub enum Type {
 
 impl Type {
     /// Deserialize this type from a byte
-    pub fn from_u8(byte: u8) -> Option<Type> {
+    pub fn from_u8(byte: u8) -> Option<Self> {
         match byte {
-            1 => Some(Type::Prevote),
-            2 => Some(Type::Precommit),
+            1 => Some(Self::Prevote),
+            2 => Some(Self::Precommit),
             _ => None,
         }
     }
@@ -150,6 +150,6 @@ impl Serialize for Type {
 impl<'de> Deserialize<'de> for Type {
     fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
         let byte = u8::deserialize(deserializer)?;
-        Type::from_u8(byte).ok_or_else(|| D::Error::custom(format!("invalid vote type: {}", byte)))
+        Self::from_u8(byte).ok_or_else(|| D::Error::custom(format!("invalid vote type: {}", byte)))
     }
 }
diff --git a/tendermint/src/vote/power.rs b/tendermint/src/vote/power.rs
index 7ac8901fe..ef88fa178 100644
--- a/tendermint/src/vote/power.rs
+++ b/tendermint/src/vote/power.rs
@@ -8,8 +8,8 @@ pub struct Power(u64);
 
 impl Power {
     /// Create a new Power
-    pub fn new(p: u64) -> Power {
-        Power(p)
+    pub fn new(p: u64) -> Self {
+        Self(p)
     }
 
     /// Get the current voting power
@@ -24,14 +24,14 @@ impl Power {
 }
 
 impl From<Power> for u64 {
-    fn from(power: Power) -> u64 {
+    fn from(power: Power) -> Self {
         power.0
     }
 }
 
 impl<'de> Deserialize<'de> for Power {
     fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
-        Ok(Power(
+        Ok(Self(
             String::deserialize(deserializer)?
                 .parse()
                 .map_err(|e| D::Error::custom(format!("{}", e)))?,

From 0ee13e2d2db11fee88db40e7a393fc1152f50455 Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Sun, 5 Jan 2020 14:35:24 +0100
Subject: [PATCH 25/55] Mark functions as const where possible

---
 tendermint/src/abci/gas.rs                         | 2 +-
 tendermint/src/abci/transaction.rs                 | 1 +
 tendermint/src/abci/transaction/hash.rs            | 2 +-
 tendermint/src/account.rs                          | 2 +-
 tendermint/src/block/commit.rs                     | 1 +
 tendermint/src/block/height.rs                     | 2 +-
 tendermint/src/block/id.rs                         | 2 +-
 tendermint/src/block/parts.rs                      | 2 +-
 tendermint/src/channel/id.rs                       | 2 +-
 tendermint/src/config.rs                           | 2 +-
 tendermint/src/hash.rs                             | 1 +
 tendermint/src/lib.rs                              | 2 +-
 tendermint/src/lite/verifier.rs                    | 6 +++---
 tendermint/src/node/id.rs                          | 2 +-
 tendermint/src/node/info.rs                        | 2 +-
 tendermint/src/rpc/endpoint/block.rs               | 2 +-
 tendermint/src/rpc/endpoint/blockchain.rs          | 2 +-
 tendermint/src/rpc/endpoint/broadcast/tx_async.rs  | 2 +-
 tendermint/src/rpc/endpoint/broadcast/tx_commit.rs | 2 +-
 tendermint/src/rpc/endpoint/broadcast/tx_sync.rs   | 2 +-
 tendermint/src/rpc/endpoint/validators.rs          | 2 +-
 tendermint/src/rpc/error.rs                        | 2 +-
 tendermint/src/signature.rs                        | 1 +
 tendermint/src/validator.rs                        | 4 ++--
 tendermint/src/vote.rs                             | 6 +++---
 tendermint/src/vote/power.rs                       | 6 +++---
 26 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/tendermint/src/abci/gas.rs b/tendermint/src/abci/gas.rs
index 0b9352258..06758255f 100644
--- a/tendermint/src/abci/gas.rs
+++ b/tendermint/src/abci/gas.rs
@@ -18,7 +18,7 @@ pub struct Gas(u64);
 
 impl Gas {
     /// Get the inner integer value
-    pub fn value(self) -> u64 {
+    pub const fn value(self) -> u64 {
         self.0
     }
 }
diff --git a/tendermint/src/abci/transaction.rs b/tendermint/src/abci/transaction.rs
index 912292c9d..b4d2b268a 100644
--- a/tendermint/src/abci/transaction.rs
+++ b/tendermint/src/abci/transaction.rs
@@ -23,6 +23,7 @@ impl Transaction {
         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
diff --git a/tendermint/src/abci/transaction/hash.rs b/tendermint/src/abci/transaction/hash.rs
index c740afd8f..a390ba63d 100644
--- a/tendermint/src/abci/transaction/hash.rs
+++ b/tendermint/src/abci/transaction/hash.rs
@@ -18,7 +18,7 @@ pub struct Hash([u8; LENGTH]);
 
 impl Hash {
     /// Create a new transaction hash from raw bytes
-    pub fn new(bytes: [u8; LENGTH]) -> Self {
+    pub const fn new(bytes: [u8; LENGTH]) -> Self {
         Self(bytes)
     }
 
diff --git a/tendermint/src/account.rs b/tendermint/src/account.rs
index 0004fd358..d6651b551 100644
--- a/tendermint/src/account.rs
+++ b/tendermint/src/account.rs
@@ -20,7 +20,7 @@ pub struct Id([u8; LENGTH]);
 
 impl Id {
     /// Create a new account ID from raw bytes
-    pub fn new(bytes: [u8; LENGTH]) -> Self {
+    pub const fn new(bytes: [u8; LENGTH]) -> Self {
         Self(bytes)
     }
 
diff --git a/tendermint/src/block/commit.rs b/tendermint/src/block/commit.rs
index 4fe60338e..f90ba61fb 100644
--- a/tendermint/src/block/commit.rs
+++ b/tendermint/src/block/commit.rs
@@ -31,6 +31,7 @@ impl Precommits {
         Self(into_precommits.into())
     }
 
+    #[allow(clippy::missing_const_for_fn)]
     /// Convert this collection of precommits into a vector
     pub fn into_vec(self) -> Vec<Option<Vote>> {
         self.0
diff --git a/tendermint/src/block/height.rs b/tendermint/src/block/height.rs
index 1c46b540b..3da93a18b 100644
--- a/tendermint/src/block/height.rs
+++ b/tendermint/src/block/height.rs
@@ -15,7 +15,7 @@ pub struct Height(pub u64);
 
 impl Height {
     /// Get inner integer value. Alternative to `.0` or `.into()`
-    pub fn value(self) -> u64 {
+    pub const fn value(self) -> u64 {
         self.0
     }
 
diff --git a/tendermint/src/block/id.rs b/tendermint/src/block/id.rs
index 4a299ecfb..fb5b6ac30 100644
--- a/tendermint/src/block/id.rs
+++ b/tendermint/src/block/id.rs
@@ -39,7 +39,7 @@ pub struct Id {
 
 impl Id {
     /// Create a new `Id` from a hash byte slice
-    pub fn new(hash: Hash, parts: Option<parts::Header>) -> Self {
+    pub const fn new(hash: Hash, parts: Option<parts::Header>) -> Self {
         Self { hash, parts }
     }
 
diff --git a/tendermint/src/block/parts.rs b/tendermint/src/block/parts.rs
index 2454dcbfa..5ca346cf8 100644
--- a/tendermint/src/block/parts.rs
+++ b/tendermint/src/block/parts.rs
@@ -22,7 +22,7 @@ pub struct Header {
 
 impl Header {
     /// Create a new parts header
-    pub fn new(total: u64, hash: Hash) -> Self {
+    pub const fn new(total: u64, hash: Hash) -> Self {
         Self { total, hash }
     }
 }
diff --git a/tendermint/src/channel/id.rs b/tendermint/src/channel/id.rs
index 46a4798f9..66a31b356 100644
--- a/tendermint/src/channel/id.rs
+++ b/tendermint/src/channel/id.rs
@@ -6,7 +6,7 @@ pub struct Id(pub u64);
 
 impl Id {
     /// Get the current channel id as an integer
-    pub fn value(self) -> u64 {
+    pub const fn value(self) -> u64 {
         self.0
     }
 }
diff --git a/tendermint/src/config.rs b/tendermint/src/config.rs
index a37fe13e5..daf4df484 100644
--- a/tendermint/src/config.rs
+++ b/tendermint/src/config.rs
@@ -570,7 +570,7 @@ pub struct TransferRate(u64);
 
 impl TransferRate {
     /// Get the trasfer rate in bytes per second
-    pub fn bytes_per_sec(self) -> u64 {
+    pub const fn bytes_per_sec(self) -> u64 {
         self.0
     }
 }
diff --git a/tendermint/src/hash.rs b/tendermint/src/hash.rs
index c96dfa33a..ba402d9b5 100644
--- a/tendermint/src/hash.rs
+++ b/tendermint/src/hash.rs
@@ -53,6 +53,7 @@ impl Hash {
         }
     }
 
+    #[allow(clippy::missing_const_for_fn)]
     /// Return the digest algorithm used to produce this hash
     pub fn algorithm(self) -> Algorithm {
         match self {
diff --git a/tendermint/src/lib.rs b/tendermint/src/lib.rs
index 43c4f7bfd..35ce6f70f 100644
--- a/tendermint/src/lib.rs
+++ b/tendermint/src/lib.rs
@@ -21,7 +21,7 @@
 )]
 #![allow(clippy::result_unwrap_used)]
 #![allow(clippy::implicit_return, clippy::multiple_crate_versions)]
-#![deny(clippy::use_self)]
+#![deny(clippy::missing_const_for_fn)]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/tendermint/kms/master/img/tendermint.png",
     html_root_url = "https://docs.rs/tendermint/0.11.0"
diff --git a/tendermint/src/lite/verifier.rs b/tendermint/src/lite/verifier.rs
index 48b2263f8..f9daade5b 100644
--- a/tendermint/src/lite/verifier.rs
+++ b/tendermint/src/lite/verifier.rs
@@ -349,7 +349,7 @@ mod tests {
     }
 
     impl MockHeader {
-        fn new(height: u64, time: SystemTime, vals: Hash, next_vals: Hash) -> Self {
+        const fn new(height: u64, time: SystemTime, vals: Hash, next_vals: Hash) -> Self {
             Self {
                 height,
                 time,
@@ -465,7 +465,7 @@ mod tests {
     }
 
     impl MockSignedHeader {
-        fn new(header: MockHeader, commit: MockCommit) -> Self {
+        const fn new(header: MockHeader, commit: MockCommit) -> Self {
             Self { header, commit }
         }
     }
@@ -512,7 +512,7 @@ mod tests {
     static THRESHOLD: &MockThreshold = &MockThreshold {};
 
     // start all blockchains from here ...
-    fn init_time() -> SystemTime {
+    const fn init_time() -> SystemTime {
         SystemTime::UNIX_EPOCH
     }
 
diff --git a/tendermint/src/node/id.rs b/tendermint/src/node/id.rs
index 842bea58c..55a33cad5 100644
--- a/tendermint/src/node/id.rs
+++ b/tendermint/src/node/id.rs
@@ -21,7 +21,7 @@ pub struct Id([u8; LENGTH]);
 
 impl Id {
     /// Create a new Node ID from raw bytes
-    pub fn new(bytes: [u8; LENGTH]) -> Self {
+    pub const fn new(bytes: [u8; LENGTH]) -> Self {
         Self(bytes)
     }
 
diff --git a/tendermint/src/node/info.rs b/tendermint/src/node/info.rs
index 575271f3e..1f1d233e0 100644
--- a/tendermint/src/node/info.rs
+++ b/tendermint/src/node/info.rs
@@ -63,7 +63,7 @@ pub struct ListenAddress(String);
 
 impl ListenAddress {
     /// Construct `ListenAddress`
-    pub fn new(s: String) -> Self {
+    pub const fn new(s: String) -> Self {
         Self(s)
     }
 
diff --git a/tendermint/src/rpc/endpoint/block.rs b/tendermint/src/rpc/endpoint/block.rs
index 34aa0f571..601f4343b 100644
--- a/tendermint/src/rpc/endpoint/block.rs
+++ b/tendermint/src/rpc/endpoint/block.rs
@@ -17,7 +17,7 @@ pub struct Request {
 
 impl Request {
     /// Create a new request for information about a particular block
-    pub fn new(height: block::Height) -> Self {
+    pub const fn new(height: block::Height) -> Self {
         Self {
             height: Some(height),
         }
diff --git a/tendermint/src/rpc/endpoint/blockchain.rs b/tendermint/src/rpc/endpoint/blockchain.rs
index 1d88b0f04..59c8ba51b 100644
--- a/tendermint/src/rpc/endpoint/blockchain.rs
+++ b/tendermint/src/rpc/endpoint/blockchain.rs
@@ -18,7 +18,7 @@ pub struct Request {
 
 impl Request {
     /// Request information about a sequence of blocks
-    pub fn new(min_height: block::Height, max_height: block::Height) -> Self {
+    pub const fn new(min_height: block::Height, max_height: block::Height) -> Self {
         Self {
             min_height,
             max_height,
diff --git a/tendermint/src/rpc/endpoint/broadcast/tx_async.rs b/tendermint/src/rpc/endpoint/broadcast/tx_async.rs
index e2585e70a..c1a5af74f 100644
--- a/tendermint/src/rpc/endpoint/broadcast/tx_async.rs
+++ b/tendermint/src/rpc/endpoint/broadcast/tx_async.rs
@@ -15,7 +15,7 @@ pub struct Request {
 
 impl Request {
     /// Create a new async transaction broadcast RPC request
-    pub fn new(tx: Transaction) -> Self {
+    pub const fn new(tx: Transaction) -> Self {
         Self { tx }
     }
 }
diff --git a/tendermint/src/rpc/endpoint/broadcast/tx_commit.rs b/tendermint/src/rpc/endpoint/broadcast/tx_commit.rs
index e68d4cfde..e6643d424 100644
--- a/tendermint/src/rpc/endpoint/broadcast/tx_commit.rs
+++ b/tendermint/src/rpc/endpoint/broadcast/tx_commit.rs
@@ -20,7 +20,7 @@ pub struct Request {
 
 impl Request {
     /// Create a new commit transaction broadcast RPC request
-    pub fn new(tx: Transaction) -> Self {
+    pub const fn new(tx: Transaction) -> Self {
         Self { tx }
     }
 }
diff --git a/tendermint/src/rpc/endpoint/broadcast/tx_sync.rs b/tendermint/src/rpc/endpoint/broadcast/tx_sync.rs
index e1d35c4bc..95afa9a68 100644
--- a/tendermint/src/rpc/endpoint/broadcast/tx_sync.rs
+++ b/tendermint/src/rpc/endpoint/broadcast/tx_sync.rs
@@ -15,7 +15,7 @@ pub struct Request {
 
 impl Request {
     /// Create a new sync transaction broadcast RPC request
-    pub fn new(tx: Transaction) -> Self {
+    pub const fn new(tx: Transaction) -> Self {
         Self { tx }
     }
 }
diff --git a/tendermint/src/rpc/endpoint/validators.rs b/tendermint/src/rpc/endpoint/validators.rs
index 04cbc422f..39103b276 100644
--- a/tendermint/src/rpc/endpoint/validators.rs
+++ b/tendermint/src/rpc/endpoint/validators.rs
@@ -11,7 +11,7 @@ pub struct Request {
 
 impl Request {
     /// List validators for a specific block
-    pub fn new(height: block::Height) -> Self {
+    pub const fn new(height: block::Height) -> Self {
         Self { height }
     }
 }
diff --git a/tendermint/src/rpc/error.rs b/tendermint/src/rpc/error.rs
index 74ed7b8c8..6657ee74a 100644
--- a/tendermint/src/rpc/error.rs
+++ b/tendermint/src/rpc/error.rs
@@ -65,7 +65,7 @@ impl Error {
     }
 
     /// Obtain the `rpc::error::Code` for this error
-    pub fn code(&self) -> Code {
+    pub const fn code(&self) -> Code {
         self.code
     }
 
diff --git a/tendermint/src/signature.rs b/tendermint/src/signature.rs
index b767a1cfa..6f5fd394c 100644
--- a/tendermint/src/signature.rs
+++ b/tendermint/src/signature.rs
@@ -12,6 +12,7 @@ pub enum Signature {
 }
 
 impl Signature {
+    #[allow(clippy::missing_const_for_fn)]
     /// Return the algorithm used to create this particular signature
     pub fn algorithm(self) -> Algorithm {
         match self {
diff --git a/tendermint/src/validator.rs b/tendermint/src/validator.rs
index 0537f8420..d2238ef16 100644
--- a/tendermint/src/validator.rs
+++ b/tendermint/src/validator.rs
@@ -105,7 +105,7 @@ impl Info {
     }
 
     /// Return the voting power of the validator.
-    pub fn power(&self) -> u64 {
+    pub const fn power(&self) -> u64 {
         self.voting_power.value()
     }
 
@@ -160,7 +160,7 @@ pub struct ProposerPriority(i64);
 
 impl ProposerPriority {
     /// Get the current voting power
-    pub fn value(self) -> i64 {
+    pub const fn value(self) -> i64 {
         self.0
     }
 }
diff --git a/tendermint/src/vote.rs b/tendermint/src/vote.rs
index ab5d49aca..52ce2087d 100644
--- a/tendermint/src/vote.rs
+++ b/tendermint/src/vote.rs
@@ -94,7 +94,7 @@ impl Signed {
     }
 
     /// Return the id of the validator that signed this vote.
-    pub fn validator_id(&self) -> account::Id {
+    pub const fn validator_id(&self) -> account::Id {
         self.validator_address
     }
 
@@ -131,12 +131,12 @@ impl Type {
     }
 
     /// Serialize this type as a byte
-    pub fn to_u8(self) -> u8 {
+    pub const fn to_u8(self) -> u8 {
         self as u8
     }
 
     /// Serialize this type as a 32-bit unsigned integer
-    pub fn to_u32(self) -> u32 {
+    pub const fn to_u32(self) -> u32 {
         self as u32
     }
 }
diff --git a/tendermint/src/vote/power.rs b/tendermint/src/vote/power.rs
index ef88fa178..b4c30046c 100644
--- a/tendermint/src/vote/power.rs
+++ b/tendermint/src/vote/power.rs
@@ -8,17 +8,17 @@ pub struct Power(u64);
 
 impl Power {
     /// Create a new Power
-    pub fn new(p: u64) -> Self {
+    pub const fn new(p: u64) -> Self {
         Self(p)
     }
 
     /// Get the current voting power
-    pub fn value(self) -> u64 {
+    pub const fn value(self) -> u64 {
         self.0
     }
 
     /// Is the current voting power zero?
-    pub fn is_zero(self) -> bool {
+    pub const fn is_zero(self) -> bool {
         self.0 == 0
     }
 }

From 37078c42348536b5bc40137c9fe827fffcb52ea9 Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Sun, 5 Jan 2020 14:41:01 +0100
Subject: [PATCH 26/55] Unify matches with equal arm bodies

---
 tendermint/src/lib.rs        | 2 +-
 tendermint/src/public_key.rs | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/tendermint/src/lib.rs b/tendermint/src/lib.rs
index 35ce6f70f..9dded206f 100644
--- a/tendermint/src/lib.rs
+++ b/tendermint/src/lib.rs
@@ -21,7 +21,7 @@
 )]
 #![allow(clippy::result_unwrap_used)]
 #![allow(clippy::implicit_return, clippy::multiple_crate_versions)]
-#![deny(clippy::missing_const_for_fn)]
+#![deny(clippy::match_same_arms)]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/tendermint/kms/master/img/tendermint.png",
     html_root_url = "https://docs.rs/tendermint/0.11.0"
diff --git a/tendermint/src/public_key.rs b/tendermint/src/public_key.rs
index bce642b2c..a31219a7b 100644
--- a/tendermint/src/public_key.rs
+++ b/tendermint/src/public_key.rs
@@ -136,8 +136,7 @@ impl Deref for TendermintKey {
 
     fn deref(&self) -> &PublicKey {
         match self {
-            Self::AccountKey(key) => key,
-            Self::ConsensusKey(key) => key,
+            Self::AccountKey(key) | Self::ConsensusKey(key) => key,
         }
     }
 }

From 834263cd8fa96339c0203a3fe56d36340871072b Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Sun, 5 Jan 2020 16:51:35 +0100
Subject: [PATCH 27/55] Remove unecessary closures

---
 tendermint/src/amino_types/vote.rs | 2 +-
 tendermint/src/lib.rs              | 2 +-
 tendermint/src/validator.rs        | 8 ++------
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/tendermint/src/amino_types/vote.rs b/tendermint/src/amino_types/vote.rs
index a643e4c8b..5daadae7b 100644
--- a/tendermint/src/amino_types/vote.rs
+++ b/tendermint/src/amino_types/vote.rs
@@ -204,7 +204,7 @@ impl SignableMsg for SignVoteRequest {
         self.vote.as_ref().map(|vote| vote.height)
     }
     fn msg_type(&self) -> Option<SignedMsgType> {
-        self.vote.as_ref().and_then(|vote| vote.msg_type())
+        self.vote.as_ref().and_then(Vote::msg_type)
     }
 }
 
diff --git a/tendermint/src/lib.rs b/tendermint/src/lib.rs
index 9dded206f..fe93b4015 100644
--- a/tendermint/src/lib.rs
+++ b/tendermint/src/lib.rs
@@ -21,7 +21,7 @@
 )]
 #![allow(clippy::result_unwrap_used)]
 #![allow(clippy::implicit_return, clippy::multiple_crate_versions)]
-#![deny(clippy::match_same_arms)]
+#![deny(clippy::redundant_closure_for_method_calls)]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/tendermint/kms/master/img/tendermint.png",
     html_root_url = "https://docs.rs/tendermint/0.11.0"
diff --git a/tendermint/src/validator.rs b/tendermint/src/validator.rs
index d2238ef16..6546898cb 100644
--- a/tendermint/src/validator.rs
+++ b/tendermint/src/validator.rs
@@ -37,11 +37,7 @@ impl Set {
 impl lite::ValidatorSet for Set {
     /// Compute the Merkle root of the validator set
     fn hash(&self) -> Hash {
-        let validator_bytes: Vec<Vec<u8>> = self
-            .validators
-            .iter()
-            .map(|validator| validator.hash_bytes())
-            .collect();
+        let validator_bytes: Vec<Vec<u8>> = self.validators.iter().map(Info::hash_bytes).collect();
         Hash::Sha256(merkle::simple_hash_from_byte_vectors(validator_bytes))
     }
 
@@ -66,7 +62,7 @@ fn parse_vals<'de, D>(d: D) -> Result<Vec<Info>, D::Error>
 where
     D: Deserializer<'de>,
 {
-    Deserialize::deserialize(d).map(|x: Option<_>| x.unwrap_or_default())
+    Deserialize::deserialize(d).map(Option::unwrap_or_default)
 }
 
 /// Validator information

From 9b9e875c8baaf4d9004a5351901d7f971066ed86 Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Sun, 5 Jan 2020 17:13:42 +0100
Subject: [PATCH 28/55] Remove possible truncation

---
 tendermint/src/abci/code.rs | 10 +++++++++-
 tendermint/src/lib.rs       |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/tendermint/src/abci/code.rs b/tendermint/src/abci/code.rs
index d63b9c511..3f0991f56 100644
--- a/tendermint/src/abci/code.rs
+++ b/tendermint/src/abci/code.rs
@@ -1,5 +1,6 @@
 use serde::de::{Deserialize, Deserializer, Visitor};
 use serde::{Serialize, Serializer};
+use std::convert::TryFrom;
 use std::fmt;
 
 /// ABCI application response codes.
@@ -53,6 +54,13 @@ impl From<u32> for Code {
     }
 }
 
+impl From<u64> for Code {
+    fn from(value: u64) -> Self {
+        let code = u32::try_from(value).expect("code out of range");
+        Code::from(code)
+    }
+}
+
 impl From<Code> for u32 {
     fn from(code: Code) -> Self {
         match code {
@@ -86,7 +94,7 @@ impl<'de> Deserialize<'de> for Code {
             where
                 E: serde::de::Error,
             {
-                Ok(Code::from(val as u32))
+                Ok(Code::from(val))
             }
 
             fn visit_str<E>(self, val: &str) -> Result<Self::Value, E>
diff --git a/tendermint/src/lib.rs b/tendermint/src/lib.rs
index fe93b4015..76e6478c0 100644
--- a/tendermint/src/lib.rs
+++ b/tendermint/src/lib.rs
@@ -21,7 +21,7 @@
 )]
 #![allow(clippy::result_unwrap_used)]
 #![allow(clippy::implicit_return, clippy::multiple_crate_versions)]
-#![deny(clippy::redundant_closure_for_method_calls)]
+#![deny(clippy::cast_possible_truncation)]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/tendermint/kms/master/img/tendermint.png",
     html_root_url = "https://docs.rs/tendermint/0.11.0"

From 85100a368f6bfddbccb300a6ada47b7ef553b966 Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Sun, 5 Jan 2020 17:13:42 +0100
Subject: [PATCH 29/55] Remove possible truncation

---
 tendermint/src/abci/code.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tendermint/src/abci/code.rs b/tendermint/src/abci/code.rs
index 3f0991f56..5a6ddd859 100644
--- a/tendermint/src/abci/code.rs
+++ b/tendermint/src/abci/code.rs
@@ -57,7 +57,7 @@ impl From<u32> for Code {
 impl From<u64> for Code {
     fn from(value: u64) -> Self {
         let code = u32::try_from(value).expect("code out of range");
-        Code::from(code)
+        Self::from(code)
     }
 }
 

From 71f0cd3cb80f7eeaf3e206f4054b8911ef854b38 Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Sun, 5 Jan 2020 17:30:49 +0100
Subject: [PATCH 30/55] Allow fallible from impls for now and leave todos

---
 tendermint/src/amino_types/ed25519.rs | 2 ++
 tendermint/src/amino_types/time.rs    | 2 ++
 tendermint/src/chain/id.rs            | 2 ++
 tendermint/src/lib.rs                 | 2 +-
 tendermint/src/private_key.rs         | 2 ++
 tendermint/src/time.rs                | 2 ++
 6 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/tendermint/src/amino_types/ed25519.rs b/tendermint/src/amino_types/ed25519.rs
index 7c393ae90..7fc347b93 100644
--- a/tendermint/src/amino_types/ed25519.rs
+++ b/tendermint/src/amino_types/ed25519.rs
@@ -30,6 +30,8 @@ impl From<PubKeyResponse> for PublicKey {
     }
 }
 
+// TODO(xla): Either complete implementation or convert to TryFrom.
+#[allow(clippy::fallible_impl_from)]
 impl From<PublicKey> for PubKeyResponse {
     fn from(public_key: PublicKey) -> Self {
         match public_key {
diff --git a/tendermint/src/amino_types/time.rs b/tendermint/src/amino_types/time.rs
index edbae7f1d..e15cadc64 100644
--- a/tendermint/src/amino_types/time.rs
+++ b/tendermint/src/amino_types/time.rs
@@ -24,6 +24,8 @@ impl ParseTimestamp for Msg {
     }
 }
 
+// TODO(xla): Convert to TryFrom.
+#[allow(clippy::fallible_impl_from)]
 impl From<Time> for Msg {
     fn from(ts: Time) -> Self {
         // TODO: non-panicking method for getting this?
diff --git a/tendermint/src/chain/id.rs b/tendermint/src/chain/id.rs
index a7ff2bc86..01dd54845 100644
--- a/tendermint/src/chain/id.rs
+++ b/tendermint/src/chain/id.rs
@@ -55,6 +55,8 @@ impl Display for Id {
     }
 }
 
+// TODO(xla): Convert to TryFrom.
+#[allow(clippy::fallible_impl_from)]
 impl<'a> From<&'a str> for Id {
     fn from(s: &str) -> Self {
         Self::from_str(s).unwrap()
diff --git a/tendermint/src/lib.rs b/tendermint/src/lib.rs
index 76e6478c0..836e37813 100644
--- a/tendermint/src/lib.rs
+++ b/tendermint/src/lib.rs
@@ -21,7 +21,7 @@
 )]
 #![allow(clippy::result_unwrap_used)]
 #![allow(clippy::implicit_return, clippy::multiple_crate_versions)]
-#![deny(clippy::cast_possible_truncation)]
+#![deny(clippy::fallible_impl_from)]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/tendermint/kms/master/img/tendermint.png",
     html_root_url = "https://docs.rs/tendermint/0.11.0"
diff --git a/tendermint/src/private_key.rs b/tendermint/src/private_key.rs
index 48f2b8612..4181268cc 100644
--- a/tendermint/src/private_key.rs
+++ b/tendermint/src/private_key.rs
@@ -63,6 +63,8 @@ impl Ed25519Keypair {
     }
 }
 
+// TODO(xla): Conver to TryFrom.
+#[allow(clippy::fallible_impl_from)]
 impl<'a> From<&'a Ed25519Keypair> for ed25519::Seed {
     fn from(keypair: &'a Ed25519Keypair) -> Self {
         Self::from_keypair(&keypair.0[..]).unwrap()
diff --git a/tendermint/src/time.rs b/tendermint/src/time.rs
index 8d39c4f9d..571284403 100644
--- a/tendermint/src/time.rs
+++ b/tendermint/src/time.rs
@@ -83,6 +83,8 @@ impl From<SystemTime> for Time {
     }
 }
 
+// TODO(xla): Convert to TryFrom.
+#[allow(clippy::fallible_impl_from)]
 impl From<Time> for SystemTime {
     fn from(t: Time) -> Self {
         t.to_system_time().unwrap()

From d3651c45125cf13df53ab6a75d95a084db4ff81e Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Sun, 5 Jan 2020 17:39:59 +0100
Subject: [PATCH 31/55] Replace enum glob use with proper qualified variants

---
 tendermint/src/amino_types/block_id.rs |  8 ++++----
 tendermint/src/amino_types/proposal.rs | 12 ++++++------
 tendermint/src/amino_types/vote.rs     | 14 +++++++-------
 tendermint/src/lib.rs                  |  2 +-
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/tendermint/src/amino_types/block_id.rs b/tendermint/src/amino_types/block_id.rs
index 2a1181cc7..673e40c3b 100644
--- a/tendermint/src/amino_types/block_id.rs
+++ b/tendermint/src/amino_types/block_id.rs
@@ -1,4 +1,4 @@
-use super::validate::{ConsensusMessage, ValidationError, ValidationErrorKind::*};
+use super::validate::{ConsensusMessage, ValidationError, ValidationErrorKind};
 use crate::block::parts;
 use crate::{
     block,
@@ -46,7 +46,7 @@ impl ConsensusMessage for BlockId {
     fn validate_basic(&self) -> Result<(), ValidationError> {
         // Hash can be empty in case of POLBlockID in Proposal.
         if !self.hash.is_empty() && self.hash.len() != SHA256_HASH_SIZE {
-            return Err(InvalidHashSize.into());
+            return Err(ValidationErrorKind::InvalidHashSize.into());
         }
         self.parts_header
             .as_ref()
@@ -102,11 +102,11 @@ impl From<&parts::Header> for PartsSetHeader {
 impl ConsensusMessage for PartsSetHeader {
     fn validate_basic(&self) -> Result<(), ValidationError> {
         if self.total < 0 {
-            return Err(NegativeTotal.into());
+            return Err(ValidationErrorKind::NegativeTotal.into());
         }
         // Hash can be empty in case of POLBlockID.PartsHeader in Proposal.
         if !self.hash.is_empty() && self.hash.len() != SHA256_HASH_SIZE {
-            return Err(InvalidHashSize.into());
+            return Err(ValidationErrorKind::InvalidHashSize.into());
         }
         Ok(())
     }
diff --git a/tendermint/src/amino_types/proposal.rs b/tendermint/src/amino_types/proposal.rs
index 533444179..8f407ce97 100644
--- a/tendermint/src/amino_types/proposal.rs
+++ b/tendermint/src/amino_types/proposal.rs
@@ -1,7 +1,7 @@
 use super::{
     remote_error::RemoteError,
     signature::{SignableMsg, SignedMsgType},
-    validate::{ConsensusMessage, ValidationError, ValidationErrorKind::*},
+    validate::{ConsensusMessage, ValidationError, ValidationErrorKind},
     BlockId, CanonicalBlockId, CanonicalPartSetHeader, TimeMsg,
 };
 use crate::{
@@ -131,7 +131,7 @@ impl SignableMsg for SignProposalRequest {
     fn validate(&self) -> Result<(), ValidationError> {
         match self.proposal {
             Some(ref p) => p.validate_basic(),
-            None => Err(MissingConsensusMessage.into()),
+            None => Err(ValidationErrorKind::MissingConsensusMessage.into()),
         }
     }
     fn consensus_state(&self) -> Option<consensus::State> {
@@ -169,16 +169,16 @@ impl SignableMsg for SignProposalRequest {
 impl ConsensusMessage for Proposal {
     fn validate_basic(&self) -> Result<(), ValidationError> {
         if self.msg_type != SignedMsgType::Proposal.to_u32() {
-            return Err(InvalidMessageType.into());
+            return Err(ValidationErrorKind::InvalidMessageType.into());
         }
         if self.height < 0 {
-            return Err(NegativeHeight.into());
+            return Err(ValidationErrorKind::NegativeHeight.into());
         }
         if self.round < 0 {
-            return Err(NegativeRound.into());
+            return Err(ValidationErrorKind::NegativeRound.into());
         }
         if self.pol_round < -1 {
-            return Err(NegativePOLRound.into());
+            return Err(ValidationErrorKind::NegativePOLRound.into());
         }
         // TODO validate proposal's block_id
 
diff --git a/tendermint/src/amino_types/vote.rs b/tendermint/src/amino_types/vote.rs
index 5daadae7b..7729adcec 100644
--- a/tendermint/src/amino_types/vote.rs
+++ b/tendermint/src/amino_types/vote.rs
@@ -1,7 +1,7 @@
 use super::{
     remote_error::RemoteError,
     signature::SignableMsg,
-    validate::{ConsensusMessage, ValidationError, ValidationErrorKind::*},
+    validate::{ConsensusMessage, ValidationError, ValidationErrorKind},
     BlockId, CanonicalBlockId, CanonicalPartSetHeader, SignedMsgType, TimeMsg,
 };
 use crate::amino_types::PartsSetHeader;
@@ -175,7 +175,7 @@ impl SignableMsg for SignVoteRequest {
     fn validate(&self) -> Result<(), ValidationError> {
         match self.vote {
             Some(ref v) => v.validate_basic(),
-            None => Err(MissingConsensusMessage.into()),
+            None => Err(ValidationErrorKind::MissingConsensusMessage.into()),
         }
     }
     fn consensus_state(&self) -> Option<consensus::State> {
@@ -211,19 +211,19 @@ impl SignableMsg for SignVoteRequest {
 impl ConsensusMessage for Vote {
     fn validate_basic(&self) -> Result<(), ValidationError> {
         if self.msg_type().is_none() {
-            return Err(InvalidMessageType.into());
+            return Err(ValidationErrorKind::InvalidMessageType.into());
         }
         if self.height < 0 {
-            return Err(NegativeHeight.into());
+            return Err(ValidationErrorKind::NegativeHeight.into());
         }
         if self.round < 0 {
-            return Err(NegativeRound.into());
+            return Err(ValidationErrorKind::NegativeRound.into());
         }
         if self.validator_index < 0 {
-            return Err(NegativeValidatorIndex.into());
+            return Err(ValidationErrorKind::NegativeValidatorIndex.into());
         }
         if self.validator_address.len() != VALIDATOR_ADDR_SIZE {
-            return Err(InvalidValidatorAddressSize.into());
+            return Err(ValidationErrorKind::InvalidValidatorAddressSize.into());
         }
 
         self.block_id
diff --git a/tendermint/src/lib.rs b/tendermint/src/lib.rs
index 836e37813..a323f2b3b 100644
--- a/tendermint/src/lib.rs
+++ b/tendermint/src/lib.rs
@@ -21,7 +21,7 @@
 )]
 #![allow(clippy::result_unwrap_used)]
 #![allow(clippy::implicit_return, clippy::multiple_crate_versions)]
-#![deny(clippy::fallible_impl_from)]
+#![deny(clippy::enum_glob_use)]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/tendermint/kms/master/img/tendermint.png",
     html_root_url = "https://docs.rs/tendermint/0.11.0"

From da3a7c952963109b87a2bfb4381a9db92c1800bc Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Sun, 5 Jan 2020 17:46:50 +0100
Subject: [PATCH 32/55] Allow integer arithmetic

---
 tendermint/src/lib.rs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tendermint/src/lib.rs b/tendermint/src/lib.rs
index a323f2b3b..7dd2b24d6 100644
--- a/tendermint/src/lib.rs
+++ b/tendermint/src/lib.rs
@@ -20,8 +20,11 @@
     clippy::restriction
 )]
 #![allow(clippy::result_unwrap_used)]
-#![allow(clippy::implicit_return, clippy::multiple_crate_versions)]
-#![deny(clippy::enum_glob_use)]
+#![allow(
+    clippy::implicit_return,
+    clippy::integer_arithmetic,
+    clippy::multiple_crate_versions
+)]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/tendermint/kms/master/img/tendermint.png",
     html_root_url = "https://docs.rs/tendermint/0.11.0"

From 749c67921ed833d27d8c278bf142dc6171e4c42c Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Sun, 5 Jan 2020 18:02:44 +0100
Subject: [PATCH 33/55] Use proper division methoods on ints

---
 tendermint/src/lib.rs           | 1 +
 tendermint/src/lite/verifier.rs | 2 +-
 tendermint/src/merkle.rs        | 8 +++++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/tendermint/src/lib.rs b/tendermint/src/lib.rs
index 7dd2b24d6..b13e2886f 100644
--- a/tendermint/src/lib.rs
+++ b/tendermint/src/lib.rs
@@ -25,6 +25,7 @@
     clippy::integer_arithmetic,
     clippy::multiple_crate_versions
 )]
+#![deny(clippy::integer_division)]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/tendermint/kms/master/img/tendermint.png",
     html_root_url = "https://docs.rs/tendermint/0.11.0"
diff --git a/tendermint/src/lite/verifier.rs b/tendermint/src/lite/verifier.rs
index f9daade5b..d01de0fb2 100644
--- a/tendermint/src/lite/verifier.rs
+++ b/tendermint/src/lite/verifier.rs
@@ -323,7 +323,7 @@ where
 
     // Get the pivot height for bisection.
     let trusted_height = trusted_sh.header().height().value();
-    let pivot_height = Height::from((trusted_height + untrusted_height.value()) / 2);
+    let pivot_height = Height::from((trusted_height + untrusted_height.value()).wrapping_div(2));
 
     // Recursive call to update to the pivot height.
     // When this completes, we will either return an error or
diff --git a/tendermint/src/merkle.rs b/tendermint/src/merkle.rs
index c3452baaf..e74d27825 100644
--- a/tendermint/src/merkle.rs
+++ b/tendermint/src/merkle.rs
@@ -36,7 +36,13 @@ fn get_split_point(length: usize) -> usize {
         0 => panic!("tree is empty!"),
         1 => panic!("tree has only one element!"),
         2 => 1,
-        _ => length.next_power_of_two() / 2,
+        _ => {
+            let (div, overflow) = length.next_power_of_two().overflowing_div(2);
+            if overflow {
+                panic!("division result overflow");
+            }
+            div
+        }
     }
 }
 

From c4d4c5617acd8ef17ae85fed00341647dbfc4c21 Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Sun, 5 Jan 2020 18:13:30 +0100
Subject: [PATCH 34/55] Allow index slicing

---
 tendermint/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tendermint/src/lib.rs b/tendermint/src/lib.rs
index b13e2886f..18ddf05d0 100644
--- a/tendermint/src/lib.rs
+++ b/tendermint/src/lib.rs
@@ -22,10 +22,10 @@
 #![allow(clippy::result_unwrap_used)]
 #![allow(
     clippy::implicit_return,
+    clippy::index_slicing,
     clippy::integer_arithmetic,
     clippy::multiple_crate_versions
 )]
-#![deny(clippy::integer_division)]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/tendermint/kms/master/img/tendermint.png",
     html_root_url = "https://docs.rs/tendermint/0.11.0"

From 21b2a8f551d7962c9403ccfe50b14a132451203f Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Sun, 5 Jan 2020 18:13:30 +0100
Subject: [PATCH 35/55] Allow index slicing

---
 tendermint/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tendermint/src/lib.rs b/tendermint/src/lib.rs
index 18ddf05d0..871ab9452 100644
--- a/tendermint/src/lib.rs
+++ b/tendermint/src/lib.rs
@@ -22,7 +22,7 @@
 #![allow(clippy::result_unwrap_used)]
 #![allow(
     clippy::implicit_return,
-    clippy::index_slicing,
+    clippy::indexing_slicing,
     clippy::integer_arithmetic,
     clippy::multiple_crate_versions
 )]

From 15e37cab33ad98d036bbf83a0ab9a7eb3a370124 Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Sun, 5 Jan 2020 18:27:56 +0100
Subject: [PATCH 36/55] Alllow default_trait_access mostly for defive

---
 tendermint/src/chain/info.rs | 2 +-
 tendermint/src/lib.rs        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tendermint/src/chain/info.rs b/tendermint/src/chain/info.rs
index 9e44f0480..bd16d0a08 100644
--- a/tendermint/src/chain/info.rs
+++ b/tendermint/src/chain/info.rs
@@ -24,7 +24,7 @@ impl Info {
     {
         Self {
             id: id.into(),
-            height: Default::default(),
+            height: block::Height::default(),
             last_block_id: None,
             time: None,
         }
diff --git a/tendermint/src/lib.rs b/tendermint/src/lib.rs
index 871ab9452..b68f3aba9 100644
--- a/tendermint/src/lib.rs
+++ b/tendermint/src/lib.rs
@@ -21,6 +21,7 @@
 )]
 #![allow(clippy::result_unwrap_used)]
 #![allow(
+    clippy::default_trait_access,
     clippy::implicit_return,
     clippy::indexing_slicing,
     clippy::integer_arithmetic,

From 1144a4ff8005e88e6b1eabb7a0f9c4f22f8f54f2 Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Tue, 7 Jan 2020 09:00:59 +0100
Subject: [PATCH 37/55] Allow sign loss for cast

---
 tendermint/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tendermint/src/lib.rs b/tendermint/src/lib.rs
index b68f3aba9..a89bd5c71 100644
--- a/tendermint/src/lib.rs
+++ b/tendermint/src/lib.rs
@@ -19,8 +19,8 @@
     clippy::pedantic,
     clippy::restriction
 )]
-#![allow(clippy::result_unwrap_used)]
 #![allow(
+    clippy::cast_sign_loss,
     clippy::default_trait_access,
     clippy::implicit_return,
     clippy::indexing_slicing,

From d7ef18abbead851012a606efd078359346f2afb6 Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Tue, 7 Jan 2020 09:39:47 +0100
Subject: [PATCH 38/55] Address wildcard enum matches

---
 tendermint/src/lib.rs        | 1 +
 tendermint/src/net.rs        | 2 +-
 tendermint/src/public_key.rs | 6 +++---
 tendermint/src/timeout.rs    | 1 +
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/tendermint/src/lib.rs b/tendermint/src/lib.rs
index a89bd5c71..7ea48b1b5 100644
--- a/tendermint/src/lib.rs
+++ b/tendermint/src/lib.rs
@@ -27,6 +27,7 @@
     clippy::integer_arithmetic,
     clippy::multiple_crate_versions
 )]
+#![deny(clippy::wildcard_enum_match_arm)]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/tendermint/kms/master/img/tendermint.png",
     html_root_url = "https://docs.rs/tendermint/0.11.0"
diff --git a/tendermint/src/net.rs b/tendermint/src/net.rs
index c91136850..f8779af47 100644
--- a/tendermint/src/net.rs
+++ b/tendermint/src/net.rs
@@ -161,7 +161,7 @@ mod tests {
                     assert_eq!(host, "35.192.61.41");
                     assert_eq!(port, 26656);
                 }
-                other => panic!("unexpected address type: {:?}", other),
+                other @ Address::Unix { .. } => panic!("unexpected address type: {:?}", other),
             }
         }
     }
diff --git a/tendermint/src/public_key.rs b/tendermint/src/public_key.rs
index a31219a7b..a1bee5853 100644
--- a/tendermint/src/public_key.rs
+++ b/tendermint/src/public_key.rs
@@ -48,7 +48,7 @@ impl PublicKey {
     pub fn ed25519(self) -> Option<ed25519::PublicKey> {
         match self {
             Self::Ed25519(pk) => Some(pk),
-            _ => None,
+            Self::Secp256k1(_pk) => None,
         }
     }
 
@@ -122,8 +122,8 @@ impl TendermintKey {
     /// Create a new consensus key from a `PublicKey`
     pub fn new_consensus_key(public_key: PublicKey) -> Result<Self, Error> {
         match public_key {
-            PublicKey::Ed25519(_) => Ok(Self::AccountKey(public_key)),
-            _ => Err(err!(
+            PublicKey::Ed25519(_pk) => Ok(Self::AccountKey(public_key)),
+            PublicKey::Secp256k1(_pk) => Err(err!(
                 ErrorKind::InvalidKey,
                 "only ed25519 consensus keys are supported"
             )),
diff --git a/tendermint/src/timeout.rs b/tendermint/src/timeout.rs
index 253fcef65..72d32f037 100644
--- a/tendermint/src/timeout.rs
+++ b/tendermint/src/timeout.rs
@@ -35,6 +35,7 @@ impl FromStr for Timeout {
             return Err(err!(ErrorKind::Parse, "invalid units"));
         }
 
+        #[allow(clippy::wildcard_enum_match_arm)]
         let units = match s.chars().nth(s.len() - 2) {
             Some('m') => "ms",
             Some('0'..='9') => "s",

From 85e57aa943aeeaf795b9c6b9264462b970f7bdfe Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Tue, 7 Jan 2020 10:30:02 +0100
Subject: [PATCH 39/55] Avoid warning for inline attribute

---
 tendermint/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tendermint/src/lib.rs b/tendermint/src/lib.rs
index 7ea48b1b5..5320fe723 100644
--- a/tendermint/src/lib.rs
+++ b/tendermint/src/lib.rs
@@ -25,9 +25,9 @@
     clippy::implicit_return,
     clippy::indexing_slicing,
     clippy::integer_arithmetic,
+    clippy::missing_inline_in_public_items,
     clippy::multiple_crate_versions
 )]
-#![deny(clippy::wildcard_enum_match_arm)]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/tendermint/kms/master/img/tendermint.png",
     html_root_url = "https://docs.rs/tendermint/0.11.0"

From d53540f01f80dc120de783e37c2fe64d5d19927c Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Tue, 7 Jan 2020 10:42:15 +0100
Subject: [PATCH 40/55] Ignore must use lint as it is only a recommendation

---
 tendermint/src/lib.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tendermint/src/lib.rs b/tendermint/src/lib.rs
index 5320fe723..4d0dad4d7 100644
--- a/tendermint/src/lib.rs
+++ b/tendermint/src/lib.rs
@@ -26,7 +26,8 @@
     clippy::indexing_slicing,
     clippy::integer_arithmetic,
     clippy::missing_inline_in_public_items,
-    clippy::multiple_crate_versions
+    clippy::multiple_crate_versions,
+    clippy::must_use_candidate
 )]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/tendermint/kms/master/img/tendermint.png",

From ab338d7829547ebe7271bd4837560d14225150b6 Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Tue, 7 Jan 2020 12:36:31 +0100
Subject: [PATCH 41/55] Address missing docs

---
 tendermint/src/abci.rs                    |  2 ++
 tendermint/src/abci/code.rs               |  4 ++++
 tendermint/src/abci/data.rs               |  2 ++
 tendermint/src/abci/gas.rs                |  2 +-
 tendermint/src/abci/info.rs               |  4 ++++
 tendermint/src/abci/log.rs                |  2 ++
 tendermint/src/amino_types.rs             |  2 ++
 tendermint/src/block.rs                   |  4 ++++
 tendermint/src/block/height.rs            |  2 ++
 tendermint/src/block/id.rs                |  2 ++
 tendermint/src/chain/info.rs              |  2 ++
 tendermint/src/channel/id.rs              |  2 ++
 tendermint/src/evidence.rs                |  1 +
 tendermint/src/lib.rs                     |  5 +++--
 tendermint/src/lite.rs                    |  4 ++++
 tendermint/src/merkle.rs                  |  8 ++++----
 tendermint/src/public_key.rs              |  6 ++++--
 tendermint/src/rpc/endpoint/commit.rs     |  1 +
 tendermint/src/rpc/endpoint/validators.rs |  3 ++-
 tendermint/src/serializers.rs             |  9 +++++++++
 tendermint/src/timeout.rs                 |  2 ++
 tendermint/src/validator.rs               | 12 ++++++++----
 tendermint/src/version.rs                 |  2 ++
 tendermint/src/vote.rs                    |  3 +++
 24 files changed, 72 insertions(+), 14 deletions(-)

diff --git a/tendermint/src/abci.rs b/tendermint/src/abci.rs
index 1beb9f119..56ca1af57 100644
--- a/tendermint/src/abci.rs
+++ b/tendermint/src/abci.rs
@@ -7,6 +7,8 @@
 //!
 //! <https://github.com/tendermint/rust-abci>
 
+#![allow(clippy::missing_docs_in_private_items)]
+
 mod code;
 mod data;
 mod gas;
diff --git a/tendermint/src/abci/code.rs b/tendermint/src/abci/code.rs
index 5a6ddd859..510ac16c1 100644
--- a/tendermint/src/abci/code.rs
+++ b/tendermint/src/abci/code.rs
@@ -1,3 +1,7 @@
+//! ABCI application response codes.
+//!
+//! <https://tendermint.com/docs/spec/abci/abci.html#errors>
+
 use serde::de::{Deserialize, Deserializer, Visitor};
 use serde::{Serialize, Serializer};
 use std::convert::TryFrom;
diff --git a/tendermint/src/abci/data.rs b/tendermint/src/abci/data.rs
index 4a77b963f..60a2bc801 100644
--- a/tendermint/src/abci/data.rs
+++ b/tendermint/src/abci/data.rs
@@ -1,3 +1,5 @@
+//! ABCI transaction data.
+
 use crate::{Error, ErrorKind};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use std::{
diff --git a/tendermint/src/abci/gas.rs b/tendermint/src/abci/gas.rs
index 06758255f..419596e0d 100644
--- a/tendermint/src/abci/gas.rs
+++ b/tendermint/src/abci/gas.rs
@@ -12,7 +12,7 @@ use std::{
     str::FromStr,
 };
 
-/// Gas: representation of transaction processing resource costs
+/// Gas representation of transaction processing resource costs.
 #[derive(Copy, Clone, Debug, Default, Eq, PartialEq, PartialOrd, Ord)]
 pub struct Gas(u64);
 
diff --git a/tendermint/src/abci/info.rs b/tendermint/src/abci/info.rs
index 48c700fc2..4426c9a30 100644
--- a/tendermint/src/abci/info.rs
+++ b/tendermint/src/abci/info.rs
@@ -1,3 +1,7 @@
+//! ABCI application state information.
+//!
+//! <https://docs.tendermint.com/master/spec/abci/abci.html#info>
+
 use serde::{Deserialize, Serialize};
 use std::fmt::{self, Display};
 
diff --git a/tendermint/src/abci/log.rs b/tendermint/src/abci/log.rs
index cfefd4010..f515add23 100644
--- a/tendermint/src/abci/log.rs
+++ b/tendermint/src/abci/log.rs
@@ -1,3 +1,5 @@
+//! ABCI Log data.
+
 use crate::{Error, ErrorKind};
 use serde::{Deserialize, Serialize};
 use std::fmt::{self, Display};
diff --git a/tendermint/src/amino_types.rs b/tendermint/src/amino_types.rs
index df39b7ecf..d43c096f3 100644
--- a/tendermint/src/amino_types.rs
+++ b/tendermint/src/amino_types.rs
@@ -1,6 +1,8 @@
 //! Message types serialized using the Amino serialization format
 //! <https://github.com/tendermint/amino_rs>
 
+// TODO(xla): Package needs extensive documentation pass, if stays around.
+#![allow(clippy::missing_docs_in_private_items)]
 #![allow(missing_docs)]
 
 mod block_id;
diff --git a/tendermint/src/block.rs b/tendermint/src/block.rs
index 64c1686a5..de0b4ff31 100644
--- a/tendermint/src/block.rs
+++ b/tendermint/src/block.rs
@@ -1,5 +1,8 @@
 //! Blocks within the chains of a Tendermint network
 
+// TODO(xla): Package needs extensive documentation pass.
+#![allow(clippy::missing_docs_in_private_items)]
+
 mod commit;
 pub mod header;
 mod height;
@@ -40,6 +43,7 @@ pub struct Block {
     pub last_commit: Option<Commit>,
 }
 
+// TODO(xla): Missing documentation.
 pub(crate) fn parse_non_empty_commit<'de, D>(deserializer: D) -> Result<Option<Commit>, D::Error>
 where
     D: Deserializer<'de>,
diff --git a/tendermint/src/block/height.rs b/tendermint/src/block/height.rs
index 3da93a18b..23985eeff 100644
--- a/tendermint/src/block/height.rs
+++ b/tendermint/src/block/height.rs
@@ -1,3 +1,5 @@
+//! Height of a Block in the Tendermint blockchain.
+
 use crate::{Error, ErrorKind};
 use serde::{de::Error as _, Deserialize, Deserializer, Serialize, Serializer};
 use std::{
diff --git a/tendermint/src/block/id.rs b/tendermint/src/block/id.rs
index fb5b6ac30..4b0c36bb3 100644
--- a/tendermint/src/block/id.rs
+++ b/tendermint/src/block/id.rs
@@ -1,3 +1,5 @@
+//! Block identifiers.
+
 use super::parts;
 use crate::{
     error::Error,
diff --git a/tendermint/src/chain/info.rs b/tendermint/src/chain/info.rs
index bd16d0a08..907554612 100644
--- a/tendermint/src/chain/info.rs
+++ b/tendermint/src/chain/info.rs
@@ -1,3 +1,5 @@
+//! Blockchain information.
+
 use crate::{block, chain, time::Time};
 
 /// Information about a particular Tendermint blockchain
diff --git a/tendermint/src/channel/id.rs b/tendermint/src/channel/id.rs
index 66a31b356..a06cbcdc6 100644
--- a/tendermint/src/channel/id.rs
+++ b/tendermint/src/channel/id.rs
@@ -1,3 +1,5 @@
+//! Channel IDs.
+
 use serde::{Deserialize, Serialize};
 
 /// Channel IDs
diff --git a/tendermint/src/evidence.rs b/tendermint/src/evidence.rs
index 688e9fe15..5a5ef70b1 100644
--- a/tendermint/src/evidence.rs
+++ b/tendermint/src/evidence.rs
@@ -53,6 +53,7 @@ impl Serialize for Evidence {
 /// <https://github.com/tendermint/tendermint/blob/master/docs/spec/blockchain/blockchain.md#evidencedata>
 #[derive(Deserialize, Serialize, Clone, Debug, Default)]
 pub struct Data {
+    /// List of `Evidence`.
     evidence: Option<Vec<Evidence>>,
 }
 
diff --git a/tendermint/src/lib.rs b/tendermint/src/lib.rs
index 4d0dad4d7..ef1189b9c 100644
--- a/tendermint/src/lib.rs
+++ b/tendermint/src/lib.rs
@@ -5,12 +5,12 @@
 //! and remote procedure calls (JSONRPC).
 
 #![deny(
-    warnings,
     missing_docs,
     trivial_casts,
     trivial_numeric_casts,
     unused_import_braces,
-    unused_qualifications
+    unused_qualifications,
+    warnings
 )]
 #![allow(
     clippy::all,
@@ -29,6 +29,7 @@
     clippy::multiple_crate_versions,
     clippy::must_use_candidate
 )]
+#![deny(clippy::missing_docs_in_private_items)]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/tendermint/kms/master/img/tendermint.png",
     html_root_url = "https://docs.rs/tendermint/0.11.0"
diff --git a/tendermint/src/lite.rs b/tendermint/src/lite.rs
index c5de8e64f..eb62593bd 100644
--- a/tendermint/src/lite.rs
+++ b/tendermint/src/lite.rs
@@ -1,5 +1,9 @@
 //! Core logic and traits of a light client.
 
+// TODO(xla): Document package extensively, even private parts, as it will help guide the reader
+// and solidify abstractions.
+#![allow(clippy::missing_docs_in_private_items)]
+
 pub mod types;
 pub mod verifier;
 
diff --git a/tendermint/src/merkle.rs b/tendermint/src/merkle.rs
index e74d27825..2e3a6fde3 100644
--- a/tendermint/src/merkle.rs
+++ b/tendermint/src/merkle.rs
@@ -15,7 +15,7 @@ pub fn simple_hash_from_byte_vectors(byte_vecs: Vec<Vec<u8>>) -> Hash {
     simple_hash_from_byte_slices_inner(byte_vecs.as_slice())
 }
 
-// recurse into subtrees
+/// Recurse into subtrees.
 fn simple_hash_from_byte_slices_inner(byte_slices: &[Vec<u8>]) -> Hash {
     let length = byte_slices.len();
     match length {
@@ -30,7 +30,7 @@ fn simple_hash_from_byte_slices_inner(byte_slices: &[Vec<u8>]) -> Hash {
     }
 }
 
-// returns the largest power of 2 less than length
+/// Returns the largest power of 2 less than length.
 fn get_split_point(length: usize) -> usize {
     match length {
         0 => panic!("tree is empty!"),
@@ -46,7 +46,7 @@ fn get_split_point(length: usize) -> usize {
     }
 }
 
-// tmhash(0x00 || leaf)
+/// tmhash(0x00 || leaf).
 fn leaf_hash(bytes: &[u8]) -> Hash {
     // make a new array starting with 0 and copy in the bytes
     let mut leaf_bytes = Vec::with_capacity(bytes.len() + 1);
@@ -62,7 +62,7 @@ fn leaf_hash(bytes: &[u8]) -> Hash {
     hash_bytes
 }
 
-// tmhash(0x01 || left || right)
+/// tmhash(0x01 || left || right).
 fn inner_hash(left: &[u8], right: &[u8]) -> Hash {
     // make a new array starting with 0x1 and copy in the bytes
     let mut inner_bytes = Vec::with_capacity(left.len() + right.len() + 1);
diff --git a/tendermint/src/public_key.rs b/tendermint/src/public_key.rs
index a1bee5853..b1a96e159 100644
--- a/tendermint/src/public_key.rs
+++ b/tendermint/src/public_key.rs
@@ -192,7 +192,7 @@ impl<'de> Deserialize<'de> for Algorithm {
     }
 }
 
-/// Serialize the bytes of an Ed25519 public key as Base64. Used for serializing JSON
+/// Serialize the bytes of an Ed25519 public key as Base64. Used for serializing JSON.
 fn serialize_ed25519_base64<S>(pk: &ed25519::PublicKey, serializer: S) -> Result<S::Ok, S::Error>
 where
     S: Serializer,
@@ -202,7 +202,7 @@ where
         .serialize(serializer)
 }
 
-/// Serialize the bytes of a secp256k1 ECDSA public key as Base64. Used for serializing JSON
+/// Serialize the bytes of a secp256k1 ECDSA public key as Base64. Used for serializing JSON.
 fn serialize_secp256k1_base64<S>(
     pk: &secp256k1::PublicKey,
     serializer: S,
@@ -215,6 +215,7 @@ where
         .serialize(serializer)
 }
 
+/// Deserialize the bytes of an Ed25519 public key from Base64. Used for deserializing JSON.
 fn deserialize_ed25519_base64<'de, D>(deserializer: D) -> Result<ed25519::PublicKey, D::Error>
 where
     D: Deserializer<'de>,
@@ -225,6 +226,7 @@ where
     ed25519::PublicKey::from_bytes(&bytes).ok_or_else(|| D::Error::custom("invalid ed25519 key"))
 }
 
+/// Deserialize the bytes of a secp256k1 ECDSA public key from Base64. Used for deserializing JSON.
 fn deserialize_secp256k1_base64<'de, D>(
     deserializer: D,
 ) -> Result<signatory::ecdsa::curve::secp256k1::PublicKey, D::Error>
diff --git a/tendermint/src/rpc/endpoint/commit.rs b/tendermint/src/rpc/endpoint/commit.rs
index 6bc647ecd..f69575362 100644
--- a/tendermint/src/rpc/endpoint/commit.rs
+++ b/tendermint/src/rpc/endpoint/commit.rs
@@ -6,6 +6,7 @@ use serde::{Deserialize, Serialize};
 /// Get commit information about a specific block
 #[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
 pub struct Request {
+    /// Block height.
     height: Option<block::Height>,
 }
 
diff --git a/tendermint/src/rpc/endpoint/validators.rs b/tendermint/src/rpc/endpoint/validators.rs
index 39103b276..bf3f3b3d5 100644
--- a/tendermint/src/rpc/endpoint/validators.rs
+++ b/tendermint/src/rpc/endpoint/validators.rs
@@ -3,9 +3,10 @@
 use crate::{block, rpc, validator};
 use serde::{Deserialize, Serialize};
 
-/// List validators for a specific block
+/// List validators for a specific block.
 #[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
 pub struct Request {
+    /// Block height.
     height: block::Height,
 }
 
diff --git a/tendermint/src/serializers.rs b/tendermint/src/serializers.rs
index 307847a8a..2007384dd 100644
--- a/tendermint/src/serializers.rs
+++ b/tendermint/src/serializers.rs
@@ -65,6 +65,7 @@ where
     format!("{}", duration.as_nanos()).serialize(serializer)
 }
 
+/// TODO(xla): Needs documentation.
 pub(crate) fn parse_non_empty_hash<'de, D>(deserializer: D) -> Result<Option<Hash>, D::Error>
 where
     D: Deserializer<'de>,
@@ -78,6 +79,7 @@ where
     }
 }
 
+/// TODO(xla): Needs documentation.
 pub(crate) fn serialize_hex<S, T>(bytes: T, serializer: S) -> Result<S::Ok, S::Error>
 where
     S: Serializer,
@@ -89,6 +91,7 @@ where
     serializer.serialize_str(&hex_string)
 }
 
+/// TODO(xla): Needs documentation.
 pub(crate) fn parse_hex<'de, D>(deserializer: D) -> Result<Vec<u8>, D::Error>
 where
     D: Deserializer<'de>,
@@ -98,6 +101,7 @@ where
     hex::decode(&string).map_err(Error::custom)
 }
 
+/// TODO(xla): Needs documentation.
 pub(crate) fn serialize_base64<S, T>(bytes: T, serializer: S) -> Result<S::Ok, S::Error>
 where
     S: Serializer,
@@ -109,6 +113,7 @@ where
     serializer.serialize_str(&base64_string)
 }
 
+/// TODO(xla): Needs documentation.
 pub(crate) fn parse_base64<'de, D>(deserializer: D) -> Result<Vec<u8>, D::Error>
 where
     D: Deserializer<'de>,
@@ -118,6 +123,7 @@ where
     base64::decode(&string).map_err(Error::custom)
 }
 
+/// TODO(xla): Needs documentation.
 pub(crate) fn serialize_option_base64<S>(
     maybe_bytes: &Option<Vec<u8>>,
     serializer: S,
@@ -125,6 +131,7 @@ pub(crate) fn serialize_option_base64<S>(
 where
     S: Serializer,
 {
+    #[allow(clippy::missing_docs_in_private_items)]
     #[derive(Serialize)]
     struct Wrapper<'a>(#[serde(serialize_with = "serialize_base64")] &'a Vec<u8>);
 
@@ -134,10 +141,12 @@ where
     }
 }
 
+/// TODO(xla): Needs documentation.
 pub(crate) fn parse_option_base64<'de, D>(deserializer: D) -> Result<Option<Vec<u8>>, D::Error>
 where
     D: Deserializer<'de>,
 {
+    #[allow(clippy::missing_docs_in_private_items)]
     #[derive(Deserialize)]
     struct Wrapper(#[serde(deserialize_with = "parse_base64")] Vec<u8>);
 
diff --git a/tendermint/src/timeout.rs b/tendermint/src/timeout.rs
index 72d32f037..2745138aa 100644
--- a/tendermint/src/timeout.rs
+++ b/tendermint/src/timeout.rs
@@ -1,3 +1,5 @@
+//! Durations used for timeouts.
+
 use crate::{Error, ErrorKind};
 use serde::{de, de::Error as _, ser, Deserialize, Serialize};
 use std::{fmt, ops::Deref, str::FromStr, time::Duration};
diff --git a/tendermint/src/validator.rs b/tendermint/src/validator.rs
index 6546898cb..a76c2003b 100644
--- a/tendermint/src/validator.rs
+++ b/tendermint/src/validator.rs
@@ -13,6 +13,7 @@ use subtle_encoding::base64;
 /// Validator set contains a vector of validators
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct Set {
+    /// List of `Validator`.
     #[serde(deserialize_with = "parse_vals")]
     validators: Vec<Info>,
 }
@@ -58,6 +59,7 @@ impl lite::ValidatorSet for Set {
 
 // TODO: maybe add a type (with an Option<Vec<Info>> field) instead
 // for light client integration tests only
+/// TODO(xla): Needs documentation.
 fn parse_vals<'de, D>(d: D) -> Result<Vec<Info>, D::Error>
 where
     D: Deserializer<'de>,
@@ -65,7 +67,7 @@ where
     Deserialize::deserialize(d).map(Option::unwrap_or_default)
 }
 
-/// Validator information
+/// Validator information.
 #[derive(Clone, Copy, Debug, Deserialize, PartialEq, Serialize)]
 pub struct Info {
     /// Validator account address
@@ -93,9 +95,8 @@ impl Info {
         }
     }
 
-    // returns the bytes to be hashed into the Merkle tree -
-    // the leaves of the tree. this is an amino encoding of the
-    // pubkey and voting power, so it includes the pubkey's amino prefix.
+    /// Returns the bytes to be hashed into the Merkle tree - the leaves of the tree. this is an
+    /// amino encoding of the pubkey and voting power, so it includes the pubkey's amino prefix.
     fn hash_bytes(&self) -> Vec<u8> {
         AminoMessage::bytes_vec(&InfoHashable::from(self))
     }
@@ -134,8 +135,10 @@ impl From<PublicKey> for account::Id {
 /// TODO: currently only works for Ed25519 pubkeys
 #[derive(Clone, PartialEq, Message)]
 struct InfoHashable {
+    /// Validator public key.
     #[prost(bytes, tag = "1", amino_name = "tendermint/PubKeyEd25519")]
     pub pub_key: Vec<u8>,
+    /// Validator voting power.
     #[prost(uint64, tag = "2")]
     voting_power: u64,
 }
@@ -207,6 +210,7 @@ enum PK {
     Ed25519(String),
 }
 
+/// TODO(xla): Needs documentation.
 fn deserialize_public_key<'de, D>(deserializer: D) -> Result<PublicKey, D::Error>
 where
     D: Deserializer<'de>,
diff --git a/tendermint/src/version.rs b/tendermint/src/version.rs
index 5142c72e6..bf48250aa 100644
--- a/tendermint/src/version.rs
+++ b/tendermint/src/version.rs
@@ -1,3 +1,5 @@
+//! Tendermint version.
+
 use serde::{Deserialize, Serialize};
 use std::fmt::{self, Display};
 
diff --git a/tendermint/src/vote.rs b/tendermint/src/vote.rs
index 52ce2087d..43d43a01d 100644
--- a/tendermint/src/vote.rs
+++ b/tendermint/src/vote.rs
@@ -71,8 +71,11 @@ impl Vote {
 /// Signed is the union of a canonicalized vote, the signature on
 /// the sign bytes of that vote and the id of the validator who signed it.
 pub struct Signed {
+    /// Canonicalized vote.
     vote: amino_types::CanonicalVote,
+    /// Validator identity.
     validator_address: account::Id,
+    /// Signature of sign bytes.
     signature: Signature,
 }
 

From 8534547798b9780245afc0aa9ef6daaeafd27f8c Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Tue, 7 Jan 2020 12:53:05 +0100
Subject: [PATCH 42/55] Remove superfluous unwrap_or_else

---
 tendermint/src/abci/transaction.rs | 2 +-
 tendermint/src/consensus/state.rs  | 3 +--
 tendermint/src/evidence.rs         | 5 +----
 tendermint/src/lib.rs              | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/tendermint/src/abci/transaction.rs b/tendermint/src/abci/transaction.rs
index b4d2b268a..ecc9f9347 100644
--- a/tendermint/src/abci/transaction.rs
+++ b/tendermint/src/abci/transaction.rs
@@ -91,6 +91,6 @@ impl Data {
 
 impl AsRef<[Transaction]> for Data {
     fn as_ref(&self) -> &[Transaction] {
-        self.txs.as_ref().map(Vec::as_slice).unwrap_or_else(|| &[])
+        self.txs.as_ref().map_or_else(|| &[], Vec::as_slice)
     }
 }
diff --git a/tendermint/src/consensus/state.rs b/tendermint/src/consensus/state.rs
index ec84467ff..8033965ab 100644
--- a/tendermint/src/consensus/state.rs
+++ b/tendermint/src/consensus/state.rs
@@ -36,8 +36,7 @@ impl State {
     pub fn block_id_prefix(&self) -> String {
         self.block_id
             .as_ref()
-            .map(block::Id::prefix)
-            .unwrap_or_else(|| NIL_PLACEHOLDER.to_owned())
+            .map_or_else(|| NIL_PLACEHOLDER.to_owned(), block::Id::prefix)
     }
 }
 
diff --git a/tendermint/src/evidence.rs b/tendermint/src/evidence.rs
index 5a5ef70b1..3bdc32eae 100644
--- a/tendermint/src/evidence.rs
+++ b/tendermint/src/evidence.rs
@@ -81,10 +81,7 @@ impl Data {
 
 impl AsRef<[Evidence]> for Data {
     fn as_ref(&self) -> &[Evidence] {
-        self.evidence
-            .as_ref()
-            .map(Vec::as_slice)
-            .unwrap_or_else(|| &[])
+        self.evidence.as_ref().map_or_else(|| &[], Vec::as_slice)
     }
 }
 
diff --git a/tendermint/src/lib.rs b/tendermint/src/lib.rs
index ef1189b9c..a57a6c23d 100644
--- a/tendermint/src/lib.rs
+++ b/tendermint/src/lib.rs
@@ -19,6 +19,7 @@
     clippy::pedantic,
     clippy::restriction
 )]
+#![deny(clippy::option_map_unwrap_or_else)]
 #![allow(
     clippy::cast_sign_loss,
     clippy::default_trait_access,
@@ -29,7 +30,6 @@
     clippy::multiple_crate_versions,
     clippy::must_use_candidate
 )]
-#![deny(clippy::missing_docs_in_private_items)]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/tendermint/kms/master/img/tendermint.png",
     html_root_url = "https://docs.rs/tendermint/0.11.0"

From bd9b608211a3e00893181b43b6c0b95f2b52d6bb Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Tue, 7 Jan 2020 13:22:42 +0100
Subject: [PATCH 43/55] Address unwrap used on Options

---
 tendermint/src/account.rs              |  3 ++-
 tendermint/src/amino_types/proposal.rs |  2 +-
 tendermint/src/amino_types/vote.rs     |  2 +-
 tendermint/src/block.rs                |  4 ++--
 tendermint/src/block/height.rs         |  2 +-
 tendermint/src/chain/id.rs             | 11 +++++++++--
 tendermint/src/lib.rs                  |  2 +-
 tendermint/src/net.rs                  |  2 +-
 tendermint/src/private_key.rs          |  6 +++---
 tendermint/src/public_key.rs           |  4 +++-
 tendermint/src/timeout.rs              |  6 +++++-
 tendermint/src/validator.rs            | 10 ++++++++--
 12 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/tendermint/src/account.rs b/tendermint/src/account.rs
index d6651b551..60c026a1b 100644
--- a/tendermint/src/account.rs
+++ b/tendermint/src/account.rs
@@ -135,7 +135,8 @@ mod tests {
         let id_bytes = Id::from_str(id_hex).expect("expected id_hex to decode properly");
 
         // get id for pubkey
-        let pubkey = ed25519::PublicKey::from_bytes(pubkey_bytes).unwrap();
+        let pubkey =
+            ed25519::PublicKey::from_bytes(pubkey_bytes).expect("unable to get public key");
         let id = Id::from(pubkey);
 
         assert_eq!(id_bytes.ct_eq(&id).unwrap_u8(), 1);
diff --git a/tendermint/src/amino_types/proposal.rs b/tendermint/src/amino_types/proposal.rs
index 8f407ce97..917f5782a 100644
--- a/tendermint/src/amino_types/proposal.rs
+++ b/tendermint/src/amino_types/proposal.rs
@@ -97,7 +97,7 @@ impl SignableMsg for SignProposalRequest {
         if let Some(ref mut pr) = spr.proposal {
             pr.signature = vec![];
         }
-        let proposal = spr.proposal.unwrap();
+        let proposal = spr.proposal.expect("Proposal missing");
         let cp = CanonicalProposal {
             chain_id: chain_id.to_string(),
             msg_type: SignedMsgType::Proposal.to_u32(),
diff --git a/tendermint/src/amino_types/vote.rs b/tendermint/src/amino_types/vote.rs
index 7729adcec..5bae48828 100644
--- a/tendermint/src/amino_types/vote.rs
+++ b/tendermint/src/amino_types/vote.rs
@@ -160,7 +160,7 @@ impl SignableMsg for SignVoteRequest {
         if let Some(ref mut vo) = svr.vote {
             vo.signature = vec![];
         }
-        let vote = svr.vote.unwrap();
+        let vote = svr.vote.expect("Vote missing");
         let cv = Canonical::new(vote, chain_id.as_str());
 
         cv.encode_length_delimited(sign_bytes)?;
diff --git a/tendermint/src/block.rs b/tendermint/src/block.rs
index de0b4ff31..ec179511b 100644
--- a/tendermint/src/block.rs
+++ b/tendermint/src/block.rs
@@ -60,8 +60,8 @@ where
         Ok(None)
     } else {
         Ok(Some(Commit {
-            block_id: commit.block_id.unwrap(),
-            precommits: commit.precommits.unwrap(),
+            block_id: commit.block_id.expect("block id missing"),
+            precommits: commit.precommits.expect("precommits missing"),
         }))
     }
 }
diff --git a/tendermint/src/block/height.rs b/tendermint/src/block/height.rs
index 23985eeff..5e4cedd09 100644
--- a/tendermint/src/block/height.rs
+++ b/tendermint/src/block/height.rs
@@ -23,7 +23,7 @@ impl Height {
 
     /// Increment the block height by 1
     pub fn increment(self) -> Self {
-        Self(self.0.checked_add(1).unwrap())
+        Self(self.0.checked_add(1).expect("add overflow occurred"))
     }
 }
 
diff --git a/tendermint/src/chain/id.rs b/tendermint/src/chain/id.rs
index 01dd54845..f5033d4d7 100644
--- a/tendermint/src/chain/id.rs
+++ b/tendermint/src/chain/id.rs
@@ -148,14 +148,21 @@ mod tests {
 
     #[test]
     fn rejects_empty_chain_ids() {
-        assert_eq!(*"".parse::<Id>().err().unwrap().kind(), ErrorKind::Length);
+        assert_eq!(
+            *"".parse::<Id>().err().expect("unable to get error").kind(),
+            ErrorKind::Length
+        );
     }
 
     #[test]
     fn rejects_overlength_chain_ids() {
         let overlong_id = String::from_utf8(vec![b'x'; MAX_LENGTH + 1]).unwrap();
         assert_eq!(
-            *overlong_id.parse::<Id>().err().unwrap().kind(),
+            *overlong_id
+                .parse::<Id>()
+                .err()
+                .expect("unable to get error")
+                .kind(),
             ErrorKind::Length
         );
     }
diff --git a/tendermint/src/lib.rs b/tendermint/src/lib.rs
index a57a6c23d..b68c64ba5 100644
--- a/tendermint/src/lib.rs
+++ b/tendermint/src/lib.rs
@@ -19,7 +19,7 @@
     clippy::pedantic,
     clippy::restriction
 )]
-#![deny(clippy::option_map_unwrap_or_else)]
+#![deny(clippy::option_unwrap_used)]
 #![allow(
     clippy::cast_sign_loss,
     clippy::default_trait_access,
diff --git a/tendermint/src/net.rs b/tendermint/src/net.rs
index f8779af47..b788e3b40 100644
--- a/tendermint/src/net.rs
+++ b/tendermint/src/net.rs
@@ -153,7 +153,7 @@ mod tests {
                     port,
                 } => {
                     assert_eq!(
-                        peer_id.unwrap(),
+                        peer_id.expect("peer id missing"),
                         "abd636b766dcefb5322d8ca40011ec2cb35efbc2"
                             .parse::<node::Id>()
                             .unwrap()
diff --git a/tendermint/src/private_key.rs b/tendermint/src/private_key.rs
index 4181268cc..060ddda2b 100644
--- a/tendermint/src/private_key.rs
+++ b/tendermint/src/private_key.rs
@@ -44,7 +44,7 @@ pub struct Ed25519Keypair([u8; ED25519_KEYPAIR_SIZE]);
 impl Ed25519Keypair {
     /// Get the public key associated with this keypair
     pub fn public_key(&self) -> PublicKey {
-        let seed = ed25519::Seed::from_keypair(&self.0[..]).unwrap();
+        let seed = ed25519::Seed::from_keypair(&self.0[..]).expect("unable to extract Seed");
         let pk = signatory_dalek::Ed25519Signer::from(&seed)
             .public_key()
             .unwrap();
@@ -63,11 +63,11 @@ impl Ed25519Keypair {
     }
 }
 
-// TODO(xla): Conver to TryFrom.
+// TODO(xla): Convert to TryFrom.
 #[allow(clippy::fallible_impl_from)]
 impl<'a> From<&'a Ed25519Keypair> for ed25519::Seed {
     fn from(keypair: &'a Ed25519Keypair) -> Self {
-        Self::from_keypair(&keypair.0[..]).unwrap()
+        Self::from_keypair(&keypair.0[..]).expect("unable to extract Seed")
     }
 }
 
diff --git a/tendermint/src/public_key.rs b/tendermint/src/public_key.rs
index b1a96e159..e08e477c3 100644
--- a/tendermint/src/public_key.rs
+++ b/tendermint/src/public_key.rs
@@ -242,6 +242,8 @@ where
 
 #[cfg(test)]
 mod tests {
+    #![allow(clippy::option_unwrap_used)]
+
     use super::{PublicKey, TendermintKey};
     use subtle_encoding::hex;
 
@@ -283,7 +285,7 @@ mod tests {
         let pubkey: PublicKey = serde_json::from_str(json_string).unwrap();
 
         assert_eq!(
-            pubkey.ed25519().unwrap().as_ref(),
+            pubkey.ed25519().expect("no key present").as_ref(),
             [
                 69, 185, 115, 48, 238, 34, 179, 146, 245, 133, 156, 250, 194, 142, 36, 61, 186,
                 109, 204, 236, 174, 123, 162, 211, 147, 143, 165, 62, 16, 245, 21, 25
diff --git a/tendermint/src/timeout.rs b/tendermint/src/timeout.rs
index 2745138aa..028575bd5 100644
--- a/tendermint/src/timeout.rs
+++ b/tendermint/src/timeout.rs
@@ -102,7 +102,11 @@ mod tests {
     #[test]
     fn reject_no_units() {
         assert_eq!(
-            *"123".parse::<Timeout>().err().unwrap().kind(),
+            *"123"
+                .parse::<Timeout>()
+                .err()
+                .expect("extracting error failed")
+                .kind(),
             ErrorKind::Parse
         );
     }
diff --git a/tendermint/src/validator.rs b/tendermint/src/validator.rs
index a76c2003b..367757eac 100644
--- a/tendermint/src/validator.rs
+++ b/tendermint/src/validator.rs
@@ -22,7 +22,11 @@ impl Set {
     /// Create a new validator set.
     /// vals is mutable so it can be sorted by address.
     pub fn new(mut vals: Vec<Info>) -> Self {
-        vals.sort_by(|v1, v2| v1.address.partial_cmp(&v2.address).unwrap());
+        vals.sort_by(|v1, v2| {
+            v1.address
+                .partial_cmp(&v2.address)
+                .expect("validator address comparison failed")
+        });
         Self { validators: vals }
     }
 
@@ -234,10 +238,12 @@ mod tests {
 
     // make a validator from a hex ed25519 pubkey and a voting power
     fn make_validator(pk_string: &str, vp: u64) -> Info {
-        let pk = PublicKey::from_raw_ed25519(&hex::decode_upper(pk_string).unwrap()).unwrap();
+        let bytes = &hex::decode_upper(pk_string).expect("decoding key string failed");
+        let pk = PublicKey::from_raw_ed25519(bytes).expect("decoding public key failed");
         Info::new(pk, vote::Power::new(vp))
     }
 
+    #[allow(clippy::option_unwrap_used)]
     #[test]
     fn test_validator_set() {
         // test vector generated by Go code

From 5cfcb3785bbe667c9b7ddcf829201fd2fa3f422e Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Sat, 18 Jan 2020 15:32:48 +0100
Subject: [PATCH 44/55] Replace result unwrap with expect

---
 tendermint/src/abci/proof.rs                |  4 +++-
 tendermint/src/abci/transaction.rs          |  2 +-
 tendermint/src/account.rs                   |  1 +
 tendermint/src/amino_types/message.rs       |  5 +++--
 tendermint/src/amino_types/proposal.rs      |  2 ++
 tendermint/src/amino_types/time.rs          |  4 +++-
 tendermint/src/amino_types/vote.rs          |  4 ++++
 tendermint/src/block/header.rs              |  3 ++-
 tendermint/src/block/id.rs                  |  2 ++
 tendermint/src/chain/id.rs                  |  6 ++++--
 tendermint/src/config/priv_validator_key.rs |  3 ++-
 tendermint/src/evidence.rs                  |  2 +-
 tendermint/src/hash.rs                      |  4 +++-
 tendermint/src/lib.rs                       |  7 ++++++-
 tendermint/src/lite/verifier.rs             |  5 +++--
 tendermint/src/merkle.rs                    |  3 +++
 tendermint/src/net.rs                       |  1 +
 tendermint/src/private_key.rs               |  4 ++--
 tendermint/src/public_key.rs                | 10 +++++++---
 tendermint/src/rpc/client.rs                |  7 +++++--
 tendermint/src/rpc/endpoint/abci_info.rs    |  2 +-
 tendermint/src/rpc/request.rs               |  3 ++-
 tendermint/src/signature.rs                 |  2 +-
 tendermint/src/time.rs                      |  3 ++-
 tendermint/src/timeout.rs                   |  2 ++
 tendermint/src/validator.rs                 |  1 +
 26 files changed, 67 insertions(+), 25 deletions(-)

diff --git a/tendermint/src/abci/proof.rs b/tendermint/src/abci/proof.rs
index ce2607717..9e34c4a5a 100644
--- a/tendermint/src/abci/proof.rs
+++ b/tendermint/src/abci/proof.rs
@@ -23,7 +23,9 @@ impl Display for Proof {
         write!(
             f,
             "{}",
-            &Hex::upper_case().encode_to_string(&self.0).unwrap()
+            &Hex::upper_case()
+                .encode_to_string(&self.0)
+                .expect("encoding Proof to string failed")
         )
     }
 }
diff --git a/tendermint/src/abci/transaction.rs b/tendermint/src/abci/transaction.rs
index ecc9f9347..29502a1d9 100644
--- a/tendermint/src/abci/transaction.rs
+++ b/tendermint/src/abci/transaction.rs
@@ -53,7 +53,7 @@ impl<'de> Deserialize<'de> for Transaction {
 impl Serialize for Transaction {
     fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
         String::from_utf8(base64::encode(self.as_bytes()))
-            .unwrap()
+            .expect("Transaction encoding failed")
             .serialize(serializer)
     }
 }
diff --git a/tendermint/src/account.rs b/tendermint/src/account.rs
index 60c026a1b..007b7e406 100644
--- a/tendermint/src/account.rs
+++ b/tendermint/src/account.rs
@@ -124,6 +124,7 @@ impl Serialize for Id {
 mod tests {
     use super::*;
 
+    #[allow(clippy::result_unwrap_used)]
     #[test]
     fn test_ed25519_id() {
         // test vector for pubkey and id (address)
diff --git a/tendermint/src/amino_types/message.rs b/tendermint/src/amino_types/message.rs
index 1587be177..d1988c9bb 100644
--- a/tendermint/src/amino_types/message.rs
+++ b/tendermint/src/amino_types/message.rs
@@ -15,7 +15,7 @@ pub trait Message: prost_amino::Message {
         Self: Sized,
     {
         let mut res = Vec::with_capacity(self.encoded_len());
-        self.encode(&mut res).unwrap();
+        self.encode(&mut res).expect("Message encoding failed");
         res
     }
 
@@ -30,7 +30,8 @@ pub trait Message: prost_amino::Message {
         let len = self.encoded_len();
         let mut res =
             Vec::with_capacity(len + encoded_len_varint(len.try_into().expect("length overflow")));
-        self.encode_length_delimited(&mut res).unwrap();
+        self.encode_length_delimited(&mut res)
+            .expect("Message encoding failed");
         res
     }
 }
diff --git a/tendermint/src/amino_types/proposal.rs b/tendermint/src/amino_types/proposal.rs
index 917f5782a..58199e045 100644
--- a/tendermint/src/amino_types/proposal.rs
+++ b/tendermint/src/amino_types/proposal.rs
@@ -196,6 +196,7 @@ mod tests {
     use prost::Message;
     use std::error::Error;
 
+    #[allow(clippy::result_unwrap_used)]
     #[test]
     fn test_serialization() {
         let dt = "2018-02-11T07:09:22.765Z".parse::<DateTime<Utc>>().unwrap();
@@ -255,6 +256,7 @@ mod tests {
         assert_eq!(got, want)
     }
 
+    #[allow(clippy::result_unwrap_used)]
     #[test]
     fn test_deserialization() {
         let dt = "2018-02-11T07:09:22.765Z".parse::<DateTime<Utc>>().unwrap();
diff --git a/tendermint/src/amino_types/time.rs b/tendermint/src/amino_types/time.rs
index e15cadc64..54c9abe01 100644
--- a/tendermint/src/amino_types/time.rs
+++ b/tendermint/src/amino_types/time.rs
@@ -29,7 +29,9 @@ impl ParseTimestamp for Msg {
 impl From<Time> for Msg {
     fn from(ts: Time) -> Self {
         // TODO: non-panicking method for getting this?
-        let duration = ts.duration_since(Time::unix_epoch()).unwrap();
+        let duration = ts
+            .duration_since(Time::unix_epoch())
+            .expect("unable to get duration from epoch");
         let seconds = duration.as_secs() as i64;
         let nanos = duration.subsec_nanos() as i32;
 
diff --git a/tendermint/src/amino_types/vote.rs b/tendermint/src/amino_types/vote.rs
index 5bae48828..d3a6d65c7 100644
--- a/tendermint/src/amino_types/vote.rs
+++ b/tendermint/src/amino_types/vote.rs
@@ -242,6 +242,7 @@ mod tests {
     use crate::amino_types::SignedMsgType;
     use chrono::{DateTime, Utc};
 
+    #[allow(clippy::result_unwrap_used)]
     #[test]
     fn test_vote_serialization() {
         let dt = "2017-12-25T03:00:01.234Z".parse::<DateTime<Utc>>().unwrap();
@@ -308,6 +309,7 @@ mod tests {
         assert_eq!(got, want);
     }
 
+    #[allow(clippy::result_unwrap_used)]
     #[test]
     fn test_sign_bytes_compatibility() {
         let cv = Canonical::new(Vote::default(), "");
@@ -408,6 +410,7 @@ mod tests {
         }
     }
 
+    #[allow(clippy::result_unwrap_used)]
     #[test]
     fn test_vote_rountrip_with_sig() {
         let dt = "2017-12-25T03:00:01.234Z".parse::<DateTime<Utc>>().unwrap();
@@ -456,6 +459,7 @@ mod tests {
         }
     }
 
+    #[allow(clippy::result_unwrap_used)]
     #[test]
     fn test_deserialization() {
         let encoded = vec![
diff --git a/tendermint/src/block/header.rs b/tendermint/src/block/header.rs
index c4a76275c..ca12c244c 100644
--- a/tendermint/src/block/header.rs
+++ b/tendermint/src/block/header.rs
@@ -188,7 +188,8 @@ pub struct Version {
 
 fn bytes_enc(bytes: &[u8]) -> Vec<u8> {
     let mut chain_id_enc = vec![];
-    prost_amino::encode_length_delimiter(bytes.len(), &mut chain_id_enc).unwrap();
+    prost_amino::encode_length_delimiter(bytes.len(), &mut chain_id_enc)
+        .expect("buffer size not sufficient to encode message");
     chain_id_enc.append(&mut bytes.to_vec());
     chain_id_enc
 }
diff --git a/tendermint/src/block/id.rs b/tendermint/src/block/id.rs
index 4b0c36bb3..b1f909aa0 100644
--- a/tendermint/src/block/id.rs
+++ b/tendermint/src/block/id.rs
@@ -82,6 +82,7 @@ mod tests {
     const EXAMPLE_SHA256_ID: &str =
         "26C0A41F3243C6BCD7AD2DFF8A8D83A71D29D307B5326C227F734A1A512FE47D";
 
+    #[allow(clippy::result_unwrap_used)]
     #[test]
     fn parses_hex_strings() {
         let id = Id::from_str(EXAMPLE_SHA256_ID).unwrap();
@@ -93,6 +94,7 @@ mod tests {
         );
     }
 
+    #[allow(clippy::result_unwrap_used)]
     #[test]
     fn serializes_hex_strings() {
         let id = Id::from_str(EXAMPLE_SHA256_ID).unwrap();
diff --git a/tendermint/src/chain/id.rs b/tendermint/src/chain/id.rs
index f5033d4d7..16b6c04cd 100644
--- a/tendermint/src/chain/id.rs
+++ b/tendermint/src/chain/id.rs
@@ -28,7 +28,7 @@ impl Id {
 
         // We assert above the ID only has characters in the valid UTF-8 range,
         // so in theory this should never panic
-        str::from_utf8(byte_slice).unwrap()
+        str::from_utf8(byte_slice).expect("Id has non utf8 characters")
     }
 
     /// Get the chain ID as a raw bytes.
@@ -59,7 +59,7 @@ impl Display for Id {
 #[allow(clippy::fallible_impl_from)]
 impl<'a> From<&'a str> for Id {
     fn from(s: &str) -> Self {
-        Self::from_str(s).unwrap()
+        Self::from_str(s).expect("Id conversion from string failed")
     }
 }
 
@@ -135,6 +135,7 @@ mod tests {
 
     const EXAMPLE_CHAIN_ID: &str = "gaia-9000";
 
+    #[allow(clippy::result_unwrap_used)]
     #[test]
     fn parses_valid_chain_ids() {
         assert_eq!(
@@ -154,6 +155,7 @@ mod tests {
         );
     }
 
+    #[allow(clippy::result_unwrap_used)]
     #[test]
     fn rejects_overlength_chain_ids() {
         let overlong_id = String::from_utf8(vec![b'x'; MAX_LENGTH + 1]).unwrap();
diff --git a/tendermint/src/config/priv_validator_key.rs b/tendermint/src/config/priv_validator_key.rs
index aa9a009b8..dd1ecf9f7 100644
--- a/tendermint/src/config/priv_validator_key.rs
+++ b/tendermint/src/config/priv_validator_key.rs
@@ -48,6 +48,7 @@ impl PrivValidatorKey {
 
     /// Get the consensus public key for this validator private key
     pub fn consensus_pubkey(&self) -> TendermintKey {
-        TendermintKey::new_consensus_key(self.priv_key.public_key()).unwrap()
+        TendermintKey::new_consensus_key(self.priv_key.public_key())
+            .expect("unable to create consensus key")
     }
 }
diff --git a/tendermint/src/evidence.rs b/tendermint/src/evidence.rs
index 3bdc32eae..f507c8aca 100644
--- a/tendermint/src/evidence.rs
+++ b/tendermint/src/evidence.rs
@@ -43,7 +43,7 @@ impl<'de> Deserialize<'de> for Evidence {
 impl Serialize for Evidence {
     fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
         String::from_utf8(base64::encode(self.to_amino_bytes()))
-            .unwrap()
+            .expect("Evidence encoding failed")
             .serialize(serializer)
     }
 }
diff --git a/tendermint/src/hash.rs b/tendermint/src/hash.rs
index ba402d9b5..f4a907e7e 100644
--- a/tendermint/src/hash.rs
+++ b/tendermint/src/hash.rs
@@ -80,7 +80,9 @@ impl Debug for Hash {
 impl Display for Hash {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let hex = match self {
-            Self::Sha256(ref h) => Hex::upper_case().encode_to_string(h).unwrap(),
+            Self::Sha256(ref h) => Hex::upper_case()
+                .encode_to_string(h)
+                .expect("Hash encoding to string failed"),
         };
 
         write!(f, "{}", hex)
diff --git a/tendermint/src/lib.rs b/tendermint/src/lib.rs
index b68c64ba5..db44bb9bd 100644
--- a/tendermint/src/lib.rs
+++ b/tendermint/src/lib.rs
@@ -20,6 +20,8 @@
     clippy::restriction
 )]
 #![deny(clippy::option_unwrap_used)]
+// TODO(xla): Review all uses of expect and try to rework into proper error handling, this crate
+// should ideally never panic.
 #![allow(
     clippy::cast_sign_loss,
     clippy::default_trait_access,
@@ -28,8 +30,11 @@
     clippy::integer_arithmetic,
     clippy::missing_inline_in_public_items,
     clippy::multiple_crate_versions,
-    clippy::must_use_candidate
+    clippy::must_use_candidate,
+    clippy::option_expect_used,
+    clippy::result_expect_used
 )]
+#![deny(clippy::result_unwrap_used)]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/tendermint/kms/master/img/tendermint.png",
     html_root_url = "https://docs.rs/tendermint/0.11.0"
diff --git a/tendermint/src/lite/verifier.rs b/tendermint/src/lite/verifier.rs
index d01de0fb2..3f4e0b87d 100644
--- a/tendermint/src/lite/verifier.rs
+++ b/tendermint/src/lite/verifier.rs
@@ -380,9 +380,9 @@ mod tests {
     }
 
     fn json_hash<T: ?Sized + Serialize>(value: &T) -> Hash {
-        let encoded = serde_json::to_vec(value).unwrap();
+        let encoded = serde_json::to_vec(value).expect("Hash serialization failed");
         let hashed = Sha256::digest(&encoded);
-        Hash::new(Algorithm::Sha256, &hashed).unwrap()
+        Hash::new(Algorithm::Sha256, &hashed).expect("unable to create Hash")
     }
 
     // vals are just ints, each has power 1
@@ -660,6 +660,7 @@ mod tests {
         assert_err(ts, vec![0, 3, 4, 5], vec![None, S3, S4, S5], err);
     }
 
+    #[allow(clippy::result_unwrap_used)]
     fn fixed_hash() -> Hash {
         Hash::new(Algorithm::Sha256, &Sha256::digest(&[5])).unwrap()
     }
diff --git a/tendermint/src/merkle.rs b/tendermint/src/merkle.rs
index 2e3a6fde3..f48488eec 100644
--- a/tendermint/src/merkle.rs
+++ b/tendermint/src/merkle.rs
@@ -98,6 +98,7 @@ mod tests {
         assert_eq!(get_split_point(257), 256);
     }
 
+    #[allow(clippy::result_unwrap_used)]
     #[test]
     fn test_rfc6962_empty_leaf() {
         let empty_leaf_root_hex =
@@ -109,6 +110,7 @@ mod tests {
         assert_eq!(empty_leaf_root, &root);
     }
 
+    #[allow(clippy::result_unwrap_used)]
     #[test]
     fn test_rfc6962_leaf() {
         let leaf_root_hex = "395aa064aa4c29f7010acfe3f25db9485bbd4b91897b6ad7ad547639252b4d56";
@@ -121,6 +123,7 @@ mod tests {
         assert_eq!(leaf_root, &root);
     }
 
+    #[allow(clippy::result_unwrap_used)]
     #[test]
     fn test_rfc6962_node() {
         let node_hash_hex = "aa217fe888e47007fa15edab33c2b492a722cb106c64667fc2b044444de66bbb";
diff --git a/tendermint/src/net.rs b/tendermint/src/net.rs
index b788e3b40..d6a9ade0a 100644
--- a/tendermint/src/net.rs
+++ b/tendermint/src/net.rs
@@ -141,6 +141,7 @@ mod tests {
     const EXAMPLE_TCP_ADDR: &str =
         "tcp://abd636b766dcefb5322d8ca40011ec2cb35efbc2@35.192.61.41:26656";
 
+    #[allow(clippy::result_unwrap_used)]
     #[test]
     fn parse_tcp_addr() {
         let tcp_addr_without_prefix = &EXAMPLE_TCP_ADDR[TCP_PREFIX.len()..];
diff --git a/tendermint/src/private_key.rs b/tendermint/src/private_key.rs
index 060ddda2b..c15d00c53 100644
--- a/tendermint/src/private_key.rs
+++ b/tendermint/src/private_key.rs
@@ -47,7 +47,7 @@ impl Ed25519Keypair {
         let seed = ed25519::Seed::from_keypair(&self.0[..]).expect("unable to extract Seed");
         let pk = signatory_dalek::Ed25519Signer::from(&seed)
             .public_key()
-            .unwrap();
+            .expect("unable to get public key");
 
         PublicKey::from(pk)
     }
@@ -91,7 +91,7 @@ impl<'de> Deserialize<'de> for Ed25519Keypair {
 impl Serialize for Ed25519Keypair {
     fn serialize<S: ser::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
         String::from_utf8(Base64::default().encode(&self.0[..]))
-            .unwrap()
+            .expect("private key string encoding failed")
             .serialize(serializer)
     }
 }
diff --git a/tendermint/src/public_key.rs b/tendermint/src/public_key.rs
index e08e477c3..2f1122f58 100644
--- a/tendermint/src/public_key.rs
+++ b/tendermint/src/public_key.rs
@@ -85,7 +85,8 @@ impl PublicKey {
 
     /// Serialize this key as hexadecimal
     pub fn to_hex(self) -> String {
-        String::from_utf8(hex::encode_upper(self.to_amino_bytes())).unwrap()
+        String::from_utf8(hex::encode_upper(self.to_amino_bytes()))
+            .expect("public key encoding to hex failed")
     }
 }
 
@@ -198,7 +199,7 @@ where
     S: Serializer,
 {
     String::from_utf8(base64::encode(pk.as_bytes()))
-        .unwrap()
+        .expect("public key string encoding failed")
         .serialize(serializer)
 }
 
@@ -211,7 +212,7 @@ where
     S: Serializer,
 {
     String::from_utf8(base64::encode(pk.as_bytes()))
-        .unwrap()
+        .expect("public key string encoding failed")
         .serialize(serializer)
 }
 
@@ -250,6 +251,7 @@ mod tests {
     const EXAMPLE_CONSENSUS_KEY: &str =
         "4A25C6640A1F72B9C975338294EF51B6D1C33158BB6ECBA69FBC3FB5A33C9DCE";
 
+    #[allow(clippy::result_unwrap_used)]
     #[test]
     fn test_consensus_serialization() {
         let example_key = TendermintKey::ConsensusKey(
@@ -266,6 +268,7 @@ mod tests {
     const EXAMPLE_ACCOUNT_KEY: &str =
         "02A1633CAFCC01EBFB6D78E39F687A1F0995C62FC95F51EAD10A02EE0BE551B5DC";
 
+    #[allow(clippy::result_unwrap_used)]
     #[test]
     fn test_account_serialization() {
         let example_key = TendermintKey::AccountKey(
@@ -279,6 +282,7 @@ mod tests {
         );
     }
 
+    #[allow(clippy::result_unwrap_used)]
     #[test]
     fn json_parsing() {
         let json_string = "{\"type\":\"tendermint/PubKeyEd25519\",\"value\":\"RblzMO4is5L1hZz6wo4kPbptzOyue6LTk4+lPhD1FRk=\"}";
diff --git a/tendermint/src/rpc/client.rs b/tendermint/src/rpc/client.rs
index 8fd8d08c8..34cc7ab59 100644
--- a/tendermint/src/rpc/client.rs
+++ b/tendermint/src/rpc/client.rs
@@ -178,12 +178,15 @@ impl Client {
 
         {
             let headers = request.headers_mut();
-            headers.insert(header::CONTENT_TYPE, "application/json".parse().unwrap());
+            headers.insert(
+                header::CONTENT_TYPE,
+                "application/json".parse().expect("MIME type parse failed"),
+            );
             headers.insert(
                 header::USER_AGENT,
                 format!("tendermint.rs/{}", env!("CARGO_PKG_VERSION"))
                     .parse()
-                    .unwrap(),
+                    .expect("UA version formatting failed"),
             );
         }
 
diff --git a/tendermint/src/rpc/endpoint/abci_info.rs b/tendermint/src/rpc/endpoint/abci_info.rs
index b88be5fb8..92fe3cc82 100644
--- a/tendermint/src/rpc/endpoint/abci_info.rs
+++ b/tendermint/src/rpc/endpoint/abci_info.rs
@@ -62,6 +62,6 @@ where
     S: Serializer,
 {
     String::from_utf8(base64::encode(hash.as_bytes()))
-        .unwrap()
+        .expect("Hash conversion to string failed")
         .serialize(serializer)
 }
diff --git a/tendermint/src/rpc/request.rs b/tendermint/src/rpc/request.rs
index e74b75068..3a7f98823 100644
--- a/tendermint/src/rpc/request.rs
+++ b/tendermint/src/rpc/request.rs
@@ -14,7 +14,8 @@ pub trait Request: Debug + DeserializeOwned + Serialize + Sized {
 
     /// Serialize this request as JSON
     fn into_json(self) -> String {
-        serde_json::to_string_pretty(&Wrapper::new(self)).unwrap()
+        serde_json::to_string_pretty(&Wrapper::new(self))
+            .expect("request conversion into JSON failed")
     }
 }
 
diff --git a/tendermint/src/signature.rs b/tendermint/src/signature.rs
index 6f5fd394c..46871a67f 100644
--- a/tendermint/src/signature.rs
+++ b/tendermint/src/signature.rs
@@ -49,7 +49,7 @@ impl<'de> Deserialize<'de> for Signature {
 impl Serialize for Signature {
     fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
         String::from_utf8(base64::encode(self.as_ref()))
-            .unwrap()
+            .expect("signature string conversion failed")
             .serialize(serializer)
     }
 }
diff --git a/tendermint/src/time.rs b/tendermint/src/time.rs
index 571284403..794b3e681 100644
--- a/tendermint/src/time.rs
+++ b/tendermint/src/time.rs
@@ -87,7 +87,8 @@ impl From<SystemTime> for Time {
 #[allow(clippy::fallible_impl_from)]
 impl From<Time> for SystemTime {
     fn from(t: Time) -> Self {
-        t.to_system_time().unwrap()
+        t.to_system_time()
+            .expect("conversion to system time failed")
     }
 }
 
diff --git a/tendermint/src/timeout.rs b/tendermint/src/timeout.rs
index 028575bd5..6ee034586 100644
--- a/tendermint/src/timeout.rs
+++ b/tendermint/src/timeout.rs
@@ -87,12 +87,14 @@ mod tests {
     use super::Timeout;
     use crate::ErrorKind;
 
+    #[allow(clippy::result_unwrap_used)]
     #[test]
     fn parse_seconds() {
         let timeout = "123s".parse::<Timeout>().unwrap();
         assert_eq!(timeout.as_secs(), 123);
     }
 
+    #[allow(clippy::result_unwrap_used)]
     #[test]
     fn parse_milliseconds() {
         let timeout = "123ms".parse::<Timeout>().unwrap();
diff --git a/tendermint/src/validator.rs b/tendermint/src/validator.rs
index 367757eac..792c9c4eb 100644
--- a/tendermint/src/validator.rs
+++ b/tendermint/src/validator.rs
@@ -244,6 +244,7 @@ mod tests {
     }
 
     #[allow(clippy::option_unwrap_used)]
+    #[allow(clippy::result_unwrap_used)]
     #[test]
     fn test_validator_set() {
         // test vector generated by Go code

From 255ba11f95333609f7920a9625fb3938c665c6fc Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Sat, 18 Jan 2020 17:04:54 +0100
Subject: [PATCH 45/55] Rework use of unreachable

---
 tendermint/src/config/node_key.rs |  3 ++-
 tendermint/src/lib.rs             |  2 +-
 tendermint/src/timeout.rs         | 19 +++++++++++++------
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/tendermint/src/config/node_key.rs b/tendermint/src/config/node_key.rs
index bd9d8f918..77926fff6 100644
--- a/tendermint/src/config/node_key.rs
+++ b/tendermint/src/config/node_key.rs
@@ -42,11 +42,12 @@ impl NodeKey {
         }
     }
 
+    // TODO(xla): Should return a Result or be implemented for all variants.
     /// Get node ID for this keypair
     pub fn node_id(&self) -> node::Id {
         match &self.public_key() {
             PublicKey::Ed25519(key) => node::Id::from(*key),
-            _ => unreachable!(),
+            PublicKey::Secp256k1(_pk) => unimplemented!(),
         }
     }
 }
diff --git a/tendermint/src/lib.rs b/tendermint/src/lib.rs
index db44bb9bd..01a23c840 100644
--- a/tendermint/src/lib.rs
+++ b/tendermint/src/lib.rs
@@ -34,7 +34,7 @@
     clippy::option_expect_used,
     clippy::result_expect_used
 )]
-#![deny(clippy::result_unwrap_used)]
+#![deny(clippy::unreachable)]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/tendermint/kms/master/img/tendermint.png",
     html_root_url = "https://docs.rs/tendermint/0.11.0"
diff --git a/tendermint/src/timeout.rs b/tendermint/src/timeout.rs
index 6ee034586..4ed371a90 100644
--- a/tendermint/src/timeout.rs
+++ b/tendermint/src/timeout.rs
@@ -32,6 +32,11 @@ impl FromStr for Timeout {
     type Err = Error;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
+        enum Unit {
+            Milliseconds,
+            Seconds,
+        }
+
         // Timeouts are either 'ms' or 's', and should always end with 's'
         if s.len() < 2 || !s.ends_with('s') {
             return Err(err!(ErrorKind::Parse, "invalid units"));
@@ -39,21 +44,23 @@ impl FromStr for Timeout {
 
         #[allow(clippy::wildcard_enum_match_arm)]
         let units = match s.chars().nth(s.len() - 2) {
-            Some('m') => "ms",
-            Some('0'..='9') => "s",
+            Some('m') => Unit::Milliseconds,
+            Some('0'..='9') => Unit::Seconds,
             _ => return Err(err!(ErrorKind::Parse, "invalid units")),
         };
 
-        let numeric_part = s.chars().take(s.len() - units.len()).collect::<String>();
+        let numeric_part = match units {
+            Unit::Milliseconds => s.chars().take(s.len() - "ms".len()).collect::<String>(),
+            Unit::Seconds => s.chars().take(s.len() - "s".len()).collect::<String>(),
+        };
 
         let numeric_value = numeric_part
             .parse::<u64>()
             .map_err(|e| err!(ErrorKind::Parse, e))?;
 
         let duration = match units {
-            "s" => Duration::from_secs(numeric_value),
-            "ms" => Duration::from_millis(numeric_value),
-            _ => unreachable!(),
+            Unit::Milliseconds => Duration::from_millis(numeric_value),
+            Unit::Seconds => Duration::from_secs(numeric_value),
         };
 
         Ok(Self(duration))

From 3dbd0d813d7c3a7c3c915bdb47e475384cce77f7 Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Sat, 18 Jan 2020 18:27:50 +0100
Subject: [PATCH 46/55] Remove use of panic

---
 tendermint/src/amino_types/ed25519.rs | 2 +-
 tendermint/src/lib.rs                 | 2 +-
 tendermint/src/merkle.rs              | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/tendermint/src/amino_types/ed25519.rs b/tendermint/src/amino_types/ed25519.rs
index 7fc347b93..8555caba1 100644
--- a/tendermint/src/amino_types/ed25519.rs
+++ b/tendermint/src/amino_types/ed25519.rs
@@ -38,7 +38,7 @@ impl From<PublicKey> for PubKeyResponse {
             PublicKey::Ed25519(ref pk) => Self {
                 pub_key_ed25519: pk.as_bytes().to_vec(),
             },
-            PublicKey::Secp256k1(_) => panic!("secp256k1 PubKeyResponse unimplemented"),
+            PublicKey::Secp256k1(_) => unimplemented!(),
         }
     }
 }
diff --git a/tendermint/src/lib.rs b/tendermint/src/lib.rs
index 01a23c840..2970371ce 100644
--- a/tendermint/src/lib.rs
+++ b/tendermint/src/lib.rs
@@ -34,7 +34,7 @@
     clippy::option_expect_used,
     clippy::result_expect_used
 )]
-#![deny(clippy::unreachable)]
+#![deny(clippy::panic)]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/tendermint/kms/master/img/tendermint.png",
     html_root_url = "https://docs.rs/tendermint/0.11.0"
diff --git a/tendermint/src/merkle.rs b/tendermint/src/merkle.rs
index f48488eec..d4430c932 100644
--- a/tendermint/src/merkle.rs
+++ b/tendermint/src/merkle.rs
@@ -30,7 +30,10 @@ fn simple_hash_from_byte_slices_inner(byte_slices: &[Vec<u8>]) -> Hash {
     }
 }
 
+// TODO(xla): Rework into returning a Result and propagate errors. Great fit in the context of
+// https://github.com/interchainio/tendermint-rs/issues/73.
 /// Returns the largest power of 2 less than length.
+#[allow(clippy::panic)]
 fn get_split_point(length: usize) -> usize {
     match length {
         0 => panic!("tree is empty!"),

From dd405fa6eb0d47e40186dc2ff024ef10e10de3ea Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Mon, 20 Jan 2020 08:33:07 +0100
Subject: [PATCH 47/55] Remove bare panics

---
 tendermint/src/amino_types/ed25519.rs  | 14 +++++---------
 tendermint/src/amino_types/proposal.rs | 10 +++-------
 tendermint/src/amino_types/vote.rs     |  8 ++------
 tendermint/src/consensus/state.rs      |  1 +
 tendermint/src/lib.rs                  |  7 +------
 tendermint/src/lite/verifier.rs        |  2 ++
 6 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/tendermint/src/amino_types/ed25519.rs b/tendermint/src/amino_types/ed25519.rs
index 8555caba1..6a4f5e887 100644
--- a/tendermint/src/amino_types/ed25519.rs
+++ b/tendermint/src/amino_types/ed25519.rs
@@ -43,11 +43,11 @@ impl From<PublicKey> for PubKeyResponse {
     }
 }
 
+#[allow(clippy::result_unwrap_used)]
 #[cfg(test)]
 mod tests {
     use super::*;
     use prost::Message;
-    use std::error::Error;
 
     #[test]
     fn test_empty_pubkey_msg() {
@@ -88,10 +88,8 @@ mod tests {
 
         assert_eq!(got, want);
 
-        match PubKeyRequest::decode(&want) {
-            Ok(have) => assert_eq!(have, msg),
-            Err(err) => panic!(err.description().to_string()),
-        }
+        let have = PubKeyRequest::decode(&want).unwrap();
+        assert_eq!(have, msg);
     }
 
     #[test]
@@ -130,10 +128,8 @@ mod tests {
 
         assert_eq!(got, encoded);
 
-        match PubKeyResponse::decode(&encoded) {
-            Ok(have) => assert_eq!(have, msg),
-            Err(err) => panic!(err),
-        }
+        let have = PubKeyResponse::decode(&encoded).unwrap();
+        assert_eq!(have, msg);
     }
 
     #[test]
diff --git a/tendermint/src/amino_types/proposal.rs b/tendermint/src/amino_types/proposal.rs
index 58199e045..08e07c4b1 100644
--- a/tendermint/src/amino_types/proposal.rs
+++ b/tendermint/src/amino_types/proposal.rs
@@ -188,15 +188,14 @@ impl ConsensusMessage for Proposal {
     }
 }
 
+#[allow(clippy::result_unwrap_used)]
 #[cfg(test)]
 mod tests {
     use super::*;
     use crate::amino_types::block_id::PartsSetHeader;
     use chrono::{DateTime, Utc};
     use prost::Message;
-    use std::error::Error;
 
-    #[allow(clippy::result_unwrap_used)]
     #[test]
     fn test_serialization() {
         let dt = "2018-02-11T07:09:22.765Z".parse::<DateTime<Utc>>().unwrap();
@@ -256,7 +255,6 @@ mod tests {
         assert_eq!(got, want)
     }
 
-    #[allow(clippy::result_unwrap_used)]
     #[test]
     fn test_deserialization() {
         let dt = "2018-02-11T07:09:22.765Z".parse::<DateTime<Utc>>().unwrap();
@@ -293,9 +291,7 @@ mod tests {
             242, 227, 236, 2,
         ];
 
-        match SignProposalRequest::decode(&data) {
-            Ok(have) => assert_eq!(have, want),
-            Err(err) => panic!(err.description().to_string()),
-        }
+        let have = SignProposalRequest::decode(&data).unwrap();
+        assert_eq!(have, want);
     }
 }
diff --git a/tendermint/src/amino_types/vote.rs b/tendermint/src/amino_types/vote.rs
index d3a6d65c7..cfe229ed4 100644
--- a/tendermint/src/amino_types/vote.rs
+++ b/tendermint/src/amino_types/vote.rs
@@ -494,11 +494,7 @@ mod tests {
             signature: vec![],
         };
         let want = SignVoteRequest { vote: Some(vote) };
-        match SignVoteRequest::decode(&encoded) {
-            Ok(have) => {
-                assert_eq!(have, want);
-            }
-            Err(err) => panic!(err.to_string()),
-        }
+        let have = SignVoteRequest::decode(&encoded).unwrap();
+        assert_eq!(have, want);
     }
 }
diff --git a/tendermint/src/consensus/state.rs b/tendermint/src/consensus/state.rs
index 8033965ab..640cedbc6 100644
--- a/tendermint/src/consensus/state.rs
+++ b/tendermint/src/consensus/state.rs
@@ -66,6 +66,7 @@ impl PartialOrd for State {
     }
 }
 
+#[allow(clippy::panic)]
 #[cfg(test)]
 mod tests {
     use super::State;
diff --git a/tendermint/src/lib.rs b/tendermint/src/lib.rs
index 2970371ce..d2c823af5 100644
--- a/tendermint/src/lib.rs
+++ b/tendermint/src/lib.rs
@@ -19,7 +19,7 @@
     clippy::pedantic,
     clippy::restriction
 )]
-#![deny(clippy::option_unwrap_used)]
+#![deny(clippy::panic)]
 // TODO(xla): Review all uses of expect and try to rework into proper error handling, this crate
 // should ideally never panic.
 #![allow(
@@ -34,18 +34,13 @@
     clippy::option_expect_used,
     clippy::result_expect_used
 )]
-#![deny(clippy::panic)]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/tendermint/kms/master/img/tendermint.png",
     html_root_url = "https://docs.rs/tendermint/0.11.0"
 )]
 
-// NOTE(EB): can't figure out how to easily remove the extern crate per Rust2018 upgrade ...
-#[allow(unused_extern_crates)]
 extern crate prost_amino as prost;
 
-// NOTE(EB): can't figure out how to easily remove the extern crate per Rust2018 upgrade ...
-#[allow(unused_extern_crates)]
 #[macro_use]
 extern crate prost_amino_derive as prost_derive;
 
diff --git a/tendermint/src/lite/verifier.rs b/tendermint/src/lite/verifier.rs
index 3f4e0b87d..cddc9a77f 100644
--- a/tendermint/src/lite/verifier.rs
+++ b/tendermint/src/lite/verifier.rs
@@ -334,6 +334,8 @@ where
     _verify_and_update_bisection(untrusted_height, trust_threshold, req, store)
 }
 
+#[allow(clippy::panic)]
+#[cfg(test)]
 mod tests {
     use super::*;
     use crate::{hash::Algorithm, Hash};

From e90bc89c264c7db46618b27af6a70c03c7d7a604 Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Mon, 20 Jan 2020 08:55:38 +0100
Subject: [PATCH 48/55] Remove needles pass by value

---
 tendermint/src/block/header.rs | 2 +-
 tendermint/src/lib.rs          | 2 +-
 tendermint/src/merkle.rs       | 8 ++++----
 tendermint/src/validator.rs    | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tendermint/src/block/header.rs b/tendermint/src/block/header.rs
index ca12c244c..1eea3412b 100644
--- a/tendermint/src/block/header.rs
+++ b/tendermint/src/block/header.rs
@@ -125,7 +125,7 @@ impl lite::Header for Header {
         fields_bytes.push(self.evidence_hash.as_ref().map_or(vec![], encode_hash));
         fields_bytes.push(bytes_enc(self.proposer_address.as_bytes()));
 
-        Hash::Sha256(simple_hash_from_byte_vectors(fields_bytes))
+        Hash::Sha256(simple_hash_from_byte_vectors(&fields_bytes))
     }
 }
 
diff --git a/tendermint/src/lib.rs b/tendermint/src/lib.rs
index d2c823af5..b7d0d0142 100644
--- a/tendermint/src/lib.rs
+++ b/tendermint/src/lib.rs
@@ -19,7 +19,7 @@
     clippy::pedantic,
     clippy::restriction
 )]
-#![deny(clippy::panic)]
+#![deny(clippy::needless_pass_by_value)]
 // TODO(xla): Review all uses of expect and try to rework into proper error handling, this crate
 // should ideally never panic.
 #![allow(
diff --git a/tendermint/src/merkle.rs b/tendermint/src/merkle.rs
index d4430c932..891a162f5 100644
--- a/tendermint/src/merkle.rs
+++ b/tendermint/src/merkle.rs
@@ -11,8 +11,8 @@ pub type Hash = [u8; HASH_SIZE];
 /// Compute a simple Merkle root from vectors of arbitrary byte vectors.
 /// The leaves of the tree are the bytes of the given byte vectors in
 /// the given order.
-pub fn simple_hash_from_byte_vectors(byte_vecs: Vec<Vec<u8>>) -> Hash {
-    simple_hash_from_byte_slices_inner(byte_vecs.as_slice())
+pub fn simple_hash_from_byte_vectors(byte_vecs: &[Vec<u8>]) -> Hash {
+    simple_hash_from_byte_slices_inner(byte_vecs)
 }
 
 /// Recurse into subtrees.
@@ -109,7 +109,7 @@ mod tests {
         let empty_leaf_root = &hex::decode(empty_leaf_root_hex).unwrap();
         let empty_tree: Vec<Vec<u8>> = vec![vec![]; 1];
 
-        let root = simple_hash_from_byte_vectors(empty_tree);
+        let root = simple_hash_from_byte_vectors(&empty_tree);
         assert_eq!(empty_leaf_root, &root);
     }
 
@@ -122,7 +122,7 @@ mod tests {
         let leaf_root = &hex::decode(leaf_root_hex).unwrap();
         let leaf_tree: Vec<Vec<u8>> = vec![leaf_string.as_bytes().to_vec(); 1];
 
-        let root = simple_hash_from_byte_vectors(leaf_tree);
+        let root = simple_hash_from_byte_vectors(&leaf_tree);
         assert_eq!(leaf_root, &root);
     }
 
diff --git a/tendermint/src/validator.rs b/tendermint/src/validator.rs
index 792c9c4eb..8ff7d0d00 100644
--- a/tendermint/src/validator.rs
+++ b/tendermint/src/validator.rs
@@ -43,7 +43,7 @@ impl lite::ValidatorSet for Set {
     /// Compute the Merkle root of the validator set
     fn hash(&self) -> Hash {
         let validator_bytes: Vec<Vec<u8>> = self.validators.iter().map(Info::hash_bytes).collect();
-        Hash::Sha256(merkle::simple_hash_from_byte_vectors(validator_bytes))
+        Hash::Sha256(merkle::simple_hash_from_byte_vectors(&validator_bytes))
     }
 
     fn total_power(&self) -> u64 {

From 2b9b69957cdfce8d8cbc96eb64a2428be81bb6d3 Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Mon, 20 Jan 2020 08:59:10 +0100
Subject: [PATCH 49/55] Replace explicit iter calls

---
 tendermint/src/lib.rs           | 2 +-
 tendermint/src/lite/verifier.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tendermint/src/lib.rs b/tendermint/src/lib.rs
index b7d0d0142..9330767f9 100644
--- a/tendermint/src/lib.rs
+++ b/tendermint/src/lib.rs
@@ -19,7 +19,7 @@
     clippy::pedantic,
     clippy::restriction
 )]
-#![deny(clippy::needless_pass_by_value)]
+#![deny(clippy::explicit_iter_loop)]
 // TODO(xla): Review all uses of expect and try to rework into proper error handling, this crate
 // should ideally never panic.
 #![allow(
diff --git a/tendermint/src/lite/verifier.rs b/tendermint/src/lite/verifier.rs
index cddc9a77f..3bb975c2d 100644
--- a/tendermint/src/lite/verifier.rs
+++ b/tendermint/src/lite/verifier.rs
@@ -443,9 +443,9 @@ mod tests {
             // we only care about the Somes.
             // if there's a signer thats not in the val set,
             // we can't detect it...
-            for signer_opt in self.vals.iter() {
+            for signer_opt in &self.vals {
                 if let Some(signer) = signer_opt {
-                    for val in vals.vals.iter() {
+                    for val in &vals.vals {
                         if signer == val {
                             power += 1
                         }

From 99e323c985e37a837a8a987df6e1e5bf51fb9286 Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Mon, 20 Jan 2020 09:02:02 +0100
Subject: [PATCH 50/55] Remove needless borrows

---
 tendermint/src/block/signed_header.rs | 2 +-
 tendermint/src/chain/id.rs            | 2 +-
 tendermint/src/lib.rs                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tendermint/src/block/signed_header.rs b/tendermint/src/block/signed_header.rs
index 04904b408..471d8c58d 100644
--- a/tendermint/src/block/signed_header.rs
+++ b/tendermint/src/block/signed_header.rs
@@ -22,7 +22,7 @@ impl lite::SignedHeader for SignedHeader {
     }
 
     fn commit(&self) -> &Self {
-        &self
+        self
     }
 }
 
diff --git a/tendermint/src/chain/id.rs b/tendermint/src/chain/id.rs
index 16b6c04cd..82f9d0301 100644
--- a/tendermint/src/chain/id.rs
+++ b/tendermint/src/chain/id.rs
@@ -33,7 +33,7 @@ impl Id {
 
     /// Get the chain ID as a raw bytes.
     pub fn as_bytes(&self) -> &[u8] {
-        &self.as_str().as_bytes()
+        self.as_str().as_bytes()
     }
 }
 
diff --git a/tendermint/src/lib.rs b/tendermint/src/lib.rs
index 9330767f9..8985ebbb3 100644
--- a/tendermint/src/lib.rs
+++ b/tendermint/src/lib.rs
@@ -19,7 +19,7 @@
     clippy::pedantic,
     clippy::restriction
 )]
-#![deny(clippy::explicit_iter_loop)]
+#![deny(clippy::needless_borrow)]
 // TODO(xla): Review all uses of expect and try to rework into proper error handling, this crate
 // should ideally never panic.
 #![allow(

From 77509865c4281e0f15c5f9be503d2318a991b271 Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Mon, 20 Jan 2020 09:23:38 +0100
Subject: [PATCH 51/55] Address cast possible wrap

---
 tendermint/src/amino_types/block_id.rs |  8 +++++++-
 tendermint/src/amino_types/ed25519.rs  |  2 +-
 tendermint/src/amino_types/proposal.rs |  4 ++--
 tendermint/src/amino_types/time.rs     |  6 +++---
 tendermint/src/amino_types/vote.rs     | 14 ++++++++------
 tendermint/src/block/height.rs         |  6 ------
 tendermint/src/config/node_key.rs      |  1 +
 tendermint/src/lib.rs                  |  3 +--
 8 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/tendermint/src/amino_types/block_id.rs b/tendermint/src/amino_types/block_id.rs
index 673e40c3b..c48967e58 100644
--- a/tendermint/src/amino_types/block_id.rs
+++ b/tendermint/src/amino_types/block_id.rs
@@ -6,6 +6,7 @@ use crate::{
     hash,
     hash::{Hash, SHA256_HASH_SIZE},
 };
+use std::convert::TryFrom;
 
 #[derive(Clone, PartialEq, Message)]
 pub struct BlockId {
@@ -93,9 +94,14 @@ impl PartsSetHeader {
     }
 }
 
+// TODO(xla): Rework into TryFrom.
+#[allow(clippy::fallible_impl_from)]
 impl From<&parts::Header> for PartsSetHeader {
     fn from(parts: &parts::Header) -> Self {
-        Self::new(parts.total as i64, parts.hash.as_bytes().to_vec())
+        Self::new(
+            i64::try_from(parts.total).expect("overflow"),
+            parts.hash.as_bytes().to_vec(),
+        )
     }
 }
 
diff --git a/tendermint/src/amino_types/ed25519.rs b/tendermint/src/amino_types/ed25519.rs
index 6a4f5e887..26ab1e296 100644
--- a/tendermint/src/amino_types/ed25519.rs
+++ b/tendermint/src/amino_types/ed25519.rs
@@ -31,7 +31,7 @@ impl From<PubKeyResponse> for PublicKey {
 }
 
 // TODO(xla): Either complete implementation or convert to TryFrom.
-#[allow(clippy::fallible_impl_from)]
+#[allow(clippy::fallible_impl_from, clippy::unimplemented)]
 impl From<PublicKey> for PubKeyResponse {
     fn from(public_key: PublicKey) -> Self {
         match public_key {
diff --git a/tendermint/src/amino_types/proposal.rs b/tendermint/src/amino_types/proposal.rs
index 08e07c4b1..df2f63713 100644
--- a/tendermint/src/amino_types/proposal.rs
+++ b/tendermint/src/amino_types/proposal.rs
@@ -201,7 +201,7 @@ mod tests {
         let dt = "2018-02-11T07:09:22.765Z".parse::<DateTime<Utc>>().unwrap();
         let t = TimeMsg {
             seconds: dt.timestamp(),
-            nanos: dt.timestamp_subsec_nanos() as i32,
+            nanos: i32::try_from(dt.timestamp_subsec_nanos()).expect("overflow"),
         };
         let proposal = Proposal {
             msg_type: SignedMsgType::Proposal.to_u32(),
@@ -260,7 +260,7 @@ mod tests {
         let dt = "2018-02-11T07:09:22.765Z".parse::<DateTime<Utc>>().unwrap();
         let t = TimeMsg {
             seconds: dt.timestamp(),
-            nanos: dt.timestamp_subsec_nanos() as i32,
+            nanos: i32::try_from(dt.timestamp_subsec_nanos()).expect("overflow"),
         };
         let proposal = Proposal {
             msg_type: SignedMsgType::Proposal.to_u32(),
diff --git a/tendermint/src/amino_types/time.rs b/tendermint/src/amino_types/time.rs
index 54c9abe01..f3a6208d3 100644
--- a/tendermint/src/amino_types/time.rs
+++ b/tendermint/src/amino_types/time.rs
@@ -5,6 +5,7 @@ use crate::{
     time::{ParseTimestamp, Time},
 };
 use chrono::{TimeZone, Utc};
+use std::convert::TryFrom;
 use std::time::{Duration, SystemTime, UNIX_EPOCH};
 
 #[derive(Clone, PartialEq, Message)]
@@ -28,12 +29,11 @@ impl ParseTimestamp for Msg {
 #[allow(clippy::fallible_impl_from)]
 impl From<Time> for Msg {
     fn from(ts: Time) -> Self {
-        // TODO: non-panicking method for getting this?
         let duration = ts
             .duration_since(Time::unix_epoch())
             .expect("unable to get duration from epoch");
-        let seconds = duration.as_secs() as i64;
-        let nanos = duration.subsec_nanos() as i32;
+        let seconds = i64::try_from(duration.as_secs()).expect("overflow");
+        let nanos = i32::try_from(duration.subsec_nanos()).expect("overflow");
 
         Self { seconds, nanos }
     }
diff --git a/tendermint/src/amino_types/vote.rs b/tendermint/src/amino_types/vote.rs
index cfe229ed4..69e81a2b6 100644
--- a/tendermint/src/amino_types/vote.rs
+++ b/tendermint/src/amino_types/vote.rs
@@ -50,19 +50,21 @@ impl Vote {
     }
 }
 
+// TODO(xla): Rework into TryFrom.
+#[allow(clippy::fallible_impl_from)]
 impl From<&vote::Vote> for Vote {
     fn from(vote: &vote::Vote) -> Self {
         Self {
             vote_type: vote.vote_type.to_u32(),
-            height: vote.height.value() as i64, // TODO potential overflow :-/
-            round: vote.round as i64,
+            height: i64::try_from(vote.height.value()).expect("overflow"),
+            round: i64::try_from(vote.round).expect("overflow"),
             block_id: Some(BlockId {
                 hash: vote.block_id.hash.as_bytes().to_vec(),
                 parts_header: vote.block_id.parts.as_ref().map(PartsSetHeader::from),
             }),
             timestamp: Some(TimeMsg::from(vote.timestamp)),
             validator_address: vote.validator_address.as_bytes().to_vec(),
-            validator_index: vote.validator_index as i64, // TODO potential overflow :-/
+            validator_index: i64::try_from(vote.validator_index).expect("overflow"),
             signature: vote.signature.as_bytes().to_vec(),
         }
     }
@@ -248,7 +250,7 @@ mod tests {
         let dt = "2017-12-25T03:00:01.234Z".parse::<DateTime<Utc>>().unwrap();
         let t = TimeMsg {
             seconds: dt.timestamp(),
-            nanos: dt.timestamp_subsec_nanos() as i32,
+            nanos: i32::try_from(dt.timestamp_subsec_nanos()).unwrap(),
         };
         let vote = Vote {
             vote_type: SignedMsgType::PreVote.to_u32(),
@@ -416,7 +418,7 @@ mod tests {
         let dt = "2017-12-25T03:00:01.234Z".parse::<DateTime<Utc>>().unwrap();
         let t = TimeMsg {
             seconds: dt.timestamp(),
-            nanos: dt.timestamp_subsec_nanos() as i32,
+            nanos: i32::try_from(dt.timestamp_subsec_nanos()).unwrap(),
         };
         let vote = Vote {
             validator_address: vec![
@@ -472,7 +474,7 @@ mod tests {
         let dt = "2017-12-25T03:00:01.234Z".parse::<DateTime<Utc>>().unwrap();
         let t = TimeMsg {
             seconds: dt.timestamp(),
-            nanos: dt.timestamp_subsec_nanos() as i32,
+            nanos: i32::try_from(dt.timestamp_subsec_nanos()).unwrap(),
         };
         let vote = Vote {
             validator_address: vec![
diff --git a/tendermint/src/block/height.rs b/tendermint/src/block/height.rs
index 5e4cedd09..9aae4fd80 100644
--- a/tendermint/src/block/height.rs
+++ b/tendermint/src/block/height.rs
@@ -69,12 +69,6 @@ impl From<Height> for u64 {
     }
 }
 
-impl From<Height> for i64 {
-    fn from(height: Height) -> Self {
-        height.0 as Self
-    }
-}
-
 impl FromStr for Height {
     type Err = Error;
 
diff --git a/tendermint/src/config/node_key.rs b/tendermint/src/config/node_key.rs
index 77926fff6..6195a963a 100644
--- a/tendermint/src/config/node_key.rs
+++ b/tendermint/src/config/node_key.rs
@@ -44,6 +44,7 @@ impl NodeKey {
 
     // TODO(xla): Should return a Result or be implemented for all variants.
     /// Get node ID for this keypair
+    #[allow(clippy::unimplemented)]
     pub fn node_id(&self) -> node::Id {
         match &self.public_key() {
             PublicKey::Ed25519(key) => node::Id::from(*key),
diff --git a/tendermint/src/lib.rs b/tendermint/src/lib.rs
index 8985ebbb3..6b23004d7 100644
--- a/tendermint/src/lib.rs
+++ b/tendermint/src/lib.rs
@@ -12,14 +12,13 @@
     unused_qualifications,
     warnings
 )]
-#![allow(
+#![deny(
     clippy::all,
     clippy::cargo,
     clippy::nursery,
     clippy::pedantic,
     clippy::restriction
 )]
-#![deny(clippy::needless_borrow)]
 // TODO(xla): Review all uses of expect and try to rework into proper error handling, this crate
 // should ideally never panic.
 #![allow(

From dfb094ae71ff2e4a48558e743826f047ff64d91f Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Mon, 20 Jan 2020 12:37:42 +0100
Subject: [PATCH 52/55] Add documentation for unit enum

---
 tendermint/src/timeout.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tendermint/src/timeout.rs b/tendermint/src/timeout.rs
index 4ed371a90..8f30c9e49 100644
--- a/tendermint/src/timeout.rs
+++ b/tendermint/src/timeout.rs
@@ -33,7 +33,9 @@ impl FromStr for Timeout {
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         enum Unit {
+            // Represents Milliseconds.
             Milliseconds,
+            // Represents Seconds.
             Seconds,
         }
 

From 3ebb516b53d8d6aaf8ff34a5d6bed6370e1daff5 Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Mon, 20 Jan 2020 13:24:43 +0100
Subject: [PATCH 53/55] Add cargo fields to lite crate

---
 tendermint-lite/Cargo.toml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/tendermint-lite/Cargo.toml b/tendermint-lite/Cargo.toml
index 85e388609..9f2832afa 100644
--- a/tendermint-lite/Cargo.toml
+++ b/tendermint-lite/Cargo.toml
@@ -1,10 +1,16 @@
 [package]
-name = "tendermint-lite"
-version = "0.1.0"
-authors = ["Ethan Buchman <ethan@coinculture.info>"]
-edition = "2018"
+name        = "tendermint-lite"
+version     = "0.1.0"
+edition     = "2018"
+license     = "Apache-2.0"
+homepage    = "https://www.tendermint.com/"
+repository  = "https://github.com/interchainio/tendermint-rs/tree/master/lite"
+readme      = "../README.md"
+categories  = ["cryptography", "client"]
+keywords    = ["blockchain", "bft", "consensus", "cosmos", "tendermint"]
+description = "TODO(xla): Add proper description."
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+authors     = ["Ethan Buchman <ethan@coinculture.info>"]
 
 [dependencies]
 tendermint = { path = "../tendermint" }

From 357a79190a84e46e9662fb3ead8e7f44a61c385d Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Mon, 20 Jan 2020 13:34:34 +0100
Subject: [PATCH 54/55] Address lite merge follow-ups

---
 tendermint/src/lite_impl/header.rs        |  4 +++-
 tendermint/src/lite_impl/signed_header.rs |  4 ++--
 tendermint/src/lite_impl/validator_set.rs |  2 +-
 tendermint/src/validator.rs               | 18 ++++++++----------
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/tendermint/src/lite_impl/header.rs b/tendermint/src/lite_impl/header.rs
index 260d85697..092c3e916 100644
--- a/tendermint/src/lite_impl/header.rs
+++ b/tendermint/src/lite_impl/header.rs
@@ -24,6 +24,7 @@ impl lite::Header for block::Header {
         self.next_validators_hash
     }
 
+    // TODO(xla): This is fallabile and therefore should return a Result.
     fn hash(&self) -> Hash {
         // Note that if there is an encoding problem this will
         // panic (as the golang code would):
@@ -60,7 +61,8 @@ impl lite::Header for block::Header {
 
 fn bytes_enc(bytes: &[u8]) -> Vec<u8> {
     let mut chain_id_enc = vec![];
-    prost_amino::encode_length_delimiter(bytes.len(), &mut chain_id_enc).unwrap();
+    prost_amino::encode_length_delimiter(bytes.len(), &mut chain_id_enc)
+        .expect("amino bytes encoding failed");
     chain_id_enc.append(&mut bytes.to_vec());
     chain_id_enc
 }
diff --git a/tendermint/src/lite_impl/signed_header.rs b/tendermint/src/lite_impl/signed_header.rs
index 074ba1421..3b4cfa933 100644
--- a/tendermint/src/lite_impl/signed_header.rs
+++ b/tendermint/src/lite_impl/signed_header.rs
@@ -5,15 +5,15 @@ use crate::validator::Set;
 use crate::{block, hash, lite, vote};
 
 impl lite::SignedHeader for block::signed_header::SignedHeader {
+    type Commit = Self;
     type Header = block::Header;
-    type Commit = block::signed_header::SignedHeader;
 
     fn header(&self) -> &block::Header {
         &self.header
     }
 
     fn commit(&self) -> &Self {
-        &self
+        self
     }
 }
 
diff --git a/tendermint/src/lite_impl/validator_set.rs b/tendermint/src/lite_impl/validator_set.rs
index 8958db110..4a99b86c9 100644
--- a/tendermint/src/lite_impl/validator_set.rs
+++ b/tendermint/src/lite_impl/validator_set.rs
@@ -9,7 +9,7 @@ impl lite::ValidatorSet for validator::Set {
         let validator_bytes: Vec<Vec<u8>> = self
             .validators()
             .iter()
-            .map(|validator| validator.hash_bytes())
+            .map(validator::Info::hash_bytes)
             .collect();
         Hash::Sha256(merkle::simple_hash_from_byte_vectors(&validator_bytes))
     }
diff --git a/tendermint/src/validator.rs b/tendermint/src/validator.rs
index ca42201ec..78bd819b1 100644
--- a/tendermint/src/validator.rs
+++ b/tendermint/src/validator.rs
@@ -32,7 +32,7 @@ impl Set {
     }
 
     /// Get Info of the underlying validators.
-    pub fn validators(&self) -> &Vec<Info> {
+    pub const fn validators(&self) -> &Vec<Info> {
         &self.validators
     }
 
@@ -83,6 +83,13 @@ impl Info {
         }
     }
 
+    /// Returns the bytes to be hashed into the Merkle tree -
+    /// the leaves of the tree. this is an amino encoding of the
+    /// pubkey and voting power, so it includes the pubkey's amino prefix.
+    pub fn hash_bytes(&self) -> Vec<u8> {
+        AminoMessage::bytes_vec(&InfoHashable::from(self))
+    }
+
     /// Return the voting power of the validator.
     pub const fn power(&self) -> u64 {
         self.voting_power.value()
@@ -135,15 +142,6 @@ impl From<&Info> for InfoHashable {
     }
 }
 
-impl Info {
-    /// Returns the bytes to be hashed into the Merkle tree -
-    /// the leaves of the tree. this is an amino encoding of the
-    /// pubkey and voting power, so it includes the pubkey's amino prefix.
-    pub fn hash_bytes(&self) -> Vec<u8> {
-        AminoMessage::bytes_vec(&InfoHashable::from(self))
-    }
-}
-
 /// Proposer priority
 #[derive(Copy, Clone, Debug, Eq, PartialEq, PartialOrd, Ord)]
 pub struct ProposerPriority(i64);

From b2b5db7a38b5855593ccfff06fd8895aea295d37 Mon Sep 17 00:00:00 2001
From: Alexander Simmerl <a.simmerl@gmail.com>
Date: Mon, 20 Jan 2020 13:49:05 +0100
Subject: [PATCH 55/55] Address missing docs

---
 tendermint/src/lite_impl/header.rs | 6 ++++++
 tendermint/src/serializers.rs      | 2 ++
 tendermint/src/timeout.rs          | 5 +++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/tendermint/src/lite_impl/header.rs b/tendermint/src/lite_impl/header.rs
index 092c3e916..11ef12a45 100644
--- a/tendermint/src/lite_impl/header.rs
+++ b/tendermint/src/lite_impl/header.rs
@@ -59,6 +59,8 @@ impl lite::Header for block::Header {
     }
 }
 
+// TODO(xla): Add documentatio.
+#[allow(clippy::missing_docs_in_private_items)]
 fn bytes_enc(bytes: &[u8]) -> Vec<u8> {
     let mut chain_id_enc = vec![];
     prost_amino::encode_length_delimiter(bytes.len(), &mut chain_id_enc)
@@ -67,10 +69,14 @@ fn bytes_enc(bytes: &[u8]) -> Vec<u8> {
     chain_id_enc
 }
 
+// TODO(xla): Add documentatio.
+#[allow(clippy::missing_docs_in_private_items)]
 fn encode_hash(hash: &Hash) -> Vec<u8> {
     bytes_enc(hash.as_bytes())
 }
 
+// TODO(xla): Add documentatio.
+#[allow(clippy::missing_docs_in_private_items)]
 fn encode_varint(val: u64) -> Vec<u8> {
     let mut val_enc = vec![];
     prost_amino::encoding::encode_varint(val, &mut val_enc);
diff --git a/tendermint/src/serializers.rs b/tendermint/src/serializers.rs
index cae56f8f4..cfac21e5f 100644
--- a/tendermint/src/serializers.rs
+++ b/tendermint/src/serializers.rs
@@ -163,12 +163,14 @@ pub(crate) fn parse_non_empty_block_id<'de, D>(
 where
     D: Deserializer<'de>,
 {
+    #[allow(clippy::missing_docs_in_private_items)]
     #[derive(Deserialize)]
     struct Parts {
         #[serde(deserialize_with = "parse_u64")]
         total: u64,
         hash: String,
     }
+    #[allow(clippy::missing_docs_in_private_items)]
     #[derive(Deserialize)]
     struct BlockId {
         hash: String,
diff --git a/tendermint/src/timeout.rs b/tendermint/src/timeout.rs
index 8f30c9e49..619b6fa93 100644
--- a/tendermint/src/timeout.rs
+++ b/tendermint/src/timeout.rs
@@ -32,10 +32,11 @@ impl FromStr for Timeout {
     type Err = Error;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
+        /// Supported units for durations used in conversion.
         enum Unit {
-            // Represents Milliseconds.
+            /// Represents Milliseconds.
             Milliseconds,
-            // Represents Seconds.
+            /// Represents Seconds.
             Seconds,
         }