Upgrade to tokio 1.0 #20
Conversation
rishflab
requested review from
D4nte,
luckysori and
thomaseizinger
and removed request for
D4nte and
luckysori
Cargo.toml
Outdated
| @@ -14,13 +14,13 @@ bitcoin = { version = "0.25", features = ["use-serde"] } | |||
| bitcoincore-rpc-json = "0.12" | |||
| futures = "0.3.5" | |||
| hex = "0.4.2" | |||
| jsonrpc_client = { git = "https://github.com/thomaseizinger/rust-jsonrpc-client", rev = "c7010817e0f86ab24b3dc10d6bb0463faa0aace4", features = ["reqwest"] } | |||
| reqwest = { version = "0.10", default-features = false, features = ["json", "native-tls"] } | |||
| jsonrpc_client = { git = "https://github.com/thomaseizinger/rust-jsonrpc-client", rev = "f60c839481c1ac68909ada0141a3a3bf085bb1af", features = ["reqwest"] } | |||
There was a problem hiding this comment.
I've released the lib to crates.io a couple of days ago :)
You can just depend on that instead of the Git rev!
There was a problem hiding this comment.
hmm release 0.4 doesn't not build because it is using request 0.10. 0.11 is needed.
the trait bound `reqwest::Client: jsonrpc_client::SendRequest` is not satisfied --> src/bitcoind_rpc.rs:18:1 | 18 | #[jsonrpc_client::implement(BitcoindRpcApi)] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `jsonrpc_client::SendRequest` is not implemented for `reqwest::Client` | = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
There was a problem hiding this comment.
Well, use release 0.5 then? :)
That one depends on reqwest 0.11
There was a problem hiding this comment.
There was a problem hiding this comment.
did not know/see there was a 0.5 release.
|
Also, unless each commit builds in isolation, you might want to squash these together! |
rishflab
force-pushed
the
upgrade-tokio-1
branch
from
35ee009
to
456f1f0
Compare
Upgrade jsonrpc_client to version that uses reqwest 0.11 and tokio 1.0. Fix tests
rishflab
force-pushed
the
upgrade-tokio-1
branch
from
af05f31
to
ae2f6cd
Compare
|
@rishflab do you have rights to merge? |
|
Note: There is still a comment that could be actioned before merging. |
nope, not an authorised user |
143: Upgrade to tokio 1.0 r=D4nte a=rishflab When we were refactoring tests we realised we probably want the ability to abort a `tokio::JoinHandle` to kill the `EventLoop` to simulate a real world crash. tokio 1.0 is needed for this. It is probably about time to upgrade tokio anyway. In order to upgrade to tokio 1.0 the following dependencies were also upgraded in the swap crate and monero-harness-rs * backoff * libp2p * request UPDATE: This should be merged until the following dependencies are uprgraded to Tokio 1.0 or Tokio compat is used - [x] bitcoin-harness-rs coblox/bitcoin-harness-rs#20 Co-authored-by: rishflab <rishflab@hotmail.com> Co-authored-by: Franck Royer <franck@coblox.tech>
143: Upgrade to tokio 1.0 r=D4nte a=rishflab When we were refactoring tests we realised we probably want the ability to abort a `tokio::JoinHandle` to kill the `EventLoop` to simulate a real world crash. tokio 1.0 is needed for this. It is probably about time to upgrade tokio anyway. In order to upgrade to tokio 1.0 the following dependencies were also upgraded in the swap crate and monero-harness-rs * backoff * libp2p * request UPDATE: This should be merged until the following dependencies are uprgraded to Tokio 1.0 or Tokio compat is used - [x] bitcoin-harness-rs coblox/bitcoin-harness-rs#20 Co-authored-by: rishflab <rishflab@hotmail.com> Co-authored-by: Franck Royer <franck@coblox.tech>
Need this to get the tests in xmd-btc swapping after the Tokio 1.0 upgrade