Drop SerialId type as bindings don't support primitive aliasing

Author: TheBlueMatt

lightning/src/ln/interactivetxs.rs

@@ -34,8 +34,9 @@ use crate::ln::chan_utils::{
 use crate::ln::channel::{FundingNegotiationContext, TOTAL_BITCOIN_SUPPLY_SATOSHIS};
 use crate::ln::funding::FundingTxInput;
 use crate::ln::msgs;
-use crate::ln::msgs::{MessageSendEvent, SerialId, TxSignatures};
+use crate::ln::msgs::{MessageSendEvent, TxSignatures};
 use crate::ln::types::ChannelId;
+type SerialId = u64;
 use crate::sign::{EntropySource, P2TR_KEY_PATH_WITNESS_WEIGHT, P2WPKH_WITNESS_WEIGHT};
 
 use core::fmt::Display;

lightning/src/ln/msgs.rs

@@ -450,10 +450,6 @@ pub struct ChannelReady {
 	pub short_channel_id_alias: Option<u64>,
 }
 
-/// A randomly chosen number that is used to identify inputs within an interactive transaction
-/// construction.
-pub type SerialId = u64;
-
 /// An `stfu` (quiescence) message to be sent by or received from the stfu initiator.
 ///
 // TODO(splicing): Add spec link for `stfu`; still in draft, using from https://github.com/lightning/bolts/pull/1160
@@ -521,7 +517,7 @@ pub struct TxAddInput {
 	pub channel_id: ChannelId,
 	/// A randomly chosen unique identifier for this input, which is even for initiators and odd for
 	/// non-initiators.
-	pub serial_id: SerialId,
+	pub serial_id: u64,
 	/// Serialized transaction that contains the output this input spends to verify that it is
 	/// non-malleable. Omitted for shared input.
 	pub prevtx: Option<Transaction>,
@@ -542,7 +538,7 @@ pub struct TxAddOutput {
 	pub channel_id: ChannelId,
 	/// A randomly chosen unique identifier for this output, which is even for initiators and odd for
 	/// non-initiators.
-	pub serial_id: SerialId,
+	pub serial_id: u64,
 	/// The satoshi value of the output
 	pub sats: u64,
 	/// The scriptPubKey for the output
@@ -557,7 +553,7 @@ pub struct TxRemoveInput {
 	/// The channel ID
 	pub channel_id: ChannelId,
 	/// The serial ID of the input to be removed
-	pub serial_id: SerialId,
+	pub serial_id: u64,
 }
 
 /// A [`tx_remove_output`] message for removing an output during interactive transaction construction.
@@ -568,7 +564,7 @@ pub struct TxRemoveOutput {
 	/// The channel ID
 	pub channel_id: ChannelId,
 	/// The serial ID of the output to be removed
-	pub serial_id: SerialId,
+	pub serial_id: u64,
 }
 
 /// [`A tx_complete`] message signalling the conclusion of a peer's transaction contributions during
@@ -2848,7 +2844,7 @@ impl Writeable for TxAddInput {
 impl LengthReadable for TxAddInput {
 	fn read_from_fixed_length_buffer<R: LengthLimitedRead>(r: &mut R) -> Result<Self, DecodeError> {
 		let channel_id: ChannelId = Readable::read(r)?;
-		let serial_id: SerialId = Readable::read(r)?;
+		let serial_id: u64 = Readable::read(r)?;
 
 		let prevtx_len: u16 = Readable::read(r)?;
 		let prevtx = if prevtx_len > 0 {

lightning/src/util/ser.rs

@@ -48,7 +48,7 @@ use dnssec_prover::rr::Name;
 use crate::chain::ClaimId;
 #[cfg(taproot)]
 use crate::ln::msgs::PartialSignatureWithNonce;
-use crate::ln::msgs::{DecodeError, SerialId};
+use crate::ln::msgs::DecodeError;
 use crate::types::payment::{PaymentHash, PaymentPreimage, PaymentSecret};
 use crate::types::string::UntrustedString;
 use crate::util::byte_utils::{be48_to_array, slice_to_be48};
@@ -1089,7 +1089,7 @@ impl_for_vec!(crate::ln::channelmanager::MonitorUpdateCompletionAction);
 impl_for_vec!(crate::ln::channelmanager::PaymentClaimDetails);
 impl_for_vec!(crate::ln::msgs::SocketAddress);
 impl_for_vec!((A, B), A, B);
-impl_for_vec!(SerialId);
+impl_for_vec!(u64);
 impl_for_vec!(TxInMetadata);
 impl_for_vec!(TxOutMetadata);
 impl_for_vec!(crate::ln::our_peer_storage::PeerStorageMonitorHolder);