From 8a3b4f48fc55c3f3d85cadfab1ab1c66ec36fa5b Mon Sep 17 00:00:00 2001
From: Henry de Valence <hdevalence@hdevalence.ca>
Date: Tue, 8 Oct 2019 21:10:01 -0700
Subject: [PATCH] Move all git dependencies to published crates. (#58)

The earlier issues with version resolution incompatibilities are now
resolved, and all the upstream changes we made to tracing are released.
---
 Cargo.toml               |  6 +-----
 zebra-network/Cargo.toml |  8 +++++---
 zebrad/Cargo.toml        | 18 ++++++++++--------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index db517062..6f1db3dd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,8 +9,4 @@ members = [
         "zebra-client",
         "zebra-reactor",
         "zebrad",
-]
-
-[patch.crates-io]
-tracing-attributes = { git = "https://github.com/tokio-rs/tracing" }
-tracing = { git = "https://github.com/tokio-rs/tracing" }
\ No newline at end of file
+]
\ No newline at end of file
diff --git a/zebra-network/Cargo.toml b/zebra-network/Cargo.toml
index 4062a4d7..4954d037 100644
--- a/zebra-network/Cargo.toml
+++ b/zebra-network/Cargo.toml
@@ -15,11 +15,13 @@ byteorder = "1.3"
 chrono = "0.4"
 failure = "0.1"
 serde = { version = "1", features = ["serde_derive"] }
+
 tokio = "=0.2.0-alpha.6"
-tower = { git = "https://github.com/tower-rs/tower", branch = "v0.3.x" }
-tracing = { git = "https://github.com/tokio-rs/tracing" }
-tracing-futures = { git = "https://github.com/tokio-rs/tracing", features = ["tokio-alpha"], default-features = false }
 futures-preview = { version = "=0.3.0-alpha.19", features = ["async-await"] }
 
+tracing = "0.1"
+tracing-futures = { version = "0.1", features = ["tokio-alpha"], default-features = false }
+
+tower = "=0.3.0-alpha.2"
 
 zebra-chain = { path = "../zebra-chain" }
diff --git a/zebrad/Cargo.toml b/zebrad/Cargo.toml
index 8e380197..e12e5c93 100644
--- a/zebrad/Cargo.toml
+++ b/zebrad/Cargo.toml
@@ -13,17 +13,19 @@ gumdrop = "0.6"
 lazy_static = "1"
 serde = { version = "1", features = ["serde_derive"] }
 toml = "0.5"
+
 tokio = "=0.2.0-alpha.6"
-# Replace with git to pick up instrument derive changes, revert on release.
-#tracing = "0.1"
-tracing = { git = "https://github.com/tokio-rs/tracing" }
-tracing-futures = { git = "https://github.com/tokio-rs/tracing", features = ["tokio-alpha"], default-features = false }
-tracing-subscriber = { git = "https://github.com/tokio-rs/tracing" }
-tracing-log = { git = "https://github.com/tokio-rs/tracing" }
-hyper = { git = "https://github.com/hyperium/hyper"}
-tower = { git = "https://github.com/tower-rs/tower", branch = "v0.3.x" }
 futures-preview = { version = "=0.3.0-alpha.19", features = ["async-await"] }
 
+tracing = "0.1"
+tracing-futures = { version = "0.1", features = ["tokio-alpha"], default-features = false }
+tracing-subscriber = "0.1"
+tracing-log = "0.1"
+
+hyper = "=0.13.0-alpha.4"
+
+tower = "=0.3.0-alpha.2"
+
 zebra-chain = { path = "../zebra-chain" }
 zebra-network = { path = "../zebra-network" }