Merge pull request #65 from arik-so/announcement-history-tests

Update-recency-based inclusion logic tests

diff --git a/src/persistence.rs b/src/persistence.rs
index 7b451b7ec252970050d908f231603730b13fd50a..4ede02f5258cac98cc977f71853f120d17e7aadf 100644 (file)
--- a/src/persistence.rs
+++ b/src/persistence.rs
@@ -111,21 +111,34 @@ impl<L: Deref> GossipPersister<L> where L::Target: Logger {
                        }
 
                        match &gossip_message {
-                               GossipMessage::ChannelAnnouncement(announcement, _) => {
+                               GossipMessage::ChannelAnnouncement(announcement, seen_override) => {
                                        let scid = announcement.contents.short_channel_id as i64;
 
                                        // start with the type prefix, which is already known a priori
                                        let mut announcement_signed = Vec::new();
                                        announcement.write(&mut announcement_signed).unwrap();
 
-                                       tokio::time::timeout(POSTGRES_INSERT_TIMEOUT, client
-                                               .execute("INSERT INTO channel_announcements (\
+                                       if cfg!(test) && seen_override.is_some() {
+                                               tokio::time::timeout(POSTGRES_INSERT_TIMEOUT, client
+                                                       .execute("INSERT INTO channel_announcements (\
+                                                       short_channel_id, \
+                                                       announcement_signed, \
+                                                       seen \
+                                               ) VALUES ($1, $2, TO_TIMESTAMP($3)) ON CONFLICT (short_channel_id) DO NOTHING", &[
+                                                               &scid,
+                                                               &announcement_signed,
+                                                               &(seen_override.unwrap() as f64)
+                                                       ])).await.unwrap().unwrap();
+                                       } else {
+                                               tokio::time::timeout(POSTGRES_INSERT_TIMEOUT, client
+                                                       .execute("INSERT INTO channel_announcements (\
                                                        short_channel_id, \
                                                        announcement_signed \
                                                ) VALUES ($1, $2) ON CONFLICT (short_channel_id) DO NOTHING", &[
-                                                       &scid,
-                                                       &announcement_signed
-                                               ])).await.unwrap().unwrap();
+                                                               &scid,
+                                                               &announcement_signed
+                                                       ])).await.unwrap().unwrap();
+                                       }
                                }
                                GossipMessage::ChannelUpdate(update, seen_override) => {
                                        let scid = update.contents.short_channel_id as i64;

diff --git a/src/serialization.rs b/src/serialization.rs
index 93bd381d39e4b2291b54061c0f9913cc7ae39eb8..7e58b02e5d587a8a2e63a3e41712ac67feb17770 100644 (file)
--- a/src/serialization.rs
+++ b/src/serialization.rs
@@ -187,6 +187,10 @@ pub(super) fn serialize_delta_set(delta_set: DeltaSet, last_sync_timestamp: u32)
                                                record_full_update_in_histograms(&latest_update);
                                                serialization_set.updates.push(UpdateSerialization::Full(latest_update));
                                        }
+                               } else if is_newly_included_announcement {
+                                       if let Some(unannounced_update) = updates.last_update_before_seen {
+                                               serialization_set.updates.push(UpdateSerialization::Full(unannounced_update.update));
+                                       }
                                } else if let Some(flags) = updates.serialization_update_flags {
                                        serialization_set.updates.push(UpdateSerialization::Reminder(scid, flags));
                                }

diff --git a/src/tests/mod.rs b/src/tests/mod.rs
index ed3a99629d37841f39bbd506ad488cfb5c96bd49..dfc7ce466ec7d5c7ce2634650b419125a7813e03 100644 (file)
--- a/src/tests/mod.rs
+++ b/src/tests/mod.rs
@@ -241,6 +241,124 @@ async fn test_trivial_setup() {
        assert_eq!(last_update_seen_b, update_result - CLIENT_BACKDATE_INTERVAL);
 }
 
