X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Futil%2Fser_macros.rs;h=48e87b3bc2108a35b97282981b8738b5b87a93fb;hb=a2df43d525322812a6081e5ae0a666ce79efc20b;hp=619d8e2f782595f0c1b76927fffc7dcb76ca9e23;hpb=51ba6ad2e95d4ddb172b4d4d4b067f94fcdb0aac;p=rust-lightning

diff --git a/src/util/ser_macros.rs b/src/util/ser_macros.rs
index 619d8e2f..48e87b3b 100644
--- a/src/util/ser_macros.rs
+++ b/src/util/ser_macros.rs
@@ -1,14 +1,38 @@
 macro_rules! impl_writeable {
-	($st:ident, {$($field:ident),*}) => {
-		impl<W: ::std::io::Write> Writeable<W> for $st {
-			fn write(&self, w: &mut Writer<W>) -> Result<(), DecodeError> {
+	($st:ident, $len: expr, {$($field:ident),*}) => {
+		impl ::util::ser::Writeable for $st {
+			fn write<W: ::util::ser::Writer>(&self, w: &mut W) -> Result<(), ::std::io::Error> {
+				if $len != 0 {
+					w.size_hint($len);
+				}
+				$( self.$field.write(w)?; )*
+				Ok(())
+			}
+		}
+
+		impl<R: ::std::io::Read> ::util::ser::Readable<R> for $st {
+			fn read(r: &mut R) -> Result<Self, ::ln::msgs::DecodeError> {
+				Ok(Self {
+					$($field: ::util::ser::Readable::read(r)?),*
+				})
+			}
+		}
+	}
+}
+macro_rules! impl_writeable_len_match {
+	($st:ident, {$({$m: pat, $l: expr}),*}, {$($field:ident),*}) => {
+		impl Writeable for $st {
+			fn write<W: Writer>(&self, w: &mut W) -> Result<(), ::std::io::Error> {
+				w.size_hint(match *self {
+					$($m => $l,)*
+				});
 				$( self.$field.write(w)?; )*
 				Ok(())
 			}
 		}
 
 		impl<R: ::std::io::Read> Readable<R> for $st {
-			fn read(r: &mut Reader<R>) -> Result<Self, DecodeError> {
+			fn read(r: &mut R) -> Result<Self, DecodeError> {
 				Ok(Self {
 					$($field: Readable::read(r)?),*
 				})