Skip to content

Commit 996fb8a

Browse files
author
Adria Massanet
committed
Update jsonrpc to 15.0.0, bump to 2.5.14
1 parent 253ff3f commit 996fb8a

File tree

11 files changed

+2831
-2527
lines changed

11 files changed

+2831
-2527
lines changed

Cargo.lock

Lines changed: 2805 additions & 2501 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
description = "Parity Ethereum client"
33
name = "parity-ethereum"
44
# NOTE Make sure to update util/version/Cargo.toml as well
5-
version = "2.5.13"
5+
version = "2.5.14"
66
license = "GPL-3.0"
77
authors = ["Parity Technologies <admin@parity.io>"]
88

@@ -29,7 +29,7 @@ serde_derive = "1.0"
2929
futures = "0.1"
3030
fdlimit = "0.1"
3131
ctrlc = { git = "https://github.com/paritytech/rust-ctrlc.git" }
32-
jsonrpc-core = "14.0.0"
32+
jsonrpc-core = "15.0.0"
3333
parity-bytes = "0.1"
3434
common-types = { path = "ethcore/types" }
3535
ethcore = { path = "ethcore", features = ["parity"] }

cli-signer/rpc-client/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ serde_json = "1.0"
1515
url = "2"
1616
matches = "0.1"
1717
parking_lot = "0.9"
18-
jsonrpc-core = "14.0.3"
19-
jsonrpc-ws-server = "14.0.3"
18+
jsonrpc-core = "15.0.0"
19+
jsonrpc-ws-server = "15.0.0"
2020
parity-rpc = { path = "../../rpc" }
2121
keccak-hash = "0.1"

ipfs/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ authors = ["Parity Technologies <admin@parity.io>"]
99
ethcore = { path = "../ethcore" }
1010
parity-bytes = "0.1"
1111
ethereum-types = "0.4"
12-
jsonrpc-core = "14.0.3"
13-
jsonrpc-http-server = "14.0.3"
12+
jsonrpc-core = "15.0.0"
13+
jsonrpc-http-server = "15.0.0"
1414
rlp = { version = "0.3.0", features = ["ethereum"] }
1515
cid = "0.3"
1616
multihash = "0.8"

miner/stratum/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ authors = ["Parity Technologies <admin@parity.io>"]
88
[dependencies]
99
ethereum-types = "0.4"
1010
keccak-hash = "0.1"
11-
jsonrpc-core = "14.0.3"
12-
jsonrpc-tcp-server = "14.0.3"
11+
jsonrpc-core = "15.0.0"
12+
jsonrpc-tcp-server = "15.0.0"
1313
log = "0.4"
1414
parking_lot = "0.7"
1515

rpc/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ tokio-timer = "0.1"
2727
transient-hashmap = "0.4"
2828
itertools = "0.5"
2929

30-
jsonrpc-core = "14.0.3"
31-
jsonrpc-derive = "14.0.3"
32-
jsonrpc-http-server = "14.0.3"
33-
jsonrpc-ws-server = "14.0.3"
34-
jsonrpc-ipc-server = "14.0.3"
35-
jsonrpc-pubsub = "14.0.3"
30+
jsonrpc-core = "15.0.0"
31+
jsonrpc-derive = "15.0.0"
32+
jsonrpc-http-server = "15.0.0"
33+
jsonrpc-ws-server = "15.0.0"
34+
jsonrpc-ipc-server = "15.0.0"
35+
jsonrpc-pubsub = "15.0.0"
3636

3737
common-types = { path = "../ethcore/types" }
3838
ethash = { path = "../ethash" }

rpc/src/tests/http_client.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,20 +113,20 @@ pub fn request(address: &SocketAddr, request: &str) -> Response {
113113
pub fn assert_security_headers_present(headers: &[String], port: Option<u16>) {
114114
if port.is_none() {
115115
assert!(
116-
headers.iter().any(|header| header.as_str() == "X-Frame-Options: SAMEORIGIN")
116+
headers.iter().any(|header| header.as_str() == "X-Frame-Options: SAMEORIGIN"),
117117
"X-Frame-Options: SAMEORIGIN missing: {:?}", headers
118118
);
119119
}
120120
assert!(
121-
headers.iter().any(|header| header.as_str() == "X-XSS-Protection: 1; mode=block")
121+
headers.iter().any(|header| header.as_str() == "X-XSS-Protection: 1; mode=block"),
122122
"X-XSS-Protection missing: {:?}", headers
123123
);
124124
assert!(
125-
headers.iter().any(|header| header.as_str() == "X-Content-Type-Options: nosniff")
125+
headers.iter().any(|header| header.as_str() == "X-Content-Type-Options: nosniff"),
126126
"X-Content-Type-Options missing: {:?}", headers
127127
);
128128
assert!(
129-
headers.iter().any(|header| header.starts_with("Content-Security-Policy: "))
129+
headers.iter().any(|header| header.starts_with("Content-Security-Policy: ")),
130130
"Content-Security-Policy missing: {:?}", headers
131131
)
132132
}

secret-store/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ tokio-io = "0.1"
3737
tokio-service = "0.1"
3838
url = "2"
3939
percent-encoding = "2"
40-
jsonrpc-server-utils = "14.0.3"
40+
jsonrpc-server-utils = "15.0.0"
4141

4242
[dev-dependencies]
4343
env_logger = "0.5"

util/version/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[package]
44
name = "parity-version"
55
# NOTE: this value is used for Parity Ethereum version string (via env CARGO_PKG_VERSION)
6-
version = "2.5.13"
6+
version = "2.5.14"
77
authors = ["Parity Technologies <admin@parity.io>"]
88
build = "build.rs"
99

whisper/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ smallvec = "0.6"
2626
tiny-keccak = "1.4"
2727
time-utils = { path = "../util/time-utils" }
2828

29-
jsonrpc-core = "14.0.3"
30-
jsonrpc-derive = "14.0.3"
31-
jsonrpc-pubsub = "14.0.3"
29+
jsonrpc-core = "15.0.0"
30+
jsonrpc-derive = "15.0.0"
31+
jsonrpc-pubsub = "15.0.0"

0 commit comments

Comments
 (0)