From c82caf58c883f0d6c3bdc21c0c9834d77363e2a6 Mon Sep 17 00:00:00 2001
From: Christian Kamm <ckamm@delightful-solutions.de>
Date: Fri, 19 Nov 2021 11:14:34 +0100
Subject: [PATCH] Fix dependency on jsonrpc fork

---
 Cargo.lock | 79 +++++++++++++++++++++++++++++-------------------------
 Cargo.toml |  2 +-
 2 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index eff9760..418dd8e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2142,14 +2142,15 @@ dependencies = [
 [[package]]
 name = "jsonrpc-client-transports"
 version = "18.0.0"
+source = "git+https://github.com/ckamm/jsonrpc.git?branch=ckamm/http-with-gzip#8c7213e70a8a72e63f7a783e6b851bf28ac9aeb6"
 dependencies = [
  "derive_more",
  "flate2 0.2.20",
  "futures 0.3.17",
  "hyper 0.14.14",
- "jsonrpc-core 18.0.0",
- "jsonrpc-pubsub 18.0.0",
- "jsonrpc-server-utils 18.0.0",
+ "jsonrpc-core 18.0.0 (git+https://github.com/ckamm/jsonrpc.git?branch=ckamm/http-with-gzip)",
+ "jsonrpc-pubsub 18.0.0 (git+https://github.com/ckamm/jsonrpc.git?branch=ckamm/http-with-gzip)",
+ "jsonrpc-server-utils 18.0.0 (git+https://github.com/ckamm/jsonrpc.git?branch=ckamm/http-with-gzip)",
  "log 0.4.14",
  "parity-tokio-ipc",
  "serde",
@@ -2159,19 +2160,6 @@ dependencies = [
  "websocket",
 ]
 
-[[package]]
-name = "jsonrpc-core"
-version = "18.0.0"
-dependencies = [
- "futures 0.3.17",
- "futures-executor",
- "futures-util",
- "log 0.4.14",
- "serde",
- "serde_derive",
- "serde_json",
-]
-
 [[package]]
 name = "jsonrpc-core"
 version = "18.0.0"
@@ -2187,9 +2175,24 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "jsonrpc-core"
+version = "18.0.0"
+source = "git+https://github.com/ckamm/jsonrpc.git?branch=ckamm/http-with-gzip#8c7213e70a8a72e63f7a783e6b851bf28ac9aeb6"
+dependencies = [
+ "futures 0.3.17",
+ "futures-executor",
+ "futures-util",
+ "log 0.4.14",
+ "serde",
+ "serde_derive",
+ "serde_json",
+]
+
 [[package]]
 name = "jsonrpc-core-client"
 version = "18.0.0"
+source = "git+https://github.com/ckamm/jsonrpc.git?branch=ckamm/http-with-gzip#8c7213e70a8a72e63f7a783e6b851bf28ac9aeb6"
 dependencies = [
  "futures 0.3.17",
  "jsonrpc-client-transports",
@@ -2223,19 +2226,6 @@ dependencies = [
  "unicase 2.6.0",
 ]
 
-[[package]]
-name = "jsonrpc-pubsub"
-version = "18.0.0"
-dependencies = [
- "futures 0.3.17",
- "jsonrpc-core 18.0.0",
- "lazy_static",
- "log 0.4.14",
- "parking_lot 0.11.2",
- "rand 0.7.3",
- "serde",
-]
-
 [[package]]
 name = "jsonrpc-pubsub"
 version = "18.0.0"
@@ -2252,19 +2242,17 @@ dependencies = [
 ]
 
 [[package]]
-name = "jsonrpc-server-utils"
+name = "jsonrpc-pubsub"
 version = "18.0.0"
+source = "git+https://github.com/ckamm/jsonrpc.git?branch=ckamm/http-with-gzip#8c7213e70a8a72e63f7a783e6b851bf28ac9aeb6"
 dependencies = [
- "bytes 1.1.0",
  "futures 0.3.17",
- "globset",
- "jsonrpc-core 18.0.0",
+ "jsonrpc-core 18.0.0 (git+https://github.com/ckamm/jsonrpc.git?branch=ckamm/http-with-gzip)",
  "lazy_static",
  "log 0.4.14",
- "tokio",
- "tokio-stream",
- "tokio-util",
- "unicase 2.6.0",
+ "parking_lot 0.11.2",
+ "rand 0.7.3",
+ "serde",
 ]
 
 [[package]]
@@ -2285,6 +2273,23 @@ dependencies = [
  "unicase 2.6.0",
 ]
 
+[[package]]
+name = "jsonrpc-server-utils"
+version = "18.0.0"
+source = "git+https://github.com/ckamm/jsonrpc.git?branch=ckamm/http-with-gzip#8c7213e70a8a72e63f7a783e6b851bf28ac9aeb6"
+dependencies = [
+ "bytes 1.1.0",
+ "futures 0.3.17",
+ "globset",
+ "jsonrpc-core 18.0.0 (git+https://github.com/ckamm/jsonrpc.git?branch=ckamm/http-with-gzip)",
+ "lazy_static",
+ "log 0.4.14",
+ "tokio",
+ "tokio-stream",
+ "tokio-util",
+ "unicase 2.6.0",
+]
+
 [[package]]
 name = "jsonrpc-ws-server"
 version = "18.0.0"
diff --git a/Cargo.toml b/Cargo.toml
index f0093df..eab3065 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,7 +9,7 @@ members = [
 
 [patch.crates-io]
 # for gzip encoded responses
-jsonrpc-core-client = { path = "../jsonrpc-dep/core-client" }
+jsonrpc-core-client = { git = "https://github.com/ckamm/jsonrpc.git", branch = "ckamm/http-with-gzip" }
 
 #solana-accountsdb-plugin-interface = { path = "../solana-accountsdb/accountsdb-plugin-interface" }
 #solana-logger = { path = "../solana-accountsdb/logger" }