From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Date: Sun, 11 Mar 2018 23:26:27 +0000 (-0400)
Subject: Merge pull request #10 from tamasblummer/use_bitcoin_chain
X-Git-Tag: v0.0.12~422
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=c4e7161c2333fc32811bec90bb184cd39f7f1f5f;hp=34138a02463b4510522c405790125019d60f3199;p=rust-lightning

Merge pull request #10 from tamasblummer/use_bitcoin_chain

use new bitcoin-chain module extracted from bitcoin
---

diff --git a/Cargo.toml b/Cargo.toml
index ff6451f7..82248429 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,6 +15,10 @@ non_bitcoin_chain_hash_routing = []
 
 [dependencies]
 bitcoin = "0.11"
+bitcoin-chain = { git = "https://github.com/rust-bitcoin/rust-bitcoin-chain", branch = "master" }
 rust-crypto = "0.2"
 rand = "0.4"
 secp256k1 = "0.8"
+
+[patch.crates-io]
+bitcoin = { git = "https://github.com/rust-bitcoin/rust-bitcoin", branch = "master"  }
\ No newline at end of file
diff --git a/src/chain/rustbitcoinchain.rs b/src/chain/rustbitcoinchain.rs
index 9f257399..d933416a 100644
--- a/src/chain/rustbitcoinchain.rs
+++ b/src/chain/rustbitcoinchain.rs
@@ -1,4 +1,4 @@
-use bitcoin::blockdata::blockchain::Blockchain;
+use bitcoin_chain::blockchain::Blockchain;
 use bitcoin::blockdata::transaction::Transaction;
 use bitcoin::blockdata::block::Block;
 use bitcoin::blockdata::script::Script;
diff --git a/src/lib.rs b/src/lib.rs
index c0132177..7d2654a5 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,6 +1,7 @@
 #![crate_name = "lightning"]
 
 extern crate bitcoin;
+extern crate bitcoin_chain;
 extern crate secp256k1;
 extern crate rand;
 extern crate crypto;