X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Flookup.rs;h=0534c1c8a7e82922bc240eab0be214f06d87eec8;hb=58d677c291607bfed62ccdfbaf592cead530ed6c;hp=5969b2a10bdbb0727f39c7a7a297c18a810fc02b;hpb=e004a953d43654c14fef698d14e5aee2497dbcc4;p=rapid-gossip-sync-server

diff --git a/src/lookup.rs b/src/lookup.rs
index 5969b2a..0534c1c 100644
--- a/src/lookup.rs
+++ b/src/lookup.rs
@@ -201,7 +201,7 @@ pub(super) async fn fetch_channel_announcements(delta_set: &mut DeltaSet, networ
 	}
 }
 
-pub(super) async fn fetch_channel_updates(delta_set: &mut DeltaSet, client: &Client, last_sync_timestamp: u32, consider_intermediate_updates: bool) {
+pub(super) async fn fetch_channel_updates(delta_set: &mut DeltaSet, client: &Client, last_sync_timestamp: u32) {
 	let start = Instant::now();
 	let last_sync_timestamp_object = SystemTime::UNIX_EPOCH.add(Duration::from_secs(last_sync_timestamp as u64));
 
@@ -253,18 +253,11 @@ pub(super) async fn fetch_channel_updates(delta_set: &mut DeltaSet, client: &Cli
 	// (to calculate the set of mutated fields for snapshotting, where intermediate updates may
 	// have been omitted)
 
-	let mut intermediate_update_prefix = "";
-	if !consider_intermediate_updates {
-		intermediate_update_prefix = "DISTINCT ON (short_channel_id, direction)";
-	}
-
-	let query_string = format!("
-		SELECT {} id, direction, blob_signed, seen
+	let intermediate_updates = client.query("
+		SELECT id, direction, blob_signed, seen
 		FROM channel_updates
 		WHERE seen >= $1
-		ORDER BY short_channel_id ASC, direction ASC, seen DESC
-		", intermediate_update_prefix);
-	let intermediate_updates = client.query(&query_string, &[&last_sync_timestamp_object]).await.unwrap();
+		", &[&last_sync_timestamp_object]).await.unwrap();
 	println!("Fetched intermediate rows ({}): {:?}", intermediate_updates.len(), start.elapsed());
 
 	let mut previous_scid = u64::MAX;