X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning-block-sync%2Fsrc%2Flib.rs;h=c54e054454876799cfa2a862f23d2a3be10a0f74;hb=a8bd4c097f7ae6620eee66c1cb49144e38568439;hp=5c7c0dee8c10c4dddaf3ea630238db5e59387650;hpb=ccac926671d17f3ad2267844992d8272e74e6e0b;p=rust-lightning

diff --git a/lightning-block-sync/src/lib.rs b/lightning-block-sync/src/lib.rs
index 5c7c0dee..c54e0544 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)]
@@ -28,6 +27,8 @@ pub mod http;
 pub mod init;
 pub mod poll;
 
+pub mod gossip;
+
 #[cfg(feature = "rest-client")]
 pub mod rest;
 
@@ -45,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;
@@ -145,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.
@@ -164,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
@@ -439,7 +439,7 @@ mod spv_client_tests {
 	use crate::test_utils::{Blockchain, NullChainListener};
 	use super::*;
 
-	use bitcoin::network::constants::Network;
+	use bitcoin::network::Network;
 
 	#[tokio::test]
 	async fn poll_from_chain_without_headers() {
@@ -566,7 +566,7 @@ mod chain_notifier_tests {
 	use crate::test_utils::{Blockchain, MockChainListener};
 	use super::*;
 
-	use bitcoin::network::constants::Network;
+	use bitcoin::network::Network;
 
 	#[tokio::test]
 	async fn sync_from_same_chain() {