Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Upgrade to jsonrpc v14 #11151

Merged
merged 6 commits into from
Oct 10, 2019
Merged

Upgrade to jsonrpc v14 #11151

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f8c3232
Upgrade to jsonrpc v14
dvdplm Oct 9, 2019
100907e
Bump tokio & futures.
tomusdrw Oct 10, 2019
583503f
Bump even further.
tomusdrw Oct 10, 2019
9f6d086
Upgrade tokio to 0.1.22
dvdplm Oct 10, 2019
240ccd1
Merge branch 'master' into dp/chore/upgrade-jsonrpc-to-v14
dvdplm Oct 10, 2019
b8e13ba
Partially revert "Bump tokio & futures."
dvdplm Oct 10, 2019
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
81 changes: 40 additions & 41 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ ethstore = { path = "accounts/ethstore" }
fdlimit = "0.1"
futures = "0.1"
journaldb = { path = "util/journaldb" }
jsonrpc-core = "13.2.0"
jsonrpc-core = "14.0.0"
keccak-hash = "0.4.0"
kvdb = "0.1"
kvdb-rocksdb = "0.1.5"
Expand Down
4 changes: 2 additions & 2 deletions cli-signer/rpc-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ serde_json = "1.0"
url = "2.1.0"
matches = "0.1"
parking_lot = "0.9"
jsonrpc-core = "13.2.0"
jsonrpc-ws-server = "13.2.0"
jsonrpc-core = "14.0.0"
jsonrpc-ws-server = "14.0.0"
parity-rpc = { path = "../../rpc" }
keccak-hash = "0.4.0"
4 changes: 2 additions & 2 deletions ipfs/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ common-types = { path = "../ethcore/types" }
ethcore = { path = "../ethcore" }
bytes = { package = "parity-bytes", version = "0.1"}
ethereum-types = "0.8.0"
jsonrpc-core = "13.2.0"
http = { package = "jsonrpc-http-server", version = "13.2.0"}
jsonrpc-core = "14.0.0"
http = { package = "jsonrpc-http-server", version = "14.0.0"}
rlp = "0.4.0"
cid = "0.3"
multihash = "0.8"
Expand Down
4 changes: 2 additions & 2 deletions miner/stratum/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ authors = ["Parity Technologies <admin@parity.io>"]
[dependencies]
ethereum-types = "0.8.0"
keccak-hash = "0.4.0"
jsonrpc-core = "13.2.0"
jsonrpc-tcp-server = "13.2.0"
jsonrpc-core = "14.0.0"
jsonrpc-tcp-server = "14.0.0"
log = "0.4"
parking_lot = "0.9"

Expand Down
12 changes: 6 additions & 6 deletions rpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ tokio-timer = "0.1"
transient-hashmap = "0.4"
itertools = "0.5"

jsonrpc-core = "13.2.0"
jsonrpc-derive = "13.2.0"
jsonrpc-http-server = "13.2.0"
jsonrpc-ws-server = "13.2.0"
jsonrpc-ipc-server = "13.2.0"
jsonrpc-pubsub = "13.2.0"
jsonrpc-core = "14.0.0"
jsonrpc-derive = "14.0.0"
jsonrpc-http-server = "14.0.0"
jsonrpc-ws-server = "14.0.0"
jsonrpc-ipc-server = "14.0.0"
jsonrpc-pubsub = "14.0.0"

client-traits = { path = "../ethcore/client-traits" }
common-types = { path = "../ethcore/types" }
Expand Down
2 changes: 1 addition & 1 deletion secret-store/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ tokio = "~0.1.11"
tokio-io = "0.1"
tokio-service = "0.1"
url = "2.1.0"
jsonrpc-server-utils = "13.2.0"
jsonrpc-server-utils = "14.0.0"

[dev-dependencies]
env_logger = "0.5"
Expand Down