Rename rgb_rename_files + restore return type

Author: dcorral

lightning/src/ln/channel.rs

@@ -78,7 +78,7 @@ use crate::ln::types::ChannelId;
 use crate::ln::LN_MAX_MSG_LEN;
 use crate::offers::static_invoice::StaticInvoice;
 use crate::rgb_utils::{
-	color_closing, color_commitment, color_htlc, get_rgb_channel_info_pending, rename_rgb_files,
+	color_closing, color_commitment, color_htlc, get_rgb_channel_info_pending, update_rgb_channel_id,
 	update_rgb_channel_amount_pending, RgbKvStoreExt,
 };
 use crate::routing::gossip::NodeId;
@@ -3251,7 +3251,7 @@ where
 		let temporary_channel_id = context.channel_id;
 		context.channel_id = channel_id;
 		if context.is_colored() && temporary_channel_id != channel_id {
-			rename_rgb_files(&context.channel_id, &temporary_channel_id, context.rgb_kv_store.as_ref());
+			update_rgb_channel_id(&context.channel_id, &temporary_channel_id, context.rgb_kv_store.as_ref());
 		}
 
 		assert!(!context.channel_state.is_monitor_update_in_progress()); // We have not had any monitor(s) yet to fail update!
@@ -13703,7 +13703,7 @@ where
 		let temporary_channel_id = self.context.channel_id;
 		self.context.channel_id = ChannelId::v1_from_funding_outpoint(funding_txo);
 		if self.context.is_colored() {
-			rename_rgb_files(&self.context.channel_id, &temporary_channel_id, self.context.rgb_kv_store.as_ref());
+			update_rgb_channel_id(&self.context.channel_id, &temporary_channel_id, self.context.rgb_kv_store.as_ref());
 		}
 
 		// If the funding transaction is a coinbase transaction, we need to set the minimum depth to 100.

lightning/src/ln/outbound_payment.rs

@@ -1048,10 +1048,7 @@ impl OutboundPayments {
 
 		let mut filtered_first_hops = first_hops.into_iter().collect::<Vec<_>>();
 		let rgb_payment = if self.rgb_kv_store.is_payment_rgb(&payment_hash) {
-			self.rgb_kv_store.filter_first_hops(&payment_hash, &mut filtered_first_hops);
-			let info = self.rgb_kv_store.read_rgb_payment_info(&payment_hash, false)
-				.expect("payment info must exist");
-			Some((info.contract_id, info.amount))
+			Some(self.rgb_kv_store.filter_first_hops(&payment_hash, &mut filtered_first_hops))
 		} else {
 			None
 		};

lightning/src/rgb_utils/mod.rs

@@ -583,8 +583,8 @@ pub fn write_rgb_payment_info_file(
 		.expect("able to write rgb payment info pending");
 }
 
-/// Rename RGB channel info from temporary to final channel ID in KVStore
-pub(crate) fn rename_rgb_files(
+/// update RGB data from temporary to final channel ID in KVStore
+pub(crate) fn update_rgb_channel_id(
 	channel_id: &ChannelId, temporary_channel_id: &ChannelId, kv_store: &dyn KVStoreSync,
 ) {
 	let temp_chan_id = temporary_channel_id.0.as_hex().to_string();
@@ -734,7 +734,7 @@ pub trait RgbKvStoreExt {
 	/// filter first hops to only include channels with sufficient RGB assets
 	fn filter_first_hops(
 		&self, payment_hash: &PaymentHash, first_hops: &mut Vec<ChannelDetails>,
-	);
+	) -> (ContractId, u64);
 }
 
 impl<K: KVStoreSync + ?Sized> RgbKvStoreExt for K {
@@ -806,11 +806,11 @@ impl<K: KVStoreSync + ?Sized> RgbKvStoreExt for K {
 			|| self.read_rgb_payment_info(payment_hash, true).is_ok()
 	}
 
-	fn filter_first_hops(&self, payment_hash: &PaymentHash, first_hops: &mut Vec<ChannelDetails>) {
-		let rgb_payment_info = match self.read_rgb_payment_info(payment_hash, false) {
-			Ok(info) => info,
-			Err(_) => return,
-		};
+	fn filter_first_hops(
+		&self, payment_hash: &PaymentHash, first_hops: &mut Vec<ChannelDetails>,
+	) -> (ContractId, u64) {
+		let rgb_payment_info = self.read_rgb_payment_info(payment_hash, false)
+			.expect("payment info must exist");
 		let contract_id = rgb_payment_info.contract_id;
 		let rgb_amount = rgb_payment_info.amount;
 		first_hops.retain(|h| {
@@ -822,5 +822,6 @@ impl<K: KVStoreSync + ?Sized> RgbKvStoreExt for K {
 				Err(_) => false,
 			}
 		});
+		(contract_id, rgb_amount)
 	}
 }