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] 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(