f unwrap_or rather than if let

Author: tnull

lightning/src/ln/channel.rs

@@ -6603,11 +6603,7 @@ impl<'a, Signer: Sign, K: Deref> ReadableArgs<(&'a K, u32)> for Channel<Signer>
 		// `user_id` used to be a single u64 value. In order to remain backwards
 		// compatible with versions prior to 0.0.113, the u128 is serialized as two
 		// separate u64 values.
-		let user_id = if let Some(user_id_high) = user_id_high_opt {
-			user_id_low as u128 + ((user_id_high as u128) << 64)
-		} else {
-			user_id_low as u128
-		};
+		let user_id = user_id_low as u128 + ((user_id_high_opt.unwrap_or(0) as u128) << 64);
 
 		Ok(Channel {
 			user_id,

lightning/src/util/events.rs

@@ -1054,13 +1054,9 @@ impl MaybeReadable for Event {
 					// `user_channel_id` used to be a single u64 value. In order to remain
 					// backwards compatible with versions prior to 0.0.113, the u128 is serialized
 					// as two separate u64 values.
-					let user_channel_id = if let Some(user_channel_id_low) = user_channel_id_low_opt {
-						if let Some(user_channel_id_high) = user_channel_id_high_opt {
-							user_channel_id_low as u128 + ((user_channel_id_high as u128) << 64)
-						} else {
-							user_channel_id_low as u128
-						}
-					} else { 0u128 };
+					let user_channel_id = (user_channel_id_low_opt.unwrap_or(0) as u128) +
+						((user_channel_id_high_opt.unwrap_or(0) as u128) << 64);
+
 					Ok(Some(Event::ChannelClosed { channel_id, user_channel_id, reason: reason.unwrap() }))
 				};
 				f()