Migrate core to futures=0.3 (#565)

* Update to latest futures. * Rewrite core? * pubsub rewrite. * Fix pubsub tests & rewrite tcp. * Update stdio. * ipc & stdio & ws * Cargo check ✅ * Fixing tests 🤔 * Unify Result/BoxFuture for derive. * Rewrite clients for new futures. * Fix derive. * Fix client tests. * Remove unused functions. * Bump version. * cargo fmt --all * Addressing review grumbles. * Rewrite with async-await. * Add a issue number. * cargo fmt --all * Fix test.
paritytech · Jul 28, 2020 · 99bd064 · 99bd064
1 parent 57575ef
commit 99bd064
Show file tree

Hide file tree

Showing 88 changed files with 1,211 additions and 1,201 deletions.
diff --git a/core-client/Cargo.toml b/core-client/Cargo.toml
@@ -8,7 +8,7 @@ keywords = ["jsonrpc", "json-rpc", "json", "rpc", "serde"]
 license = "MIT"
 name = "jsonrpc-core-client"
 repository = "https://github.com/paritytech/jsonrpc"
-version = "14.2.0"
+version = "15.0.0"
 
 categories = [
 	"asynchronous",
@@ -19,14 +19,17 @@ categories = [
 ]
 
 [features]
-tls = ["jsonrpc-client-transports/tls"]
-http = ["jsonrpc-client-transports/http"]
-ws = ["jsonrpc-client-transports/ws"]
-ipc = ["jsonrpc-client-transports/ipc"]
+tls = ["jsonrpc-client-transports/tls", "futures01"]
+http = ["jsonrpc-client-transports/http", "futures01"]
+ws = ["jsonrpc-client-transports/ws", "futures01"]
+ipc = ["jsonrpc-client-transports/ipc", "futures01"]
 arbitrary_precision = ["jsonrpc-client-transports/arbitrary_precision"]
 
 [dependencies]
-jsonrpc-client-transports = { version = "14.2", path = "./transports", default-features = false }
+jsonrpc-client-transports = { version = "15.0", path = "./transports", default-features = false }
+# Only for client transports, should be removed when we fully transition to futures=0.3
+futures01 = { version = "0.1", package = "futures", optional = true }
+futures = { version = "0.3", features = [ "compat" ] }
 
 [badges]
 travis-ci = { repository = "paritytech/jsonrpc", branch = "master"}
diff --git a/core-client/src/lib.rs b/core-client/src/lib.rs
@@ -7,4 +7,8 @@
 
 #![deny(missing_docs)]
 
+pub use futures;
 pub use jsonrpc_client_transports::*;
+
+#[cfg(feature = "futures01")]
+pub use futures01;
diff --git a/core-client/transports/Cargo.toml b/core-client/transports/Cargo.toml
@@ -8,7 +8,7 @@ keywords = ["jsonrpc", "json-rpc", "json", "rpc", "serde"]
 license = "MIT"
 name = "jsonrpc-client-transports"
 repository = "https://github.com/paritytech/jsonrpc"
-version = "14.2.0"
+version = "15.0.0"
 
 categories = [
 	"asynchronous",
@@ -21,41 +21,44 @@ categories = [
 [features]
 default = ["http", "tls", "ws"]
 tls = ["hyper-tls", "http"]
-http = ["hyper"]
+http = ["hyper", "futures01"]
 ws = [
 	"websocket",
 	"tokio",
+	"futures01",
 ]
 ipc = [
 	"parity-tokio-ipc",
 	"jsonrpc-server-utils",
 	"tokio",
+	"futures01",
 ]
 arbitrary_precision = ["serde_json/arbitrary_precision", "jsonrpc-core/arbitrary_precision"]
 
 [dependencies]
 failure = "0.1"
-futures = "0.1.26"
-hyper = { version = "0.12", optional = true }
-hyper-tls = { version = "0.3.2", optional = true }
-jsonrpc-core = { version = "14.2", path = "../../core" }
-jsonrpc-pubsub = { version = "14.2", path = "../../pubsub" }
-jsonrpc-server-utils = { version = "14.2", path = "../../server-utils", optional = true }
+futures = { version = "0.3", features = [ "compat" ] }
+jsonrpc-core = { version = "15.0", path = "../../core" }
+jsonrpc-pubsub = { version = "15.0", path = "../../pubsub" }
 log = "0.4"
-parity-tokio-ipc = { version = "0.2", optional = true }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
+url = "1.7"
+
+futures01 = { version = "0.1.26", package = "futures", optional = true }
+hyper = { version = "0.12", optional = true }
+hyper-tls = { version = "0.3.2", optional = true }
+jsonrpc-server-utils = { version = "15.0", path = "../../server-utils", optional = true }
+parity-tokio-ipc = { version = "0.2", optional = true }
 tokio = { version = "0.1", optional = true }
 websocket = { version = "0.24", optional = true }
-url = "1.7"
 
 [dev-dependencies]
 assert_matches = "1.1"
-jsonrpc-http-server = { version = "14.2", path = "../../http" }
-jsonrpc-ipc-server = { version = "14.2", path = "../../ipc" }
+jsonrpc-http-server = { version = "15.0", path = "../../http" }
+jsonrpc-ipc-server = { version = "15.0", path = "../../ipc" }
 lazy_static = "1.0"
 env_logger = "0.7"
-tokio = "0.1"
 
 [badges]
 travis-ci = { repository = "paritytech/jsonrpc", branch = "master" }