remove all use std::convert::TryFrom

Author: elpiel

adapter/src/ethereum.rs

@@ -15,7 +15,7 @@ use primitives::{
 use reqwest::Client;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
-use std::{convert::TryFrom, fs, str::FromStr};
+use std::{fs, str::FromStr};
 use thiserror::Error;
 use tiny_keccak::Keccak;
 use web3::{
@@ -502,7 +502,6 @@ mod test {
     use super::*;
     use chrono::Utc;
     use primitives::{config::DEVELOPMENT_CONFIG, util::tests::prep_db::IDS};
-    use std::convert::TryFrom;
     use web3::{transports::Http, Web3};
     use wiremock::{
         matchers::{method, path},

adapter/src/ethereum/test_util.rs

@@ -1,5 +1,5 @@
 use once_cell::sync::Lazy;
-use std::{collections::HashMap, convert::TryFrom, env::current_dir, num::NonZeroU8};
+use std::{collections::HashMap, env::current_dir, num::NonZeroU8};
 use web3::{
     contract::{Contract, Options},
     ethabi::Token,

adapter/src/lib.rs

@@ -71,8 +71,6 @@ pub fn get_balance_leaf(
 
 #[cfg(test)]
 mod test {
-    use std::convert::TryFrom;
-
     use byteorder::{BigEndian, ByteOrder};
     use chrono::{TimeZone, Utc};
 

adview-manager/src/lib.rs

@@ -19,7 +19,6 @@ use slog::{error, Logger};
 use std::{
     cmp::Ordering,
     collections::VecDeque,
-    convert::TryFrom,
     ops::{Add, Mul},
     sync::Arc,
 };

primitives/src/address.rs

@@ -1,6 +1,6 @@
 use hex::{FromHex, FromHexError};
 use serde::{Deserialize, Serialize, Serializer};
-use std::{convert::TryFrom, fmt, str::FromStr};
+use std::{fmt, str::FromStr};
 use thiserror::Error;
 
 use crate::{targeting::Value, DomainError, ToETHChecksum, ToHex};

primitives/src/balances.rs

@@ -1,4 +1,4 @@
-use std::{convert::TryFrom, marker::PhantomData};
+use std::marker::PhantomData;
 
 use crate::{Address, UnifiedMap, UnifiedNum};
 use serde::{de::DeserializeOwned, Deserialize, Serialize};

primitives/src/big_num.rs

@@ -1,5 +1,4 @@
 use std::{
-    convert::TryFrom,
     fmt,
     iter::Sum,
     ops::{Add, AddAssign, Div, Mul, Sub},
@@ -328,8 +327,6 @@ pub mod postgres {
 
     impl<'a> FromSql<'a> for BigNum {
         fn from_sql(ty: &Type, raw: &'a [u8]) -> Result<BigNum, Box<dyn Error + Sync + Send>> {
-            use std::convert::TryInto;
-
             let str_slice = <&str as FromSql>::from_sql(ty, raw)?;
 
             Ok(str_slice.try_into()?)

primitives/src/ipfs.rs

@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use std::{convert::TryFrom, fmt, str::FromStr};
+use std::{fmt, str::FromStr};
 use thiserror::Error;
 
 const URL_PREFIX: &str = "ipfs://";

primitives/src/sentry.rs

@@ -35,7 +35,7 @@ pub struct MessageResponse<T: MessageType> {
 }
 
 pub mod message {
-    use std::{convert::TryFrom, ops::Deref};
+    use std::ops::Deref;
 
     use crate::validator::messages::*;
     use serde::{Deserialize, Serialize};
@@ -609,7 +609,6 @@ mod postgres {
     };
     use bytes::BytesMut;
     use serde::Deserialize;
-    use std::convert::TryFrom;
     use tokio_postgres::{
         types::{accepts, to_sql_checked, IsNull, Json, ToSql, Type},
         Error, Row,

primitives/src/targeting/eval.rs

@@ -2,7 +2,6 @@ use crate::UnifiedNum;
 use serde::{Deserialize, Serialize};
 use serde_json::{value::Value as SerdeValue, Number};
 use std::{
-    convert::TryFrom,
     fmt,
     ops::{Add, Div, Mul, Rem, Sub},
     str::FromStr,

primitives/src/targeting/input/field.rs

@@ -1,6 +1,6 @@
 use parse_display::{Display as DeriveDisplay, FromStr as DeriveFromStr};
 use serde::{Deserialize, Serialize};
-use std::{convert::TryFrom, str::FromStr};
+use std::str::FromStr;
 
 use crate::targeting::Error;
 

primitives/src/unified_num.rs

@@ -7,7 +7,6 @@ use parse_display::{Display, FromStr, ParseError};
 use serde::{Deserialize, Serialize};
 use std::{
     cmp::Ordering,
-    convert::TryFrom,
     fmt,
     iter::Sum,
     ops::{Add, AddAssign, Div, Mul, Sub},
@@ -429,14 +428,10 @@ mod test {
 }
 
 #[cfg(feature = "postgres")]
-// TODO: Test UnifiedNum postgres impl
 mod postgres {
     use super::UnifiedNum;
     use bytes::BytesMut;
-    use std::{
-        convert::{TryFrom, TryInto},
-        error::Error,
-    };
+    use std::error::Error;
     use tokio_postgres::types::{accepts, to_sql_checked, FromSql, IsNull, ToSql, Type};
 
     impl<'a> FromSql<'a> for UnifiedNum {

primitives/src/util/api.rs

@@ -1,4 +1,4 @@
-use std::{convert::TryFrom, fmt, str::FromStr};
+use std::{fmt, str::FromStr};
 
 use parse_display::Display;
 use serde::{Deserialize, Serialize};

primitives/src/util/tests/prep_db.rs

@@ -8,7 +8,7 @@ use crate::{
 use chrono::{TimeZone, Utc};
 use hex::FromHex;
 use once_cell::sync::Lazy;
-use std::{collections::HashMap, convert::TryFrom};
+use std::collections::HashMap;
 
 /// Dummy [`crate::ValidatorId`]s
 pub static IDS: Lazy<HashMap<String, ValidatorId>> = Lazy::new(|| {

primitives/src/validator.rs

@@ -1,5 +1,5 @@
 use serde::{Deserialize, Serialize};
-use std::{borrow::Borrow, convert::TryFrom, fmt, str::FromStr};
+use std::{borrow::Borrow, fmt, str::FromStr};
 
 use crate::{
     address::Error,
@@ -145,7 +145,7 @@ impl<T> Borrow<T> for Validator<T> {
 
 /// Validator Message Types
 pub mod messages {
-    use std::{any::type_name, convert::TryFrom, fmt, marker::PhantomData};
+    use std::{any::type_name, fmt, marker::PhantomData};
     use thiserror::Error;
 
     use crate::balances::{Balances, BalancesState, CheckedState, UncheckedState};
@@ -361,7 +361,6 @@ pub mod postgres {
     use super::ValidatorId;
     use crate::ToETHChecksum;
     use bytes::BytesMut;
-    use std::convert::TryFrom;
     use std::error::Error;
     use tokio_postgres::types::{FromSql, IsNull, ToSql, Type};
 

sentry/src/db/campaign.rs

@@ -499,7 +499,7 @@ mod test {
         },
         EventSubmission, UnifiedNum, ValidatorDesc, ValidatorId,
     };
-    use std::{convert::TryFrom, time::Duration};
+    use std::time::Duration;
     use tokio_postgres::error::SqlState;
 
     use super::*;

sentry/src/db/event_aggregate.rs

@@ -6,7 +6,7 @@ use primitives::{
     validator::{ApproveState, Heartbeat, NewState},
     Address, BigNum, Channel, ChannelId, ValidatorId,
 };
-use std::{convert::TryFrom, ops::Add};
+use std::ops::Add;
 use tokio_postgres::{
     binary_copy::BinaryCopyInWriter,
     types::{ToSql, Type},

sentry/src/main.rs

@@ -17,7 +17,7 @@ use sentry::{
     Application,
 };
 use slog::info;
-use std::{convert::TryFrom, env, net::SocketAddr};
+use std::{env, net::SocketAddr};
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {

sentry/src/middleware/channel.rs

@@ -7,7 +7,6 @@ use futures::future::{BoxFuture, FutureExt};
 use hex::FromHex;
 use hyper::{Body, Request};
 use primitives::{adapter::Adapter, ChannelId, ValidatorId};
-use std::convert::TryFrom;
 
 use async_trait::async_trait;
 

validator_worker/src/follower.rs

@@ -1,4 +1,4 @@
-use std::{collections::HashMap, convert::TryFrom, fmt};
+use std::{collections::HashMap, fmt};
 
 use primitives::{
     adapter::{Adapter, AdapterErrorKind, Error as AdapterError},

validator_worker/src/heartbeat.rs

@@ -1,5 +1,3 @@
-use std::convert::TryFrom;
-
 use chrono::{Duration, Utc};
 
 use adapter::get_signable_state_root;

validator_worker/src/leader.rs

@@ -1,4 +1,3 @@
-use std::convert::TryFrom;
 use thiserror::Error;
 
 use primitives::{

validator_worker/src/main.rs

@@ -1,7 +1,7 @@
 #![deny(rust_2018_idioms)]
 #![deny(clippy::all)]
 
-use std::{convert::TryFrom, error::Error};
+use std::error::Error;
 
 use clap::{crate_version, App, Arg};