Merge pull request #135 from SurfingNerd/cleanup

Cleanup

bin/oe/rpc.rs

@@ -29,7 +29,7 @@ use parity_rpc::{
 };
 use parity_runtime::Executor;
 
-pub use parity_rpc::{HttpServer, IpcServer, RequestMiddleware};
+pub use parity_rpc::{HttpServer, IpcServer};
 //pub use parity_rpc::ws::Server as WsServer;
 pub use parity_rpc::ws::{ws, Server as WsServer};
 

crates/accounts/ethstore/src/account/mod.rs

@@ -23,7 +23,7 @@ mod version;
 pub use self::{
     cipher::{Aes128Ctr, Cipher},
     crypto::Crypto,
-    kdf::{Kdf, Pbkdf2, Prf, Scrypt},
+    kdf::{Kdf, Pbkdf2, Prf},
     safe_account::SafeAccount,
     version::Version,
 };

crates/accounts/ethstore/src/json/mod.rs

@@ -32,13 +32,13 @@ mod version;
 pub use self::{
     bytes::Bytes,
     cipher::{Aes128Ctr, Cipher, CipherSer, CipherSerParams},
-    crypto::{CipherText, Crypto},
+    crypto::Crypto,
     error::Error,
     hash::{H128, H160, H256},
     id::Uuid,
     kdf::{Kdf, KdfSer, KdfSerParams, Pbkdf2, Prf, Scrypt},
     key_file::{KeyFile, OpaqueKeyFile},
-    presale::{Encseed, PresaleWallet},
+    presale::PresaleWallet,
     vault_file::VaultFile,
     vault_key_file::{
         insert_vault_name_to_json_meta, remove_vault_name_from_json_meta, VaultKeyFile,

crates/concensus/ethash/src/keccak.rs

@@ -29,7 +29,5 @@ pub mod keccak_512 {
 pub mod keccak_256 {
     use super::hash;
 
-    pub use self::hash::{
-        keccak256 as inplace, keccak256_range as inplace_range, keccak_256 as write,
-    };
+    pub use self::hash::{keccak256 as inplace, keccak_256 as write};
 }

crates/ethcore/benches/builtin.rs

@@ -50,8 +50,7 @@ impl<'a> BuiltinBenchmark<'a> {
 
         let builtin = builtins
             .get(&H160::from_str(builtin_address).unwrap())
-            .unwrap()
-            .clone();
+            .unwrap();
         let input = FromHex::from_hex(input).unwrap();
         let expected = FromHex::from_hex(expected).unwrap();
 

crates/ethcore/src/engines/hbbft/contracts/keygen_history.rs

@@ -1,8 +1,5 @@
 use client::traits::EngineClient;
-use crypto::{
-    self,
-    publickey::{ec_math_utils::public_add, Public},
-};
+use crypto::{self, publickey::Public};
 use engines::{
     hbbft::{
         contracts::validator_set::{get_validator_pubkeys, ValidatorType},

crates/ethcore/src/engines/hbbft/hbbft_early_epoch_end_manager.rs

@@ -39,8 +39,7 @@ pub(crate) struct HbbftEarlyEpochEndManager {
 
     node_id_to_address: BTreeMap<NodeId, Address>,
 
-    address_to_node_id: BTreeMap<Address, NodeId>,
-
+    // address_to_node_id: BTreeMap<Address, NodeId>,
     signing_address: Address,
 }
 
@@ -109,7 +108,7 @@ impl HbbftEarlyEpochEndManager {
             validators: validators,
             flagged_validators: flagged_validators,
             node_id_to_address,
-            address_to_node_id,
+            // address_to_node_id,
             signing_address: signing_address.clone(),
         };
 

crates/ethcore/src/engines/hbbft/hbbft_engine.rs

@@ -1178,9 +1178,6 @@ impl HoneyBadgerBFT {
                             Err(e) => {
                                 error!(target: "consensus", "Error initializing synckeygen: {:?}", e);
                             }
-                            Err(_) => {
-                                error!(target: "consensus", "Error initializing synckeygen: unknown Error");
-                            }
                         }
                     }
                 }

crates/ethcore/src/engines/hbbft/hbbft_network_fork_manager.rs

@@ -298,17 +298,11 @@ impl HbbftNetworkForkManager {
 #[cfg(test)]
 mod tests {
 
-    use std::{fs, str::FromStr};
-
-    use crate::engines::{hbbft::test::hbbft_test_client::HbbftTestClient, signer::from_keypair};
-
     use super::*;
-    use ethereum_types::Address;
-    use ethjson::spec::hbbft::HbbftNetworkFork;
-    use hbbft::sync_key_gen::{Ack, Part};
-
+    use crate::engines::signer::from_keypair;
     use crypto::publickey::{KeyPair, Secret};
-    //use parity_crypto::publickey::{KeyPair, Secret};
+    use ethjson::spec::hbbft::HbbftNetworkFork;
+    use std::str::FromStr;
 
     #[test]
     fn test_fork_manager_should_fork() {

crates/ethcore/src/engines/hbbft/hbbft_peers_management.rs

@@ -9,12 +9,10 @@ use crate::{
     ethereum::public_key_to_address::public_key_to_address,
 };
 
+use super::{contracts::staking::get_pool_public_key, NodeId};
 use bytes::ToPretty;
-
 use ethereum_types::Address;
 
-use super::{contracts::staking::get_pool_public_key, NodeId};
-
 #[derive(Clone, Debug)]
 struct ValidatorConnectionData {
     // mining_address: Address,

crates/ethcore/src/engines/validator_set/safe_contract.rs

@@ -861,7 +861,7 @@ mod tests {
         use types::{header::Header, log_entry::LogEntry};
 
         let client = generate_dummy_client_with_spec(Spec::new_validator_safe_contract);
-        let engine = client.engine().clone();
+        let engine = client.engine();
         let validator_contract = "0000000000000000000000000000000000000005"
             .parse::<Address>()
             .unwrap();
@@ -900,7 +900,7 @@ mod tests {
         use types::header::Header;
 
         let client = generate_dummy_client_with_spec(Spec::new_validator_safe_contract);
-        let engine = client.engine().clone();
+        let engine = client.engine();
 
         let mut new_header = Header::default();
         new_header.set_number(0); // so the validator set doesn't look for a log

crates/rpc/src/v1/helpers/mod.rs

@@ -40,7 +40,6 @@ mod subscription_manager;
 mod work;
 
 pub use self::{
-    dispatch::{Dispatcher, FullDispatcher},
     network_settings::NetworkSettings,
     poll_filter::{limit_logs, PollFilter, SyncPollFilter},
     poll_manager::PollManager,

crates/rpc/src/v1/tests/mocked/signing.rs

@@ -21,7 +21,7 @@ use v1::{
     helpers::{
         dispatch,
         external_signer::{SignerService, SigningQueue},
-        nonce, FullDispatcher,
+        nonce,
     },
     impls::SigningQueueClient,
     metadata::Metadata,
@@ -30,6 +30,7 @@ use v1::{
     types::{ConfirmationResponse, RichRawTransaction},
 };
 
+use crate::dispatch::FullDispatcher;
 use accounts::AccountProvider;
 use bytes::ToPretty;
 use crypto::publickey::{Generator, Random, Secret};

crates/rpc/src/v1/types/mod.rs

@@ -20,7 +20,7 @@ pub use rpc_common::Bytes;
 
 pub use self::{
     account_info::{AccountInfo, EthAccount, ExtAccountInfo, RecoveredAccount, StorageProof},
-    block::{Block, BlockTransactions, Header, Rich, RichBlock, RichHeader},
+    block::{Block, BlockTransactions, Header, RichBlock, RichHeader},
     block_number::{block_number_to_id, BlockNumber},
     call_request::CallRequest,
     confirmations::{
@@ -40,14 +40,11 @@ pub use self::{
     receipt::Receipt,
     rpc_settings::RpcSettings,
     secretstore::EncryptedDocumentKey,
-    sync::{
-        ChainStatus, EthProtocolInfo, PeerInfo, PeerNetworkInfo, PeerProtocolsInfo, Peers,
-        SyncInfo, SyncStatus, TransactionStats,
-    },
+    sync::{ChainStatus, Peers, SyncInfo, SyncStatus, TransactionStats},
     trace::{LocalizedTrace, TraceResults, TraceResultsWithTransactionHash},
     trace_filter::TraceFilter,
     transaction::{LocalTransactionStatus, RichRawTransaction, Transaction},
-    transaction_access_list::{AccessList, AccessListItem},
+    transaction_access_list::AccessList,
     transaction_condition::TransactionCondition,
     transaction_request::TransactionRequest,
     work::Work,

crates/rpc/src/v1/types/transaction.rs

@@ -360,11 +360,12 @@ impl LocalTransactionStatus {
 
 #[cfg(test)]
 mod tests {
+    use crate::v1::types::transaction_access_list::AccessListItem;
+
     use super::{LocalTransactionStatus, Transaction};
     use ethereum_types::H256;
     use serde_json;
     use types::transaction::TypedTxId;
-    use v1::types::AccessListItem;
 
     #[test]
     fn test_transaction_serialize() {