gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bump jsonrpc crates (backport #17797) (#17805)

Browse Source 
* Bump jsonrpc crates (#17797)

* Bump jsonrpc crates

* Update error text

* gitignore for rpc

(cherry picked from commit 2e998ed11d)

# Conflicts:
#	Cargo.lock
#	validator/Cargo.toml

* Fix conflicts

Co-authored-by: Tyera Eulberg <teulberg@gmail.com>
Co-authored-by: Tyera Eulberg <tyera@solana.com>
This commit is contained in:
mergify[bot]
2021-06-07 20:15:23 +00:00
committed by GitHub
parent 334e11e4b9
commit d06ca605cf
6 changed files with 37 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Cargo.lock generated
View File

@ -1983,9 +1983,9 @@ dependencies = [
[[package]] [[package]]
name = "jsonrpc-client-transports" name = "jsonrpc-client-transports"
version = "17.0.0" version = "17.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "15b6c6ad01c7354d60de493148c30ac8a82b759e22ae678c8705e9b8e0c566a4" checksum = "a2f81014e2706fde057e9dcb1036cf6bbf9418d972c597be5c7158c984656722"
dependencies = [ dependencies = [
"derive_more", "derive_more",
"futures 0.3.8", "futures 0.3.8",
@ -2003,11 +2003,13 @@ dependencies = [
[[package]] [[package]]
name = "jsonrpc-core" name = "jsonrpc-core"
version = "17.0.0" version = "17.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "07569945133257ff557eb37b015497104cea61a2c9edaf126c1cbd6e8332397f" checksum = "d4467ab6dfa369b69e52bd0692e480c4d117410538526a57a304a0f2250fd95e"
dependencies = [ dependencies = [
"futures 0.3.8", "futures 0.3.8",
"futures-executor",
"futures-util",
"log 0.4.11", "log 0.4.11",
"serde", "serde",
"serde_derive", "serde_derive",
@ -2016,9 +2018,9 @@ dependencies = [
[[package]] [[package]]
name = "jsonrpc-core-client" name = "jsonrpc-core-client"
version = "17.0.0" version = "17.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ac9d56dc729912796637c30f475bbf834594607b27740dfea6e5fa7ba40d1f1" checksum = "5c366c092d6bccc6e7ab44dd635a0f22ab2f201215339915fb7ff9508404f431"
dependencies = [ dependencies = [
"futures 0.3.8", "futures 0.3.8",
"jsonrpc-client-transports", "jsonrpc-client-transports",
@ -2026,9 +2028,9 @@ dependencies = [
[[package]] [[package]]
name = "jsonrpc-derive" name = "jsonrpc-derive"
version = "17.0.0" version = "17.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b68ba7e76e5c7796cfa4d2a30e83986550c34404c6d40551c902ca6f7bd4a137" checksum = "34f6326966ebac440db89eba788f5a0e5ac2614b4b4bfbdc049a971e71040f32"
dependencies = [ dependencies = [
"proc-macro-crate", "proc-macro-crate",
"proc-macro2 1.0.24", "proc-macro2 1.0.24",
@ -2038,9 +2040,9 @@ dependencies = [
[[package]] [[package]]
name = "jsonrpc-http-server" name = "jsonrpc-http-server"
version = "17.0.0" version = "17.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eff2303c4f0562afcbd2dae75e3e21815095f8994749a80fbcd365877e44ed64" checksum = "522a047cac0958097ee71d047dd71cb84979fd2fa21c7a68fbe12736bef870a2"
dependencies = [ dependencies = [
"futures 0.3.8", "futures 0.3.8",
"hyper 0.13.10", "hyper 0.13.10",
@ -2054,9 +2056,9 @@ dependencies = [
[[package]] [[package]]
name = "jsonrpc-ipc-server" name = "jsonrpc-ipc-server"
version = "17.0.1" version = "17.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "14c4cd89e5ea7e7f0884e828fc35bb83591a371b92439675eae28efa66c24a97" checksum = "0b1d782052ef17051d12681bcc2fa2e9e1aabf3f634588125493d63ddcca6fe1"
dependencies = [ dependencies = [
"futures 0.3.8", "futures 0.3.8",
"jsonrpc-core", "jsonrpc-core",
@ -2069,9 +2071,9 @@ dependencies = [
[[package]] [[package]]
name = "jsonrpc-pubsub" name = "jsonrpc-pubsub"
version = "17.0.0" version = "17.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c48dbebce7a9c88ab272a4db7d6478aa4c6d9596e6c086366e89efc4e9ed89e" checksum = "14739e5523a40739882cc34a44ab2dd9356bce5ce102513f5984a9efbe342f3d"
dependencies = [ dependencies = [
"futures 0.3.8", "futures 0.3.8",
"jsonrpc-core", "jsonrpc-core",
@ -2084,9 +2086,9 @@ dependencies = [
[[package]] [[package]]
name = "jsonrpc-server-utils" name = "jsonrpc-server-utils"
version = "17.0.0" version = "17.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f4207cce738bf713a82525065b750a008f28351324f438f56b33d698ada95bb4" checksum = "bce68fa279a2822b3619369cd024f8a4f8e5ce485468834f8679a3c7919aae2d"
dependencies = [ dependencies = [
"bytes 0.5.4", "bytes 0.5.4",
"futures 0.3.8", "futures 0.3.8",
@ -2101,9 +2103,9 @@ dependencies = [
[[package]] [[package]]
name = "jsonrpc-ws-server" name = "jsonrpc-ws-server"
version = "17.0.0" version = "17.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "abe06e1385e4a912711703123ba44f735627d666f87e5fec764ad1338ec617dc" checksum = "b1d267a8649ec37e4452dd7b3f48827c9cdf36de3a3539cf73242c222ba2eb50"
dependencies = [ dependencies = [
"futures 0.3.8", "futures 0.3.8",
"jsonrpc-core", "jsonrpc-core",

4
core/Cargo.toml
View File

@ -74,8 +74,8 @@ solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.7.1" }
trees = "0.2.1" trees = "0.2.1"
[dev-dependencies] [dev-dependencies]
jsonrpc-core = "17.0.0" jsonrpc-core = "17.1.0"
jsonrpc-core-client = { version = "17.0.0", features = ["ipc", "ws"] } jsonrpc-core-client = { version = "17.1.0", features = ["ipc", "ws"] }
matches = "0.1.6" matches = "0.1.6"
num_cpus = "1.13.0" num_cpus = "1.13.0"
reqwest = { version = "0.11.2", default-features = false, features = ["blocking", "rustls-tls", "json"] } reqwest = { version = "0.11.2", default-features = false, features = ["blocking", "rustls-tls", "json"] }

2
rpc/.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
/target/
/farf/

12
rpc/Cargo.toml
View File

@ -15,12 +15,12 @@ bincode = "1.3.1"
bs58 = "0.3.1" bs58 = "0.3.1"
crossbeam-channel = "0.4" crossbeam-channel = "0.4"
itertools = "0.9.0" itertools = "0.9.0"
jsonrpc-core = "17.0.0" jsonrpc-core = "17.1.0"
jsonrpc-core-client = { version = "17.0.0", features = ["ipc", "ws"] } jsonrpc-core-client = { version = "17.1.0", features = ["ipc", "ws"] }
jsonrpc-derive = "17.0.0" jsonrpc-derive = "17.1.0"
jsonrpc-http-server = "17.0.0" jsonrpc-http-server = "17.1.0"
jsonrpc-pubsub = "17.0.0" jsonrpc-pubsub = "17.1.0"
jsonrpc-ws-server = "17.0.0" jsonrpc-ws-server = "17.1.0"
libc = "0.2.81" libc = "0.2.81"
log = "0.4.11" log = "0.4.11"
regex = "1.3.9" regex = "1.3.9"

4
rpc/src/rpc_pubsub.rs
View File

@ -771,7 +771,7 @@ mod tests {
// Test bad parameter // Test bad parameter
let req = r#"{"jsonrpc":"2.0","id":1,"method":"signatureUnsubscribe","params":[1]}"#; let req = r#"{"jsonrpc":"2.0","id":1,"method":"signatureUnsubscribe","params":[1]}"#;
let res = io.handle_request_sync(&req, session); let res = io.handle_request_sync(&req, session);
let expected = r#"{"jsonrpc":"2.0","error":{"code":-32602,"message":"Invalid Request: Subscription id does not exist"},"id":1}"#; let expected = r#"{"jsonrpc":"2.0","error":{"code":-32602,"message":"Invalid subscription id."},"id":1}"#;
let expected: Response = serde_json::from_str(&expected).unwrap(); let expected: Response = serde_json::from_str(&expected).unwrap();
let result: Response = serde_json::from_str(&res.unwrap()).unwrap(); let result: Response = serde_json::from_str(&res.unwrap()).unwrap();
@ -1013,7 +1013,7 @@ mod tests {
// Test bad parameter // Test bad parameter
let req = r#"{"jsonrpc":"2.0","id":1,"method":"accountUnsubscribe","params":[1]}"#; let req = r#"{"jsonrpc":"2.0","id":1,"method":"accountUnsubscribe","params":[1]}"#;
let res = io.handle_request_sync(&req, session); let res = io.handle_request_sync(&req, session);
let expected = r#"{"jsonrpc":"2.0","error":{"code":-32602,"message":"Invalid Request: Subscription id does not exist"},"id":1}"#; let expected = r#"{"jsonrpc":"2.0","error":{"code":-32602,"message":"Invalid subscription id."},"id":1}"#;
let expected: Response = serde_json::from_str(&expected).unwrap(); let expected: Response = serde_json::from_str(&expected).unwrap();
let result: Response = serde_json::from_str(&res.unwrap()).unwrap(); let result: Response = serde_json::from_str(&res.unwrap()).unwrap();

10
validator/Cargo.toml
View File

@ -19,11 +19,11 @@ console = "0.14.1"
core_affinity = "0.5.10" core_affinity = "0.5.10"
fd-lock = "2.0.0" fd-lock = "2.0.0"
indicatif = "0.15.0" indicatif = "0.15.0"
jsonrpc-core = "17.0.0" jsonrpc-core = "17.1.0"
jsonrpc-core-client = { version = "17.0.0", features = ["ipc", "ws"] } jsonrpc-core-client = { version = "17.1.0", features = ["ipc", "ws"] }
jsonrpc-derive = "17.0.0" jsonrpc-derive = "17.1.0"
jsonrpc-ipc-server = "17.0.0" jsonrpc-ipc-server = "17.1.0"
jsonrpc-server-utils= "17.0.0" jsonrpc-server-utils= "17.1.0"
log = "0.4.11" log = "0.4.11"
num_cpus = "1.13.0" num_cpus = "1.13.0"
rand = "0.7.0" rand = "0.7.0"