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

diff --git a/src/util/ser_macros.rs b/src/util/ser_macros.rs
index 619d8e2f..80fbe7a9 100644
--- a/src/util/ser_macros.rs
+++ b/src/util/ser_macros.rs
@@ -1,14 +1,36 @@
 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<W: Writer> Writeable<W> for $st {
+			fn write(&self, w: &mut W) -> Result<(), ::std::io::Error> {
+				w.size_hint($len);
 				$( self.$field.write(w)?; )*
 				Ok(())
 			}
 		}
 
-		impl<R: ::std::io::Read> Readable<R> for $st {
-			fn read(r: &mut Reader<R>) -> Result<Self, DecodeError> {
+		impl<R: Read> Readable<R> for $st {
+			fn read(r: &mut R) -> Result<Self, DecodeError> {
+				Ok(Self {
+					$($field: Readable::read(r)?),*
+				})
+			}
+		}
+	}
+}
+macro_rules! impl_writeable_len_match {
+	($st:ident, {$({$m: pat, $l: expr}),*}, {$($field:ident),*}) => {
+		impl<W: Writer> Writeable<W> for $st {
+			fn write(&self, w: &mut W) -> Result<(), ::std::io::Error> {
+				w.size_hint(match *self {
+					$($m => $l,)*
+				});
+				$( self.$field.write(w)?; )*
+				Ok(())
+			}
+		}
+
+		impl<R: Read> Readable<R> for $st {
+			fn read(r: &mut R) -> Result<Self, DecodeError> {
 				Ok(Self {
 					$($field: Readable::read(r)?),*
 				})