X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fln%2Fmsgs.rs;h=5100ed79c38a54fcf07aba82e663b886325b4667;hb=8322c756cb3574d74cf1b88893dad14ec5be57ad;hp=843d08729e2e206441bd69f973015d7366a9c542;hpb=dfbdcf9e01f8dffd7696a2ed73d16f276acd4c22;p=rust-lightning

diff --git a/src/ln/msgs.rs b/src/ln/msgs.rs
index 843d0872..5100ed79 100644
--- 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)?;