Skip to content

Migrate core to futures=0.3 #565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tomusdrw merged 22 commits into from
Jul 28, 2020
Merged

Migrate core to futures=0.3 #565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
8f20324
Update to latest futures.
tomusdrw Jul 6, 2020
cb82ffd
Rewrite core?
tomusdrw Jul 10, 2020
fc4edb1
pubsub rewrite.
tomusdrw Jul 10, 2020
c916308
Fix pubsub tests & rewrite tcp.
tomusdrw Jul 10, 2020
84fcfbd
Update stdio.
tomusdrw Jul 13, 2020
1f35135
ipc & stdio & ws
tomusdrw Jul 13, 2020
d8420b8
Cargo check ✅
tomusdrw Jul 14, 2020
005d1d9
Fixing tests 🤔
tomusdrw Jul 14, 2020
0b5fa1e
Unify Result/BoxFuture for derive.
tomusdrw Jul 14, 2020
4ec35cc
Rewrite clients for new futures.
tomusdrw Jul 20, 2020
c4df7be
Fix derive.
tomusdrw Jul 21, 2020
59857b5
Fix client tests.
tomusdrw Jul 22, 2020
ae5daaa
Remove unused functions.
tomusdrw Jul 22, 2020
f1cefc6
Bump version.
tomusdrw Jul 22, 2020
7426992
cargo fmt --all
tomusdrw Jul 22, 2020
9fe9132
Merge branch 'master' into td-futures
tomusdrw Jul 22, 2020
b01c385
Addressing review grumbles.
tomusdrw Jul 27, 2020
e368be5
Rewrite with async-await.
tomusdrw Jul 27, 2020
3adbddf
Add a issue number.
tomusdrw Jul 27, 2020
e6a589f
cargo fmt --all
tomusdrw Jul 27, 2020
984cd55
Merge branch 'master' into td-futures
tomusdrw Jul 28, 2020
968c201
Fix test.
tomusdrw Jul 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions core-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"}
4 changes: 4 additions & 0 deletions core-client/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,8 @@

#![deny(missing_docs)]

pub use futures;
pub use jsonrpc_client_transports::*;

#[cfg(feature = "futures01")]
pub use futures01;
29 changes: 16 additions & 13 deletions core-client/transports/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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" }
Loading