From 4fecf8865a2f01c32fa6fe18da922317177cedd6 Mon Sep 17 00:00:00 2001
From: Romain Ruetschi <romain@informal.systems>
Date: Fri, 25 Sep 2020 16:35:27 +0200
Subject: [PATCH] Specify git dependencies on tendermint-rs instead of local

---
 modules/Cargo.toml     | 14 +++++++++++---
 relayer-cli/Cargo.toml | 20 ++++++++++++++++----
 relayer/Cargo.toml     | 19 ++++++++++++++++---
 3 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/modules/Cargo.toml b/modules/Cargo.toml
index 538b0b37ae..e97ae77863 100644
--- a/modules/Cargo.toml
+++ b/modules/Cargo.toml
@@ -15,8 +15,6 @@ description = """
 """
 
 [dependencies]
-tendermint = { version = "0.16.0", path = "../../tendermint-rs/tendermint" }
-tendermint-rpc = { version = "0.16.0", features = ["http-client", "websocket-client"], path = "../../tendermint-rs/rpc" }
 tendermint-proto = "0.1.0"
 
 # Proto definitions for all IBC-related interfaces, e.g., connections or channels.
@@ -31,10 +29,20 @@ serde_json = "1"
 tracing = "0.1.13"
 prost = "0.6.1"
 prost-types = { version = "0.6.1" }
-
 bytes = "0.5.5"
 dyn-clonable = "0.9.0"
 
+[dependencies.tendermint]
+version = "0.16.0"
+git = "https://github.com/informalsystems/tendermint-rs"
+branch = "romac/light-client-ibc"
+
+[dependencies.tendermint-rpc]
+version = "0.16.0"
+features = ["http-client", "websocket-client"]
+git = "https://github.com/informalsystems/tendermint-rs"
+branch = "romac/light-client-ibc"
+
 [dev-dependencies]
 tokio = { version = "0.2", features = ["macros"] }
 subtle-encoding = { version = "0.5" }
diff --git a/relayer-cli/Cargo.toml b/relayer-cli/Cargo.toml
index c9bf6a5e7c..0744ad70b2 100644
--- a/relayer-cli/Cargo.toml
+++ b/relayer-cli/Cargo.toml
@@ -9,10 +9,6 @@ authors = [
 [dependencies]
 relayer = { path = "../relayer" }
 ibc = { path = "../modules" }
-
-tendermint = { version = "0.16.0", path = "../../tendermint-rs/tendermint" }
-tendermint-rpc = { version = "0.16.0", path = "../../tendermint-rs/rpc" }
-tendermint-light-client = { version = "0.16.0", path = "../../tendermint-rs/light-client" }
 tendermint-proto = "0.1.0"
 
 abscissa_tokio = "0.5.1"
@@ -28,6 +24,22 @@ toml = "0.5.6"
 serde_derive = "1.0.116"
 sled = "0.34.4"
 
+[dependencies.tendermint]
+version = "0.16.0"
+git = "https://github.com/informalsystems/tendermint-rs"
+branch = "romac/light-client-ibc"
+
+[dependencies.tendermint-rpc]
+version = "0.16.0"
+features = ["http-client", "websocket-client"]
+git = "https://github.com/informalsystems/tendermint-rs"
+branch = "romac/light-client-ibc"
+
+[dependencies.tendermint-light-client]
+version = "0.16.0"
+git = "https://github.com/informalsystems/tendermint-rs"
+branch = "romac/light-client-ibc"
+
 [dependencies.abscissa_core]
 version = "0.5.2"
 # optional: use `gimli` to capture backtraces
diff --git a/relayer/Cargo.toml b/relayer/Cargo.toml
index 1101fce80e..51d4c35300 100644
--- a/relayer/Cargo.toml
+++ b/relayer/Cargo.toml
@@ -8,9 +8,6 @@ authors = [
 
 [dependencies]
 ibc = { path = "../modules" }
-tendermint = { version = "0.16.0", path = "../../tendermint-rs/tendermint" }
-tendermint-rpc = { version = "0.16.0", features = ["http-client", "websocket-client"], path = "../../tendermint-rs/rpc" }
-tendermint-light-client = { version = "0.16.0", path = "../../tendermint-rs/light-client" }
 tendermint-proto = "0.1.0"
 
 anomaly = "0.2.0"
@@ -29,4 +26,20 @@ bytes = "0.5.6"
 prost = "0.6.1"
 futures = "0.3.5"
 
+[dependencies.tendermint]
+version = "0.16.0"
+git = "https://github.com/informalsystems/tendermint-rs"
+branch = "romac/light-client-ibc"
+
+[dependencies.tendermint-rpc]
+version = "0.16.0"
+features = ["http-client", "websocket-client"]
+git = "https://github.com/informalsystems/tendermint-rs"
+branch = "romac/light-client-ibc"
+
+[dependencies.tendermint-light-client]
+version = "0.16.0"
+git = "https://github.com/informalsystems/tendermint-rs"
+branch = "romac/light-client-ibc"
+
 [dev-dependencies]