Move db ops to update_rgb_channel_info method

Author: dcorral

lightning/src/rgb_utils/mod.rs

@@ -593,13 +593,8 @@ pub(crate) fn update_rgb_channel_id(
 	let temp_chan_id = temporary_channel_id.0.as_hex().to_string();
 	let chan_id = channel_id.0.as_hex().to_string();
 
-	let rgb_info = kv_store.read_rgb_channel_info(&temp_chan_id, false).expect("rename ok");
-	kv_store.write_rgb_channel_info(&chan_id, &rgb_info, false);
-	kv_store.remove_rgb_channel_info(&temp_chan_id, false).expect("rename ok");
-
-	let rgb_info = kv_store.read_rgb_channel_info(&temp_chan_id, true).expect("rename ok");
-	kv_store.write_rgb_channel_info(&chan_id, &rgb_info, true);
-	kv_store.remove_rgb_channel_info(&temp_chan_id, true).expect("rename ok");
+	kv_store.update_rgb_channel_info(&temp_chan_id, &chan_id, false).expect("rename ok");
+	kv_store.update_rgb_channel_info(&temp_chan_id, &chan_id, true).expect("rename ok");
 
 	if let Ok(consignment_data) = kv_store.read_rgb_consignment(&temp_chan_id) {
 		kv_store.write_rgb_consignment(&chan_id, consignment_data);
@@ -732,6 +727,10 @@ pub trait RgbKvStoreExt {
 	fn remove_rgb_channel_info(&self, channel_id: &str, pending: bool) -> Result<(), io::Error>;
 	/// remove consignment from KVStore
 	fn remove_rgb_consignment(&self, id: &str);
+	/// move channel info from one key to another (read + write + remove)
+	fn update_rgb_channel_info(
+		&self, old_channel_id: &str, new_channel_id: &str, pending: bool,
+	) -> Result<(), io::Error>;
 	/// whether the payment is colored
 	fn is_payment_rgb(&self, payment_hash: &PaymentHash) -> bool;
 	/// filter first hops to only include channels with sufficient RGB assets
@@ -804,6 +803,14 @@ impl<K: KVStoreSync + ?Sized> RgbKvStoreExt for K {
 			.expect("KVStore remove failed");
 	}
 
+	fn update_rgb_channel_info(
+		&self, old_channel_id: &str, new_channel_id: &str, pending: bool,
+	) -> Result<(), io::Error> {
+		let rgb_info = self.read_rgb_channel_info(old_channel_id, pending)?;
+		self.write_rgb_channel_info(new_channel_id, &rgb_info, pending);
+		self.remove_rgb_channel_info(old_channel_id, pending)
+	}
+
 	fn is_payment_rgb(&self, payment_hash: &PaymentHash) -> bool {
 		self.read_rgb_payment_info(payment_hash, false).is_ok()
 			|| self.read_rgb_payment_info(payment_hash, true).is_ok()