Update jsonrpc dependencies and rewrite dapps to futures. (#6522)

* Bump version.

* Fix RPC crate.

* Fix BoxFuture in crates.

* Compiles and passes tests!

* Get rid of .boxed()

* Fixing issues with the UI.

* Remove minihttp. Support threads.

* Reimplement files serving to do it in chunks.

* Increase chunk size.

* Remove some unecessary copying.

* Fix tests.

* Fix stratum warning and ipfs todo.

* Switch to proper branch of jsonrpc.

* Update Cargo.lock.

* Update docs.

* Include dapps-glue in workspace.

* fixed merge artifacts

* Fix test compilation.

ethcore/Cargo.toml

@@ -12,15 +12,12 @@ build = "build.rs"
 
 [dependencies]
 ansi_term = "0.9"
-bit-set = "0.4"
 bloomchain = "0.1"
 bn = { git = "https://github.com/paritytech/bn" }
 byteorder = "1.0"
 clippy = { version = "0.0.103", optional = true}
 common-types = { path = "types" }
 crossbeam = "0.2.9"
-env_logger = "0.4"
-ethabi = "2.0"
 ethash = { path = "../ethash" }
 ethcore-bloom-journal = { path = "../util/bloom" }
 ethcore-bytes = { path = "../util/bytes" }
@@ -45,9 +42,9 @@ heapsize = "0.4"
 hyper = { git = "https://github.com/paritytech/hyper", default-features = false }
 itertools = "0.5"
 lazy_static = "0.2"
-linked-hash-map = "0.3.0"
+linked-hash-map = "0.5"
 log = "0.3"
-lru-cache = "0.1.0"
+lru-cache = "0.1"
 native-contracts = { path = "native_contracts" }
 num = "0.1"
 num_cpus = "1.2"
@@ -60,7 +57,6 @@ rlp = { path = "../util/rlp" }
 rlp_derive = { path = "../util/rlp_derive" }
 rust-crypto = "0.2.34"
 rustc-hex = "1.0"
-semver = "0.6"
 stats = { path = "../util/stats" }
 time = "0.1"
 transient-hashmap = "0.4"

ethcore/native_contracts/generator/src/lib.rs

@@ -46,10 +46,12 @@ pub fn generate_module(struct_name: &str, abi: &str) -> Result<String, Error> {
 
 	Ok(format!(r##"
 use byteorder::{{BigEndian, ByteOrder}};
-use futures::{{future, Future, IntoFuture, BoxFuture}};
+use futures::{{future, Future, IntoFuture}};
 use ethabi::{{Contract, Interface, Token, Event}};
 use bigint;
 
+type BoxFuture<A, B> = Box<Future<Item = A, Error = B> + Send>;
+
 /// Generated Rust bindings to an Ethereum contract.
 #[derive(Clone, Debug)]
 pub struct {name} {{
@@ -118,15 +120,14 @@ pub fn {snake_name}<F, U>(&self, call: F, {params}) -> BoxFuture<{output_type},
 
 	let call_future = match function.encode_call({to_tokens}) {{
 		Ok(call_data) => (call)(call_addr, call_data),
-		Err(e) => return future::err(format!("Error encoding call: {{:?}}", e)).boxed(),
+		Err(e) => return Box::new(future::err(format!("Error encoding call: {{:?}}", e))),
 	}};
 
-	call_future
+	Box::new(call_future
 		.into_future()
 		.and_then(move |out| function.decode_output(out).map_err(|e| format!("{{:?}}", e)))
 		.map(Vec::into_iter)
-		.and_then(|mut outputs| {decode_outputs})
-		.boxed()
+		.and_then(|mut outputs| {decode_outputs}))
 }}
 	"##,
 		abi_name = name,

ethcore/src/engines/validator_set/multi.rs

@@ -164,8 +164,6 @@ mod tests {
 
 	#[test]
 	fn uses_current_set() {
-		let _ = ::env_logger::init();
-
 		let tap = Arc::new(AccountProvider::transient_provider());
 		let s0: Secret = keccak("0").into();
 		let v0 = tap.insert_account(s0.clone(), "").unwrap();

ethcore/src/lib.rs

@@ -71,15 +71,12 @@
 //!   cargo build --release
 //!   ```
 
-extern crate bit_set;
 extern crate bloomchain;
 extern crate bn;
 extern crate byteorder;
 extern crate crossbeam;
 extern crate common_types as types;
 extern crate crypto;
-extern crate env_logger;
-extern crate ethabi;
 extern crate ethash;
 extern crate ethcore_bloom_journal as bloom_journal;
 extern crate ethcore_devtools as devtools;
@@ -119,7 +116,6 @@ extern crate unexpected;
 #[macro_use]
 extern crate rlp_derive;
 extern crate rustc_hex;
-extern crate semver;
 extern crate stats;
 extern crate time;
 extern crate transient_hashmap;