add more message for Writeable

Author: yuntai

src/ln/msgs.rs

@@ -1719,6 +1719,86 @@ impl_writeable!(AcceptChannel, {
 	shutdown_scriptpubkey
 });
 
+impl_writeable!(AnnouncementSignatures, {
+	channel_id,
+	short_channel_id,
+	node_signature,
+	bitcoin_signature
+});
+
+impl<W: ::std::io::Write> Writeable<W> for ChannelReestablish {
+	fn write(&self, w: &mut Writer<W>) -> Result<(), DecodeError> {
+		self.channel_id.write(w)?;
+		self.next_local_commitment_number.write(w)?;
+		self.next_remote_commitment_number.write(w)?;
+		if let Some(ref data_loss_protect) = self.data_loss_protect {
+			data_loss_protect.your_last_per_commitment_secret.write(w)?;
+			data_loss_protect.my_current_per_commitment_point.write(w)?;
+		}
+		Ok(())
+	}
+}
+
+impl<R: ::std::io::Read> Readable<R> for ChannelReestablish{
+	fn read(r: &mut Reader<R>) -> Result<Self, DecodeError> {
+		Ok(Self {
+			channel_id: Readable::read(r)?,
+			next_local_commitment_number: Readable::read(r)?,
+			next_remote_commitment_number: Readable::read(r)?,
+			data_loss_protect: {
+				let mut buf = [0; 32+33];
+				match r.read_exact(&mut buf) {
+					Ok(()) => Some(DataLossProtect {
+						your_last_per_commitment_secret: {
+							let mut a: [u8; 32] = Default::default();
+							a.copy_from_slice(&buf[..32]);
+							a
+						},
+						my_current_per_commitment_point: secp_pubkey!(&Secp256k1::without_caps(), &buf[32..]),
+					}),
+					Err(DecodeError::ShortRead) => None,
+					Err(e) => return Err(e)
+				}
+			}
+		})
+	}
+}
+
+impl_writeable!(ClosingSigned, {
+	channel_id,
+	fee_satoshis,
+	signature
+});
+
+impl_writeable!(CommitmentSigned, {
+	channel_id,
+	signature,
+	htlc_signatures
+});
+
+impl_writeable!(DecodedOnionErrorPacket, {
+	hmac,
+	failuremsg,
+	pad
+});
+
+impl_writeable!(FundingCreated, {
+	temporary_channel_id,
+	funding_txid,
+	funding_output_index,
+	signature
+});
+
+impl_writeable!(FundingSigned, {
+	channel_id,
+	signature
+});
+
+impl_writeable!(FundingLocked, {
+	channel_id,
+	next_per_commitment_point
+});
+
 impl_writeable!(OpenChannel, {
 	chain_hash,
 	temporary_channel_id,
@@ -1741,20 +1821,9 @@ impl_writeable!(OpenChannel, {
 	shutdown_scriptpubkey
 });
 
-impl_writeable!(FundingCreated, {
-	temporary_channel_id,
-	funding_txid,
-	funding_output_index,
-	signature
-});
-
-impl_writeable!(FundingSigned, {
-	channel_id,
-	signature
-});
-
-impl_writeable!(FundingLocked, {
+impl_writeable!(RevokeAndACK, {
 	channel_id,
+	per_commitment_secret,
 	next_per_commitment_point
 });
 
@@ -1763,16 +1832,10 @@ impl_writeable!(Shutdown, {
 	scriptpubkey
 });
 
-impl_writeable!(ClosingSigned, {
-	channel_id,
-	fee_satoshis,
-	signature
-});
-
-impl_writeable!(UpdateFulfillHTLC, {
+impl_writeable!(UpdateFailHTLC, {
 	channel_id,
 	htlc_id,
-	payment_preimage
+	reason
 });
 
 impl_writeable!(UpdateFailMalformedHTLC, {
@@ -1782,40 +1845,21 @@ impl_writeable!(UpdateFailMalformedHTLC, {
 	failure_code
 });
 
-impl_writeable!(CommitmentSigned, {
-	channel_id,
-	signature,
-	htlc_signatures
-});
-
-impl_writeable!(RevokeAndACK, {
-	channel_id,
-	per_commitment_secret,
-	next_per_commitment_point
-});
-
 impl_writeable!(UpdateFee, {
 	channel_id,
 	feerate_per_kw
 });
 
-impl_writeable!(AnnouncementSignatures, {
+impl_writeable!(UpdateFulfillHTLC, {
 	channel_id,
-	short_channel_id,
-	node_signature,
-	bitcoin_signature
+	htlc_id,
+	payment_preimage
 });
 
 impl_writeable!(OnionErrorPacket, {
 	data
 });
 
-impl_writeable!(UpdateFailHTLC, {
-	channel_id,
-	htlc_id,
-	reason
-});
-
 impl<W: ::std::io::Write> Writeable<W> for OnionPacket {
 	fn write(&self, w: &mut Writer<W>) -> Result<(), DecodeError> {
 		self.version.write(w)?;
@@ -1897,43 +1941,6 @@ impl<R: ::std::io::Read> Readable<R> for Pong {
 	}
 }
 
-impl<W: ::std::io::Write> Writeable<W> for ChannelReestablish {
-	fn write(&self, w: &mut Writer<W>) -> Result<(), DecodeError> {
-		self.channel_id.write(w)?;
-		self.next_local_commitment_number.write(w)?;
-		self.next_remote_commitment_number.write(w)?;
-		if let Some(ref data_loss_protect) = self.data_loss_protect {
-			data_loss_protect.your_last_per_commitment_secret.write(w)?;
-			data_loss_protect.my_current_per_commitment_point.write(w)?;
-		}
-		Ok(())
-	}
-}
-
-impl<R: ::std::io::Read> Readable<R> for ChannelReestablish{
-	fn read(r: &mut Reader<R>) -> Result<Self, DecodeError> {
-		Ok(Self {
-			channel_id: Readable::read(r)?,
-			next_local_commitment_number: Readable::read(r)?,
-			next_remote_commitment_number: Readable::read(r)?,
-			data_loss_protect: {
-				let mut buf = [0; 32+33];
-				match r.read_exact(&mut buf) {
-					Ok(()) => Some(DataLossProtect {
-						your_last_per_commitment_secret: {
-							let mut a: [u8; 32] = Default::default();
-							a.copy_from_slice(&buf[..32]);
-							a
-						},
-						my_current_per_commitment_point: secp_pubkey!(&Secp256k1::without_caps(), &buf[32..]),
-					}),
-					Err(DecodeError::ShortRead) => None,
-					Err(e) => return Err(e)
-				}
-			}
-		})
-	}
-}
 
 #[cfg(test)]
 mod tests {