X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Futil%2Fser_macros.rs;h=48e87b3bc2108a35b97282981b8738b5b87a93fb;hb=8cc3be9eab9ff322d543e989f28c775a69d6b78f;hp=2e1386a9c304e34f80beedd4b23a82ffac2c49da;hpb=1f1f82569a1774d2f6cb84e1de3c55dc733022c8;p=rust-lightning

diff --git a/src/util/ser_macros.rs b/src/util/ser_macros.rs
index 2e1386a9..48e87b3b 100644
--- a/src/util/ser_macros.rs
+++ b/src/util/ser_macros.rs
@@ -1,13 +1,37 @@
 macro_rules! impl_writeable {
-	($st:ident, {$($field:ident),*}) => {
-		impl<W: Writer> Writeable<W> for $st {
-			fn write(&self, w: &mut 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: Read> Readable<R> for $st {
+		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 R) -> Result<Self, DecodeError> {
 				Ok(Self {
 					$($field: Readable::read(r)?),*