use new bitcoin-chain module extracted from bitcoin

diff --git a/Cargo.toml b/Cargo.toml
index ff6451f73167d6c6687f6dc327f32a08aaa283cf..822484298536ada033829f0f67100bf107246ac0 100644 (file)
--- 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 9f2573996a0dd8a750424630b72c1526190271ba..d933416a71759d40a8f28c32baa18935536de6fe 100644 (file)
--- 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 c01321776e0ae043f7570a186e876ed305a2120c..7d2654a5b431753e2d3bcc2e209c3a4c4df46a04 100644 (file)
--- 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;