f: Update the getters to not return an option vector

Author: shaavan

lightning/src/ln/channelmanager.rs

@@ -926,13 +926,13 @@ impl ClaimablePayment {
 	}
 
 	/// Returns the inbound `channel_id`s for all HTLCs associated with the payment.
-	fn get_channel_ids(&self) -> Vec<Option<ChannelId>> {
-		self.htlcs.iter().map(|htlc| Some(htlc.prev_hop.channel_id)).collect()
+	fn get_channel_ids(&self) -> Vec<ChannelId> {
+		self.htlcs.iter().map(|htlc| htlc.prev_hop.channel_id).collect()
 	}
 
 	/// Returns the inbound `user_channel_id`s for all HTLCs associated with the payment.
-	fn get_user_channel_ids(&self) -> Vec<Option<u128>> {
-		self.htlcs.iter().map(|htlc| htlc.prev_hop.user_channel_id).collect()
+	fn get_user_channel_ids(&self) -> Vec<u128> {
+		self.htlcs.iter().map(|htlc| htlc.prev_hop.user_channel_id.unwrap_or(0)).collect()
 	}
 }