change override_route_amount param to bool

Author: zoedberg

lightning/src/ln/channelmanager.rs

@@ -2726,10 +2726,10 @@ where
 		let rgb_payment_info_hash_path = self.ldk_data_dir.join(htlc_payment_hash);
 		let path = if rgb_payment_info_hash_path.exists() {
 			let rgb_payment_info = parse_rgb_payment_info(&rgb_payment_info_hash_path);
-			if let Some(override_amount) = rgb_payment_info.override_route_amount {
+			if !rgb_payment_info.override_route_amount {
 				let mut path = path.clone();
 				for hop in &mut path.hops {
-					hop.rgb_amount = Some(override_amount);
+					hop.rgb_amount = Some(rgb_payment_info.amount);
 				}
 				path
 			} else {

lightning/src/rgb_utils/mod.rs

@@ -76,8 +76,8 @@ pub struct RgbPaymentInfo {
 	pub local_rgb_amount: u64,
 	/// RGB remote amount
 	pub remote_rgb_amount: u64,
-	/// Override RGB amount in route
-	pub override_route_amount: Option<u64>,
+	/// Whether the RGB amount in route should be overridden
+	pub override_route_amount: bool,
 }
 
 /// RGB transfer info
@@ -174,7 +174,7 @@ pub(crate) fn color_commitment(channel_id: &[u8; 32], funding_outpoint: &OutPoin
 				amount: htlc.amount_rgb.unwrap(),
 				local_rgb_amount: rgb_info.local_rgb_amount,
 				remote_rgb_amount: rgb_info.remote_rgb_amount,
-				override_route_amount: None,
+				override_route_amount: false,
 			};
 			let serialized_info = serde_json::to_string(&rgb_payment_info).expect("valid rgb payment info");
 			fs::write(rgb_payment_info_path, serialized_info).expect("able to write rgb payment info file");
@@ -520,7 +520,7 @@ pub fn write_rgb_channel_info(path: &PathBuf, rgb_info: &RgbInfo) {
 }
 
 /// Write RGB payment info to file
-pub fn write_rgb_payment_info_file(ldk_data_dir: &Path, payment_hash: &PaymentHash, contract_id: ContractId, amount_rgb: u64, override_route_amount: Option<u64>) {
+pub fn write_rgb_payment_info_file(ldk_data_dir: &Path, payment_hash: &PaymentHash, contract_id: ContractId, amount_rgb: u64, override_route_amount: bool) {
 	let rgb_payment_info_path = ldk_data_dir.join(hex::encode(payment_hash.0));
 	let rgb_payment_info = RgbPaymentInfo {
 		contract_id,