Stop checking size > 64KB in serialization

This removes a bunch of potentially new error handling in writers
and the checks were kinda useless anyway - in normal operation we
unwrap()ed anyway, and we're gonna want to use the serializtion
framework for ChannelMonitor/ChannelManager serialization, which
may generate things larger than 64KB anyway.

diff --git a/src/ln/msgs.rs b/src/ln/msgs.rs
index 843d08729e2e206441bd69f973015d7366a9c542..5100ed79c38a54fcf07aba82e663b886325b4667 100644 (file)
--- a/src/ln/msgs.rs
+++ b/src/ln/msgs.rs
@@ -743,7 +743,7 @@ impl_writeable!(AnnouncementSignatures, 32+8+64*2, {
 });
 
 impl<W: Writer> Writeable<W> for ChannelReestablish {
-       fn write(&self, w: &mut W) -> Result<(), DecodeError> {
+       fn write(&self, w: &mut W) -> Result<(), ::std::io::Error> {
                w.size_hint(if self.data_loss_protect.is_some() { 32+2*8+33+32 } else { 32+2*8 });
                self.channel_id.write(w)?;
                self.next_local_commitment_number.write(w)?;
@@ -906,7 +906,7 @@ impl_writeable_len_match!(OnionErrorPacket, {
 });
 
 impl<W: Writer> Writeable<W> for OnionPacket {
-       fn write(&self, w: &mut W) -> Result<(), DecodeError> {
+       fn write(&self, w: &mut W) -> Result<(), ::std::io::Error> {
                w.size_hint(1 + 33 + 20*65 + 32);
                self.version.write(w)?;
                match self.public_key {
@@ -944,7 +944,7 @@ impl_writeable!(UpdateAddHTLC, 32+8+8+32+4+1366, {
 });
 
 impl<W: Writer> Writeable<W> for OnionRealm0HopData {
-       fn write(&self, w: &mut W) -> Result<(), DecodeError> {
+       fn write(&self, w: &mut W) -> Result<(), ::std::io::Error> {
                w.size_hint(32);
                self.short_channel_id.write(w)?;
                self.amt_to_forward.write(w)?;
@@ -969,7 +969,7 @@ impl<R: Read> Readable<R> for OnionRealm0HopData {
 }
 
 impl<W: Writer> Writeable<W> for OnionHopData {
-       fn write(&self, w: &mut W) -> Result<(), DecodeError> {
+       fn write(&self, w: &mut W) -> Result<(), ::std::io::Error> {
                w.size_hint(65);
                self.realm.write(w)?;
                self.data.write(w)?;
@@ -995,7 +995,7 @@ impl<R: Read> Readable<R> for OnionHopData {
 }
 
 impl<W: Writer> Writeable<W> for Ping {
-       fn write(&self, w: &mut W) -> Result<(), DecodeError> {
+       fn write(&self, w: &mut W) -> Result<(), ::std::io::Error> {
                w.size_hint(self.byteslen as usize + 4);
                self.ponglen.write(w)?;
                vec![0u8; self.byteslen as usize].write(w)?; // size-unchecked write
@@ -1017,7 +1017,7 @@ impl<R: Read> Readable<R> for Ping {
 }
 
 impl<W: Writer> Writeable<W> for Pong {
-       fn write(&self, w: &mut W) -> Result<(), DecodeError> {
+       fn write(&self, w: &mut W) -> Result<(), ::std::io::Error> {
                w.size_hint(self.byteslen as usize + 2);
                vec![0u8; self.byteslen as usize].write(w)?; // size-unchecked write
                Ok(())
@@ -1037,7 +1037,7 @@ impl<R: Read> Readable<R> for Pong {
 }
 
 impl<W: Writer> Writeable<W> for UnsignedChannelAnnouncement {
-       fn write(&self, w: &mut W) -> Result<(), DecodeError> {
+       fn write(&self, w: &mut W) -> Result<(), ::std::io::Error> {
                w.size_hint(2 + 2*32 + 4*33 + self.features.flags.len() + self.excess_data.len());
                self.features.write(w)?;
                self.chain_hash.write(w)?;
@@ -1088,7 +1088,7 @@ impl_writeable_len_match!(ChannelAnnouncement, {
 });
 
 impl<W: Writer> Writeable<W> for UnsignedChannelUpdate {
-       fn write(&self, w: &mut W) -> Result<(), DecodeError> {
+       fn write(&self, w: &mut W) -> Result<(), ::std::io::Error> {
                w.size_hint(64 + self.excess_data.len());
                self.chain_hash.write(w)?;
                self.short_channel_id.write(w)?;
@@ -1132,7 +1132,7 @@ impl_writeable_len_match!(ChannelUpdate, {
 });
 
 impl<W: Writer> Writeable<W> for ErrorMessage {
-       fn write(&self, w: &mut W) -> Result<(), DecodeError> {
+       fn write(&self, w: &mut W) -> Result<(), ::std::io::Error> {
                w.size_hint(32 + 2 + self.data.len());
                self.channel_id.write(w)?;
                (self.data.len() as u16).write(w)?;
@@ -1160,7 +1160,7 @@ impl<R: Read> Readable<R> for ErrorMessage {
 }
 
 impl<W: Writer> Writeable<W> for UnsignedNodeAnnouncement {
-       fn write(&self, w: &mut W) -> Result<(), DecodeError> {
+       fn write(&self, w: &mut W) -> Result<(), ::std::io::Error> {
                w.size_hint(64 + 76 + self.features.flags.len() + self.addresses.len()*38 + self.excess_address_data.len() + self.excess_data.len());
                self.features.write(w)?;
                self.timestamp.write(w)?;

diff --git a/src/util/ser.rs b/src/util/ser.rs
index fe92332dfe93571636284687d345b6cb4f83f230..18aa7eee9da8ced1b7e23cf48742fa3cd23736d2 100644 (file)
--- a/src/util/ser.rs
+++ b/src/util/ser.rs
@@ -38,7 +38,7 @@ impl<W: ::std::io::Write> Writer for W {
 /// A trait that various rust-lightning types implement allowing them to be written out to a Writer
 pub trait Writeable<W: Writer> {
        /// Writes self out to the given Writer
-       fn write(&self, writer: &mut W) -> Result<(), DecodeError>;
+       fn write(&self, writer: &mut W) -> Result<(), ::std::io::Error>;
 }
 
 /// A trait that various rust-lightning types implement allowing them to be read in from a Read
@@ -54,8 +54,8 @@ macro_rules! impl_writeable_primitive {
        ($val_type:ty, $meth_write:ident, $len: expr, $meth_read:ident) => {
                impl<W: Writer> Writeable<W> for $val_type {
                        #[inline]
-                       fn write(&self, writer: &mut W) -> Result<(), DecodeError> {
-                               Ok(writer.write_all(&$meth_write(*self))?)
+                       fn write(&self, writer: &mut W) -> Result<(), ::std::io::Error> {
+                               writer.write_all(&$meth_write(*self))
                        }
                }
                impl<R: Read> Readable<R> for $val_type {
@@ -75,8 +75,8 @@ impl_writeable_primitive!(u16, be16_to_array, 2, slice_to_be16);
 
 impl<W: Writer> Writeable<W> for u8 {
        #[inline]
-       fn write(&self, writer: &mut W) -> Result<(), DecodeError> {
-               Ok(writer.write_all(&[*self])?)
+       fn write(&self, writer: &mut W) -> Result<(), ::std::io::Error> {
+               writer.write_all(&[*self])
        }
 }
 impl<R: Read> Readable<R> for u8 {
@@ -90,8 +90,8 @@ impl<R: Read> Readable<R> for u8 {
 
 impl<W: Writer> Writeable<W> for bool {
        #[inline]
-       fn write(&self, writer: &mut W) -> Result<(), DecodeError> {
-               Ok(writer.write_all(&[if *self {1} else {0}])?)
+       fn write(&self, writer: &mut W) -> Result<(), ::std::io::Error> {
+               writer.write_all(&[if *self {1} else {0}])
        }
 }
 impl<R: Read> Readable<R> for bool {
@@ -112,9 +112,8 @@ macro_rules! impl_array {
                impl<W: Writer> Writeable<W> for [u8; $size]
                {
                        #[inline]
-                       fn write(&self, w: &mut W) -> Result<(), DecodeError> {
-                               w.write_all(self)?;
-                               Ok(())
+                       fn write(&self, w: &mut W) -> Result<(), ::std::io::Error> {
+                               w.write_all(self)
                        }
                }
 
@@ -143,7 +142,7 @@ impl<W, K, V> Writeable<W> for HashMap<K, V>
              V: Writeable<W>
 {
        #[inline]
-       fn write(&self, w: &mut W) -> Result<(), DecodeError> {
+       fn write(&self, w: &mut W) -> Result<(), ::std::io::Error> {
        (self.len() as u16).write(w)?;
                for (key, value) in self.iter() {
                        key.write(w)?;
@@ -172,9 +171,9 @@ impl<R, K, V> Readable<R> for HashMap<K, V>
 // Vectors
 impl<W: Writer> Writeable<W> for Vec<u8> {
        #[inline]
-       fn write(&self, w: &mut W) -> Result<(), DecodeError> {
+       fn write(&self, w: &mut W) -> Result<(), ::std::io::Error> {
                (self.len() as u16).write(w)?;
-               Ok(w.write_all(&self)?)
+               w.write_all(&self)
        }
 }
 
@@ -190,13 +189,7 @@ impl<R: Read> Readable<R> for Vec<u8> {
 }
 impl<W: Writer> Writeable<W> for Vec<Signature> {
        #[inline]
-       fn write(&self, w: &mut W) -> Result<(), DecodeError> {
-               let byte_size = (self.len() as usize)
-                               .checked_mul(33)
-                               .ok_or(DecodeError::BadLengthDescriptor)?;
-               if byte_size > MAX_BUF_SIZE {
-                       return Err(DecodeError::BadLengthDescriptor);
-               }
+       fn write(&self, w: &mut W) -> Result<(), ::std::io::Error> {
                (self.len() as u16).write(w)?;
                for e in self.iter() {
                        e.write(w)?;
@@ -222,9 +215,9 @@ impl<R: Read> Readable<R> for Vec<Signature> {
 }
 
 impl<W: Writer> Writeable<W> for Script {
-       fn write(&self, w: &mut W) -> Result<(), DecodeError> {
+       fn write(&self, w: &mut W) -> Result<(), ::std::io::Error> {
                (self.len() as u16).write(w)?;
-               Ok(w.write_all(self.as_bytes())?)
+               w.write_all(self.as_bytes())
        }
 }
 
@@ -238,7 +231,7 @@ impl<R: Read> Readable<R> for Script {
 }
 
 impl<W: Writer> Writeable<W> for Option<Script> {
-       fn write(&self, w: &mut W) -> Result<(), DecodeError> {
+       fn write(&self, w: &mut W) -> Result<(), ::std::io::Error> {
                if let &Some(ref script) = self {
                        script.write(w)?;
                }
@@ -261,7 +254,7 @@ impl<R: Read> Readable<R> for Option<Script> {
 }
 
 impl<W: Writer> Writeable<W> for PublicKey {
-       fn write(&self, w: &mut W) -> Result<(), DecodeError> {
+       fn write(&self, w: &mut W) -> Result<(), ::std::io::Error> {
                self.serialize().write(w)
        }
 }
@@ -277,7 +270,7 @@ impl<R: Read> Readable<R> for PublicKey {
 }
 
 impl<W: Writer> Writeable<W> for Sha256dHash {
-       fn write(&self, w: &mut W) -> Result<(), DecodeError> {
+       fn write(&self, w: &mut W) -> Result<(), ::std::io::Error> {
                self.as_bytes().write(w)
        }
 }
@@ -290,7 +283,7 @@ impl<R: Read> Readable<R> for Sha256dHash {
 }
 
 impl<W: Writer> Writeable<W> for Signature {
-       fn write(&self, w: &mut W) -> Result<(), DecodeError> {
+       fn write(&self, w: &mut W) -> Result<(), ::std::io::Error> {
                self.serialize_compact(&Secp256k1::without_caps()).write(w)
        }
 }

diff --git a/src/util/ser_macros.rs b/src/util/ser_macros.rs
index 162b18947a37986a0eb53b1c532830dbd297af0a..80fbe7a9a0a8f76919817d76090e7b7f5e804e74 100644 (file)
--- a/src/util/ser_macros.rs
+++ b/src/util/ser_macros.rs
@@ -1,7 +1,7 @@
 macro_rules! impl_writeable {
        ($st:ident, $len: expr, {$($field:ident),*}) => {
                impl<W: Writer> Writeable<W> for $st {
-                       fn write(&self, w: &mut W) -> Result<(), DecodeError> {
+                       fn write(&self, w: &mut W) -> Result<(), ::std::io::Error> {
                                w.size_hint($len);
                                $( self.$field.write(w)?; )*
                                Ok(())
@@ -20,7 +20,7 @@ macro_rules! impl_writeable {
 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<(), DecodeError> {
+                       fn write(&self, w: &mut W) -> Result<(), ::std::io::Error> {
                                w.size_hint(match *self {
                                        $($m => $l,)*
                                });