From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Date: Tue, 31 Jul 2018 04:59:31 +0000 (-0400)
Subject: Merge pull request #100 from TheBlueMatt/2018-07-htlc-balance-calc
X-Git-Tag: v0.0.12~355
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=830343f12980dd3dddc960721e67acc8885436f0;hp=b17211ffe42d029280fc45df42dd1d6152eadd13;p=rust-lightning

Merge pull request #100 from TheBlueMatt/2018-07-htlc-balance-calc

Fix non-HTLC-inclusion balance calculation (mark II)
---

diff --git a/Cargo.toml b/Cargo.toml
index 8add037f..69c6f44b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -30,4 +30,4 @@ version = "0.13"
 features = ["bitcoinconsensus"]
 
 [dev-dependencies]
-hex = "0.3.2"
+hex = "0.3"
diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml
index aec5d9a8..516dd4ce 100644
--- a/fuzz/Cargo.toml
+++ b/fuzz/Cargo.toml
@@ -19,7 +19,7 @@ honggfuzz_fuzz = ["honggfuzz"]
 afl = { version = "0.3", optional = true }
 lightning = { path = "..", features = ["fuzztarget"] }
 bitcoin = { version = "0.13", features = ["fuzztarget"] }
-hex = "0.3.2"
+hex = "0.3"
 honggfuzz = { version = "0.5", optional = true }
 rust-crypto = "0.2"
 secp256k1 = { version = "0.9", features=["fuzztarget"] }