X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning-rapid-gossip-sync%2Fsrc%2Flib.rs;h=0423e05edb164f37803606d2bbafadd60039e834;hb=f2b315e9c9e9d77ef5abb5068d6e8e37f24bc419;hp=06ce7eb2075574df38c2b9cbf44813235e1fba1c;hpb=3852d528018f66eaf87dc846d919228e8339248b;p=rust-lightning

diff --git a/lightning-rapid-gossip-sync/src/lib.rs b/lightning-rapid-gossip-sync/src/lib.rs
index 06ce7eb2..0423e05e 100644
--- a/lightning-rapid-gossip-sync/src/lib.rs
+++ b/lightning-rapid-gossip-sync/src/lib.rs
@@ -53,9 +53,8 @@
 //! # }
 //! # let logger = FakeLogger {};
 //!
-//! let block_hash = genesis_block(Network::Bitcoin).header.block_hash();
-//! let network_graph = NetworkGraph::new(block_hash, &logger);
-//! let rapid_sync = RapidGossipSync::new(&network_graph);
+//! let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
+//! let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 //! let snapshot_contents: &[u8] = &[0; 0];
 //! let new_last_sync_timestamp_result = rapid_sync.update_network_graph(snapshot_contents);
 //! ```
@@ -79,10 +78,10 @@ use lightning::io;
 use lightning::routing::gossip::NetworkGraph;
 use lightning::util::logger::Logger;
 
-pub use crate::error::GraphSyncError;
+use crate::error::GraphSyncError;
 
 /// Error types that these functions can return
-mod error;
+pub mod error;
 
 /// Core functionality of this crate
 mod processing;
@@ -95,14 +94,16 @@ mod processing;
 pub struct RapidGossipSync<NG: Deref<Target=NetworkGraph<L>>, L: Deref>
 where L::Target: Logger {
 	network_graph: NG,
+	logger: L,
 	is_initial_sync_complete: AtomicBool
 }
 
 impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L::Target: Logger {
 	/// Instantiate a new [`RapidGossipSync`] instance.
-	pub fn new(network_graph: NG) -> Self {
+	pub fn new(network_graph: NG, logger: L) -> Self {
 		Self {
 			network_graph,
+			logger,
 			is_initial_sync_complete: AtomicBool::new(false)
 		}
 	}
@@ -126,14 +127,22 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
 	/// Update network graph from binary data.
 	/// Returns the last sync timestamp to be used the next time rapid sync data is queried.
 	///
-	/// `network_graph`: network graph to be updated
-	///
 	/// `update_data`: `&[u8]` binary stream that comprises the update data
 	pub fn update_network_graph(&self, update_data: &[u8]) -> Result<u32, GraphSyncError> {
 		let mut read_cursor = io::Cursor::new(update_data);
 		self.update_network_graph_from_byte_stream(&mut read_cursor)
 	}
 
+	/// Update network graph from binary data.
+	/// Returns the last sync timestamp to be used the next time rapid sync data is queried.
+	///
+	/// `update_data`: `&[u8]` binary stream that comprises the update data
+	/// `current_time_unix`: `Option<u64>` optional current timestamp to verify data age
+	pub fn update_network_graph_no_std(&self, update_data: &[u8], current_time_unix: Option<u64>) -> Result<u32, GraphSyncError> {
+		let mut read_cursor = io::Cursor::new(update_data);
+		self.update_network_graph_from_byte_stream_no_std(&mut read_cursor, current_time_unix)
+	}
+
 	/// Gets a reference to the underlying [`NetworkGraph`] which was provided in
 	/// [`RapidGossipSync::new`].
 	///
@@ -153,7 +162,6 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
 mod tests {
 	use std::fs;
 
-	use bitcoin::blockdata::constants::genesis_block;
 	use bitcoin::Network;
 
 	use lightning::ln::msgs::DecodeError;
@@ -217,13 +225,12 @@ mod tests {
 		let sync_test = FileSyncTest::new(tmp_directory, &valid_response);
 		let graph_sync_test_file = sync_test.get_test_file_path();
 
-		let block_hash = genesis_block(Network::Bitcoin).block_hash();
 		let logger = TestLogger::new();
-		let network_graph = NetworkGraph::new(block_hash, &logger);
+		let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 
 		assert_eq!(network_graph.read_only().channels().len(), 0);
 
-		let rapid_sync = RapidGossipSync::new(&network_graph);
+		let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 		let sync_result = rapid_sync.sync_network_graph_with_file_path(&graph_sync_test_file);
 
 		if sync_result.is_err() {
@@ -250,13 +257,12 @@ mod tests {
 
 	#[test]
 	fn measure_native_read_from_file() {
-		let block_hash = genesis_block(Network::Bitcoin).block_hash();
 		let logger = TestLogger::new();
-		let network_graph = NetworkGraph::new(block_hash, &logger);
+		let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
 
 		assert_eq!(network_graph.read_only().channels().len(), 0);
 
-		let rapid_sync = RapidGossipSync::new(&network_graph);
+		let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 		let start = std::time::Instant::now();
 		let sync_result = rapid_sync
 			.sync_network_graph_with_file_path("./res/full_graph.lngossip");
@@ -282,7 +288,6 @@ mod tests {
 pub mod bench {
 	use test::Bencher;
 
-	use bitcoin::blockdata::constants::genesis_block;
 	use bitcoin::Network;
 
 	use lightning::ln::msgs::DecodeError;
@@ -293,11 +298,10 @@ pub mod bench {
 
 	#[bench]
 	fn bench_reading_full_graph_from_file(b: &mut Bencher) {
-		let block_hash = genesis_block(Network::Bitcoin).block_hash();
 		let logger = TestLogger::new();
 		b.iter(|| {
-			let network_graph = NetworkGraph::new(block_hash, &logger);
-			let rapid_sync = RapidGossipSync::new(&network_graph);
+			let network_graph = NetworkGraph::new(Network::Bitcoin, &logger);
+			let rapid_sync = RapidGossipSync::new(&network_graph, &logger);
 			let sync_result = rapid_sync.sync_network_graph_with_file_path("./res/full_graph.lngossip");
 			if let Err(crate::error::GraphSyncError::DecodeError(DecodeError::Io(io_error))) = &sync_result {
 				let error_string = format!("Input file lightning-rapid-gossip-sync/res/full_graph.lngossip is missing! Download it from https://bitcoin.ninja/ldk-compressed_graph-bc08df7542-2022-05-05.bin\n\n{:?}", io_error);