+/// If a channel has only seen updates in one direction, it should not be announced
+#[tokio::test]
+async fn test_unidirectional_intermediate_update_consideration() {
+       let _sanitizer = SchemaSanitizer::new();
+
+       let logger = Arc::new(TestLogger::new());
+       let network_graph = NetworkGraph::new(Network::Bitcoin, logger.clone());
+       let network_graph_arc = Arc::new(network_graph);
+       let (mut persister, receiver) = GossipPersister::new(network_graph_arc.clone(), logger.clone());
+
+       let short_channel_id = 1;
+       let timestamp = current_time() - 10;
+       println!("timestamp: {}", timestamp);
+
+       { // seed the db
+               let announcement = generate_announcement(short_channel_id);
+               let update_1 = generate_update(short_channel_id, false, timestamp, 0, 0, 0, 6, 0);
+               let update_2 = generate_update(short_channel_id, true, timestamp + 1, 0, 0, 0, 3, 0);
+               let update_3 = generate_update(short_channel_id, true, timestamp + 2, 0, 0, 0, 4, 0);
+
+               network_graph_arc.update_channel_from_announcement_no_lookup(&announcement).unwrap();
+               network_graph_arc.update_channel_unsigned(&update_1.contents).unwrap();
+               network_graph_arc.update_channel_unsigned(&update_2.contents).unwrap();
+               network_graph_arc.update_channel_unsigned(&update_3.contents).unwrap();
+
+               receiver.send(GossipMessage::ChannelAnnouncement(announcement, Some(timestamp))).await.unwrap();
+               receiver.send(GossipMessage::ChannelUpdate(update_1, None)).await.unwrap();
+               receiver.send(GossipMessage::ChannelUpdate(update_2, None)).await.unwrap();
+               receiver.send(GossipMessage::ChannelUpdate(update_3, None)).await.unwrap();
+               drop(receiver);
+               persister.persist_gossip().await;
+       }
+
+       let channel_count = network_graph_arc.read_only().channels().len();
+       assert_eq!(channel_count, 1);
+
+       let client_graph = NetworkGraph::new(Network::Bitcoin, logger.clone());
+       let client_graph_arc = Arc::new(client_graph);
+       let rgs = RapidGossipSync::new(client_graph_arc.clone(), logger.clone());
+
+       let serialization = serialize_delta(network_graph_arc.clone(), timestamp + 1, logger.clone()).await;
+
+       logger.assert_log_contains("rapid_gossip_sync_server::lookup", "Fetched 1 update rows of the first update in a new direction", 1);
+       logger.assert_log_contains("rapid_gossip_sync_server::lookup", "Processed 1 reference rows", 1);
+       logger.assert_log_contains("rapid_gossip_sync_server::lookup", "Processed intermediate rows (2)", 1);
+
+       assert_eq!(serialization.message_count, 3);
+       assert_eq!(serialization.announcement_count, 1);
+       assert_eq!(serialization.update_count, 2);
+       assert_eq!(serialization.update_count_full, 2);
+       assert_eq!(serialization.update_count_incremental, 0);
+
+       let update_result = rgs.update_network_graph(&serialization.data).unwrap();
+       println!("update result: {}", update_result);
+       // the update result must be a multiple of our snapshot granularity
+
+       let readonly_graph = client_graph_arc.read_only();
+       let channels = readonly_graph.channels();
+       let client_channel_count = channels.len();
+       assert_eq!(client_channel_count, 1);
+
+       clean_test_db().await;
+}
+
+/// If a channel has only seen updates in one direction, it should not be announced
+#[tokio::test]
+async fn test_bidirectional_intermediate_update_consideration() {
+       let _sanitizer = SchemaSanitizer::new();
+
+       let logger = Arc::new(TestLogger::new());
+       let network_graph = NetworkGraph::new(Network::Bitcoin, logger.clone());
+       let network_graph_arc = Arc::new(network_graph);
+       let (mut persister, receiver) = GossipPersister::new(network_graph_arc.clone(), logger.clone());
+
+       let short_channel_id = 1;
+       let timestamp = current_time() - 10;
+       println!("timestamp: {}", timestamp);
+
+       { // seed the db
+               let announcement = generate_announcement(short_channel_id);
+               let update_1 = generate_update(short_channel_id, false, timestamp, 0, 0, 0, 5, 0);
+               let update_2 = generate_update(short_channel_id, false, timestamp + 1, 0, 0, 0, 4, 0);
+               let update_3 = generate_update(short_channel_id, false, timestamp + 2, 0, 0, 0, 3, 0);
+               let update_4 = generate_update(short_channel_id, true, timestamp, 0, 0, 0, 3, 0);
+
+               network_graph_arc.update_channel_from_announcement_no_lookup(&announcement).unwrap();
+               network_graph_arc.update_channel_unsigned(&update_1.contents).unwrap();
+               network_graph_arc.update_channel_unsigned(&update_2.contents).unwrap();
+               network_graph_arc.update_channel_unsigned(&update_3.contents).unwrap();
+               network_graph_arc.update_channel_unsigned(&update_4.contents).unwrap();
+
+               receiver.send(GossipMessage::ChannelAnnouncement(announcement, Some(timestamp))).await.unwrap();
+               receiver.send(GossipMessage::ChannelUpdate(update_1, None)).await.unwrap();
+               receiver.send(GossipMessage::ChannelUpdate(update_2, None)).await.unwrap();
+               receiver.send(GossipMessage::ChannelUpdate(update_3, None)).await.unwrap();
+               receiver.send(GossipMessage::ChannelUpdate(update_4, None)).await.unwrap();
+               drop(receiver);
+               persister.persist_gossip().await;
+       }
+
+       let channel_count = network_graph_arc.read_only().channels().len();
+       assert_eq!(channel_count, 1);
+
+       let serialization = serialize_delta(network_graph_arc.clone(), timestamp + 1, logger.clone()).await;
+
+       logger.assert_log_contains("rapid_gossip_sync_server::lookup", "Fetched 0 update rows of the first update in a new direction", 1);
+       logger.assert_log_contains("rapid_gossip_sync_server::lookup", "Processed 2 reference rows", 1);
+       logger.assert_log_contains("rapid_gossip_sync_server::lookup", "Processed intermediate rows (2)", 1);
+
+       assert_eq!(serialization.message_count, 1);
+       assert_eq!(serialization.announcement_count, 0);
+       assert_eq!(serialization.update_count, 1);
+       assert_eq!(serialization.update_count_full, 0);
+       assert_eq!(serialization.update_count_incremental, 1);
+
+       clean_test_db().await;
+}
+
 #[tokio::test]
 async fn test_full_snapshot_recency() {
        let _sanitizer = SchemaSanitizer::new();