Merge remote-tracking branch 'origin/unstable' into tree-states

crypto/bls/src/generic_public_key_bytes.rs

@@ -6,7 +6,6 @@ use serde::de::{Deserialize, Deserializer};
 use serde::ser::{Serialize, Serializer};
 use serde_utils::hex::encode as hex_encode;
 use ssz::{Decode, Encode};
-use std::convert::TryInto;
 use std::fmt;
 use std::hash::{Hash, Hasher};
 use std::marker::PhantomData;

crypto/bls/src/generic_signature_bytes.rs

@@ -7,7 +7,6 @@ use serde::de::{Deserialize, Deserializer};
 use serde::ser::{Serialize, Serializer};
 use serde_utils::hex::encode as hex_encode;
 use ssz::{Decode, Encode};
-use std::convert::TryInto;
 use std::fmt;
 use std::hash::{Hash, Hasher};
 use std::marker::PhantomData;

crypto/bls/src/impls/blst.rs

@@ -11,7 +11,6 @@ use crate::{
 pub use blst::min_pk as blst_core;
 use blst::{blst_scalar, BLST_ERROR};
 use rand::Rng;
-use std::iter::ExactSizeIterator;
 
 pub const DST: &[u8] = b"BLS_SIG_BLS12381G2_XMD:SHA-256_SSWU_RO_POP_";
 pub const RAND_BITS: usize = 64;

crypto/eth2_key_derivation/src/derived_key.rs

@@ -2,7 +2,6 @@ use crate::{lamport_secret_key::LamportSecretKey, secret_bytes::SecretBytes, Zer
 use num_bigint_dig::BigUint;
 use ring::hkdf::{KeyType, Prk, Salt, HKDF_SHA256};
 use sha2::{Digest, Sha256};
-use std::convert::TryFrom;
 use zeroize::Zeroize;
 
 /// The byte size of a SHA256 hash.

crypto/eth2_key_derivation/src/lamport_secret_key.rs

@@ -1,5 +1,4 @@
 use crate::derived_key::{HASH_SIZE, LAMPORT_ARRAY_SIZE};
-use std::iter::Iterator;
 use zeroize::Zeroize;
 
 /// A Lamport secret key as specified in [EIP-2333](https://eips.ethereum.org/EIPS/eip-2333).

crypto/eth2_keystore/src/json_keystore/checksum_module.rs

@@ -6,7 +6,6 @@
 use super::hex_bytes::HexBytes;
 use serde::{Deserialize, Serialize};
 use serde_json::{Map, Value};
-use std::convert::TryFrom;
 
 /// Used for ensuring that serde only decodes valid checksum functions.
 #[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]

crypto/eth2_keystore/src/json_keystore/cipher_module.rs

@@ -5,7 +5,6 @@
 
 use super::hex_bytes::HexBytes;
 use serde::{Deserialize, Serialize};
-use std::convert::TryFrom;
 
 /// Used for ensuring that serde only decodes valid cipher functions.
 #[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]

crypto/eth2_keystore/src/json_keystore/hex_bytes.rs

@@ -1,5 +1,4 @@
 use serde::{Deserialize, Serialize};
-use std::convert::TryFrom;
 
 /// To allow serde to encode/decode byte arrays from HEX ASCII strings.
 #[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]

crypto/eth2_keystore/src/json_keystore/kdf_module.rs

@@ -8,7 +8,6 @@ use crate::DKLEN;
 use hmac::{Hmac, Mac, NewMac};
 use serde::{Deserialize, Serialize};
 use sha2::Sha256;
-use std::convert::TryFrom;
 
 /// KDF module representation.
 #[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]

crypto/eth2_keystore/src/keystore.rs

@@ -23,7 +23,6 @@ use serde::{Deserialize, Serialize};
 use sha2::{Digest, Sha256};
 use std::fs::File;
 use std::io::{Read, Write};
-use std::iter::FromIterator;
 use std::path::Path;
 use std::str;
 use unicode_normalization::UnicodeNormalization;

crypto/eth2_wallet/src/json_wallet/mod.rs

@@ -1,6 +1,5 @@
 use serde::{Deserialize, Serialize};
 use serde_repr::*;
-use std::convert::TryFrom;
 
 pub use eth2_keystore::json_keystore::{
     Aes128Ctr, ChecksumModule, Cipher, CipherModule, Crypto, EmptyMap, EmptyString, Kdf, KdfModule,

crypto/eth2_wallet/src/validator_path.rs

@@ -1,5 +1,4 @@
 use std::fmt;
-use std::iter::Iterator;
 
 pub const PURPOSE: u32 = 12381;
 pub const COIN_TYPE: u32 = 3600;