X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fpersistence.rs;h=7b451b7ec252970050d908f231603730b13fd50a;hb=f525858b51ca7c8ad9b855efd92e5e04efa53ed1;hp=8bb7b188af72fb692aa218a20b1ede9bd24c116a;hpb=32c175b543de5782f6615a7110b4d303620b50d0;p=rapid-gossip-sync-server

diff --git a/src/persistence.rs b/src/persistence.rs
index 8bb7b18..7b451b7 100644
--- a/src/persistence.rs
+++ b/src/persistence.rs
@@ -111,7 +111,7 @@ impl<L: Deref> GossipPersister<L> where L::Target: Logger {
 			}
 
 			match &gossip_message {
-				GossipMessage::ChannelAnnouncement(announcement) => {
+				GossipMessage::ChannelAnnouncement(announcement, _) => {
 					let scid = announcement.contents.short_channel_id as i64;
 
 					// start with the type prefix, which is already known a priori
@@ -127,7 +127,7 @@ impl<L: Deref> GossipPersister<L> where L::Target: Logger {
 							&announcement_signed
 						])).await.unwrap().unwrap();
 				}
-				GossipMessage::ChannelUpdate(update) => {
+				GossipMessage::ChannelUpdate(update, seen_override) => {
 					let scid = update.contents.short_channel_id as i64;
 
 					let timestamp = update.contents.timestamp as i64;
@@ -146,10 +146,11 @@ impl<L: Deref> GossipPersister<L> where L::Target: Logger {
 					let mut update_signed = Vec::new();
 					update.write(&mut update_signed).unwrap();
 
-					tokio::time::timeout(POSTGRES_INSERT_TIMEOUT, client
-						.execute("INSERT INTO channel_updates (\
+					let insertion_statement = if cfg!(test) {
+						"INSERT INTO channel_updates (\
 							short_channel_id, \
 							timestamp, \
+							seen, \
 							channel_flags, \
 							direction, \
 							disable, \
@@ -159,9 +160,32 @@ impl<L: Deref> GossipPersister<L> where L::Target: Logger {
 							fee_proportional_millionths, \
 							htlc_maximum_msat, \
 							blob_signed \
-						) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11)  ON CONFLICT DO NOTHING", &[
+						) VALUES ($1, $2, TO_TIMESTAMP($3), $4, $5, $6, $7, $8, $9, $10, $11, $12)  ON CONFLICT DO NOTHING"
+					} else {
+						"INSERT INTO channel_updates (\
+							short_channel_id, \
+							timestamp, \
+							channel_flags, \
+							direction, \
+							disable, \
+							cltv_expiry_delta, \
+							htlc_minimum_msat, \
+							fee_base_msat, \
+							fee_proportional_millionths, \
+							htlc_maximum_msat, \
+							blob_signed \
+						) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11)  ON CONFLICT DO NOTHING"
+					};
+
+					// this may not be used outside test cfg
+					let _seen_timestamp = seen_override.unwrap_or(timestamp as u32) as f64;
+
+					tokio::time::timeout(POSTGRES_INSERT_TIMEOUT, client
+						.execute(insertion_statement, &[
 							&scid,
 							&timestamp,
+							#[cfg(test)]
+								&_seen_timestamp,
 							&(update.contents.flags as i16),
 							&direction,
 							&disable,