Merge branch 'master' into new-jsonrpc

rpc/src/v1/helpers/dispatch.rs

@@ -25,7 +25,7 @@ use light::cache::Cache as LightDataCache;
 use light::client::LightChainClient;
 use light::on_demand::{request, OnDemand};
 use light::TransactionQueue as LightTransactionQueue;
-use rlp::{self, Stream as StreamRlp};
+use rlp;
 use util::{Address, H520, H256, U256, Uint, Bytes, Mutex, RwLock};
 use util::sha3::Hashable;
 use stats::Corpus;

rpc/src/v1/helpers/poll_manager.rs

@@ -19,7 +19,7 @@
 use transient_hashmap::{TransientHashMap, Timer, StandardTimer};
 
 /// Lifetime of poll (in seconds).
-const POLL_LIFETIME: u64 = 60;
+const POLL_LIFETIME: u32 = 60;
 
 pub type PollId = usize;
 

rpc/src/v1/helpers/signer.rs

@@ -23,7 +23,7 @@ use ethstore::random_string;
 
 use v1::helpers::signing_queue::{ConfirmationsQueue};
 
-const TOKEN_LIFETIME_SECS: u64 = 3600;
+const TOKEN_LIFETIME_SECS: u32 = 3600;
 
 /// Manages communication with Signer crate
 pub struct SignerService {

rpc/src/v1/impls/signing.rs

@@ -43,7 +43,7 @@ use v1::types::{
 };
 
 /// After 60s entries that are not queried with `check_request` will get garbage collected.
-const MAX_PENDING_DURATION_SEC: u64 = 60;
+const MAX_PENDING_DURATION_SEC: u32 = 60;
 /// Max number of total requests pending and completed, before we start garbage collecting them.
 const MAX_TOTAL_REQUESTS: usize = SIGNING_QUEUE_LIMIT;