Merge pull request #10 from tamasblummer/use_bitcoin_chain

TheBlueMatt · web-flow · commit c4e7161c2333 · 2018-03-11T19:26:27.000-04:00
use new bitcoin-chain module extracted from bitcoin
diff --git 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"  }
diff --git 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
@@ -1,6 +1,7 @@
 #![crate_name = "lightning"]
 
 extern crate bitcoin;
+extern crate bitcoin_chain;
 extern crate secp256k1;
 extern crate rand;
 extern crate crypto;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-use bitcoin::blockdata::blockchain::Blockchain;`
	`1`	`+use bitcoin_chain::blockchain::Blockchain;`
`2`	`2`	`use bitcoin::blockdata::transaction::Transaction;`
`3`	`3`	`use bitcoin::blockdata::block::Block;`
`4`	`4`	`use bitcoin::blockdata::script::Script;`