Merge pull request #3125 from valentinewallace/2024-06-async-payments-prefactor

[rust-lightning] / lightning / src / util / ser_macros.rs

diff --git a/lightning/src/util/ser_macros.rs b/lightning/src/util/ser_macros.rs
index 740b7c12561ce8466d1a2e30f56faacc797961ac..255fd3ebc327899c98bc599a4a3213834179bb79 100644 (file)
--- a/lightning/src/util/ser_macros.rs
+++ b/lightning/src/util/ser_macros.rs
@@ -633,7 +633,7 @@ macro_rules! impl_writeable_msg {
                                $($crate::_init_tlv_field_var!($tlvfield, $fieldty);)*
                                $crate::decode_tlv_stream!(r, {$(($type, $tlvfield, $fieldty)),*});
                                Ok(Self {
-                                       $($field),*,
+                                       $($field,)*
                                        $($tlvfield),*
                                })
                        }
@@ -1531,4 +1531,18 @@ mod tests {
        fn simple_test_tlv_write() {
                do_simple_test_tlv_write().unwrap();
        }
+
+       #[derive(Debug, Eq, PartialEq)]
+       struct EmptyMsg {}
+       impl_writeable_msg!(EmptyMsg, {}, {});
+
+       #[test]
+       fn impl_writeable_msg_empty() {
+               let msg = EmptyMsg {};
+               let mut encoded_msg = msg.encode();
+               assert!(encoded_msg.is_empty());
+               let mut encoded_msg_stream = Cursor::new(&mut encoded_msg);
+               let decoded_msg: EmptyMsg = Readable::read(&mut encoded_msg_stream).unwrap();
+               assert_eq!(msg, decoded_msg);
+       }
 }