X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning-block-sync%2Fsrc%2Flib.rs;h=4a01d4673b31e91d56c3cb350d995c1b7a3d7403;hb=2f734f97550014e5424e55523ed46d76b94b737d;hp=3561a1b5d769f19381dfdf1bec1e7749cdf8c2d8;hpb=073f0780f6b2d72de57e5bb5a7b690c0206fa40c;p=rust-lightning

diff --git a/lightning-block-sync/src/lib.rs b/lightning-block-sync/src/lib.rs
index 3561a1b5..4a01d467 100644
--- a/lightning-block-sync/src/lib.rs
+++ b/lightning-block-sync/src/lib.rs
@@ -13,9 +13,8 @@
 //! Both features support either blocking I/O using `std::net::TcpStream` or, with feature `tokio`,
 //! non-blocking I/O using `tokio::net::TcpStream` from inside a Tokio runtime.
 
-// Prefix these with `rustdoc::` when we update our MSRV to be >= 1.52 to remove warnings.
-#![deny(broken_intra_doc_links)]
-#![deny(private_intra_doc_links)]
+#![deny(rustdoc::broken_intra_doc_links)]
+#![deny(rustdoc::private_intra_doc_links)]
 
 #![deny(missing_docs)]
 #![deny(unsafe_code)]
@@ -47,9 +46,9 @@ mod utils;
 
 use crate::poll::{ChainTip, Poll, ValidatedBlockHeader};
 
-use bitcoin::blockdata::block::{Block, BlockHeader};
+use bitcoin::blockdata::block::{Block, Header};
 use bitcoin::hash_types::BlockHash;
-use bitcoin::util::uint::Uint256;
+use bitcoin::pow::Work;
 
 use lightning::chain;
 use lightning::chain::Listen;
@@ -147,14 +146,13 @@ impl BlockSourceError {
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub struct BlockHeaderData {
 	/// The block header itself.
-	pub header: BlockHeader,
+	pub header: Header,
 
 	/// The block height where the genesis block has height 0.
 	pub height: u32,
 
-	/// The total chain work in expected number of double-SHA256 hashes required to build a chain
-	/// of equivalent weight.
-	pub chainwork: Uint256,
+	/// The total chain work required to build a chain of equivalent weight.
+	pub chainwork: Work,
 }
 
 /// A block including either all its transactions or only the block header.
@@ -166,7 +164,7 @@ pub enum BlockData {
 	/// A block containing all its transactions.
 	FullBlock(Block),
 	/// A block header for when the block does not contain any pertinent transactions.
-	HeaderOnly(BlockHeader),
+	HeaderOnly(Header),
 }
 
 /// A lightweight client for keeping a listener in sync with the chain, allowing for Simplified