X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Fser.rs;h=fd0e9f7a383b2bb9e0530e183e5ee9203218e065;hb=eff8af21103e43f763cb10ae6a75c1543a2d4068;hp=44fdd1c0cf4d3097d27e7abebb83e0a397f0ac86;hpb=569f9038bec1f0ba09cfb01c35222a9365ee77d6;p=rust-lightning diff --git a/lightning/src/util/ser.rs b/lightning/src/util/ser.rs index 44fdd1c0..fd0e9f7a 100644 --- a/lightning/src/util/ser.rs +++ b/lightning/src/util/ser.rs @@ -8,16 +8,16 @@ use std::hash::Hash; use std::sync::Mutex; use std::cmp; -use secp256k1::Signature; -use secp256k1::key::{PublicKey, SecretKey}; +use bitcoin::secp256k1::Signature; +use bitcoin::secp256k1::key::{PublicKey, SecretKey}; use bitcoin::blockdata::script::Script; -use bitcoin::blockdata::transaction::{OutPoint, Transaction}; +use bitcoin::blockdata::transaction::{OutPoint, Transaction, TxOut}; use bitcoin::consensus; use bitcoin::consensus::Encodable; -use bitcoin_hashes::sha256d::Hash as Sha256dHash; +use bitcoin::hashes::sha256d::Hash as Sha256dHash; use std::marker::Sized; use ln::msgs::DecodeError; -use ln::channelmanager::{PaymentPreimage, PaymentHash}; +use ln::channelmanager::{PaymentPreimage, PaymentHash, PaymentSecret}; use util::byte_utils; use util::byte_utils::{be64_to_array, be48_to_array, be32_to_array, be16_to_array, slice_to_be16, slice_to_be32, slice_to_be48, slice_to_be64}; @@ -172,23 +172,33 @@ pub trait Writeable { } } +impl<'a, T: Writeable> Writeable for &'a T { + fn write(&self, writer: &mut W) -> Result<(), ::std::io::Error> { (*self).write(writer) } +} + /// A trait that various rust-lightning types implement allowing them to be read in from a Read -pub trait Readable - where Self: Sized, - R: Read +pub trait Readable + where Self: Sized { /// Reads a Self in from the given Read - fn read(reader: &mut R) -> Result; + fn read(reader: &mut R) -> Result; } /// A trait that various higher-level rust-lightning types implement allowing them to be read in /// from a Read given some additional set of arguments which is required to deserialize. -pub trait ReadableArgs - where Self: Sized, - R: Read +pub trait ReadableArgs

+ where Self: Sized +{ + /// Reads a Self in from the given Read + fn read(reader: &mut R, params: P) -> Result; +} + +/// A trait that various rust-lightning types implement allowing them to (maybe) be read in from a Read +pub trait MaybeReadable + where Self: Sized { /// Reads a Self in from the given Read - fn read(reader: &mut R, params: P) -> Result; + fn read(reader: &mut R) -> Result, DecodeError>; } pub(crate) struct U48(pub u64); @@ -198,9 +208,9 @@ impl Writeable for U48 { writer.write_all(&be48_to_array(self.0)) } } -impl Readable for U48 { +impl Readable for U48 { #[inline] - fn read(reader: &mut R) -> Result { + fn read(reader: &mut R) -> Result { let mut buf = [0; 6]; reader.read_exact(&mut buf)?; Ok(U48(slice_to_be48(&buf))) @@ -237,9 +247,9 @@ impl Writeable for BigSize { } } } -impl Readable for BigSize { +impl Readable for BigSize { #[inline] - fn read(reader: &mut R) -> Result { + fn read(reader: &mut R) -> Result { let n: u8 = Readable::read(reader)?; match n { 0xFF => { @@ -292,17 +302,17 @@ macro_rules! impl_writeable_primitive { writer.write_all(&$meth_write(self.0)[(self.0.leading_zeros()/8) as usize..$len]) } } - impl Readable for $val_type { + impl Readable for $val_type { #[inline] - fn read(reader: &mut R) -> Result<$val_type, DecodeError> { + fn read(reader: &mut R) -> Result<$val_type, DecodeError> { let mut buf = [0; $len]; reader.read_exact(&mut buf)?; Ok($meth_read(&buf)) } } - impl Readable for HighZeroBytesDroppedVarInt<$val_type> { + impl Readable for HighZeroBytesDroppedVarInt<$val_type> { #[inline] - fn read(reader: &mut R) -> Result, DecodeError> { + fn read(reader: &mut R) -> Result, DecodeError> { // We need to accept short reads (read_len == 0) as "EOF" and handle them as simply // the high bytes being dropped. To do so, we start reading into the middle of buf // and then convert the appropriate number of bytes with extra high bytes out of @@ -337,9 +347,9 @@ impl Writeable for u8 { writer.write_all(&[*self]) } } -impl Readable for u8 { +impl Readable for u8 { #[inline] - fn read(reader: &mut R) -> Result { + fn read(reader: &mut R) -> Result { let mut buf = [0; 1]; reader.read_exact(&mut buf)?; Ok(buf[0]) @@ -352,9 +362,9 @@ impl Writeable for bool { writer.write_all(&[if *self {1} else {0}]) } } -impl Readable for bool { +impl Readable for bool { #[inline] - fn read(reader: &mut R) -> Result { + fn read(reader: &mut R) -> Result { let mut buf = [0; 1]; reader.read_exact(&mut buf)?; if buf[0] != 0 && buf[0] != 1 { @@ -375,10 +385,10 @@ macro_rules! impl_array { } } - impl Readable for [u8; $size] + impl Readable for [u8; $size] { #[inline] - fn read(r: &mut R) -> Result { + fn read(r: &mut R) -> Result { let mut buf = [0u8; $size]; r.read_exact(&mut buf)?; Ok(buf) @@ -413,13 +423,12 @@ impl Writeable for HashMap } } -impl Readable for HashMap - where R: Read, - K: Readable + Eq + Hash, - V: Readable +impl Readable for HashMap + where K: Readable + Eq + Hash, + V: Readable { #[inline] - fn read(r: &mut R) -> Result { + fn read(r: &mut R) -> Result { let len: u16 = Readable::read(r)?; let mut ret = HashMap::with_capacity(len as usize); for _ in 0..len { @@ -438,9 +447,9 @@ impl Writeable for Vec { } } -impl Readable for Vec { +impl Readable for Vec { #[inline] - fn read(r: &mut R) -> Result { + fn read(r: &mut R) -> Result { let len: u16 = Readable::read(r)?; let mut ret = Vec::with_capacity(len as usize); ret.resize(len as usize, 0); @@ -459,9 +468,9 @@ impl Writeable for Vec { } } -impl Readable for Vec { +impl Readable for Vec { #[inline] - fn read(r: &mut R) -> Result { + fn read(r: &mut R) -> Result { let len: u16 = Readable::read(r)?; let byte_size = (len as usize) .checked_mul(33) @@ -482,9 +491,9 @@ impl Writeable for Script { } } -impl Readable for Script { - fn read(r: &mut R) -> Result { - let len = >::read(r)? as usize; +impl Readable for Script { + fn read(r: &mut R) -> Result { + let len = ::read(r)? as usize; let mut buf = vec![0; len]; r.read_exact(&mut buf)?; Ok(Script::from(buf)) @@ -497,8 +506,8 @@ impl Writeable for PublicKey { } } -impl Readable for PublicKey { - fn read(r: &mut R) -> Result { +impl Readable for PublicKey { + fn read(r: &mut R) -> Result { let buf: [u8; 33] = Readable::read(r)?; match PublicKey::from_slice(&buf) { Ok(key) => Ok(key), @@ -515,8 +524,8 @@ impl Writeable for SecretKey { } } -impl Readable for SecretKey { - fn read(r: &mut R) -> Result { +impl Readable for SecretKey { + fn read(r: &mut R) -> Result { let buf: [u8; 32] = Readable::read(r)?; match SecretKey::from_slice(&buf) { Ok(key) => Ok(key), @@ -531,9 +540,9 @@ impl Writeable for Sha256dHash { } } -impl Readable for Sha256dHash { - fn read(r: &mut R) -> Result { - use bitcoin_hashes::Hash; +impl Readable for Sha256dHash { + fn read(r: &mut R) -> Result { + use bitcoin::hashes::Hash; let buf: [u8; 32] = Readable::read(r)?; Ok(Sha256dHash::from_slice(&buf[..]).unwrap()) @@ -546,8 +555,8 @@ impl Writeable for Signature { } } -impl Readable for Signature { - fn read(r: &mut R) -> Result { +impl Readable for Signature { + fn read(r: &mut R) -> Result { let buf: [u8; 64] = Readable::read(r)?; match Signature::from_compact(&buf) { Ok(sig) => Ok(sig), @@ -562,8 +571,8 @@ impl Writeable for PaymentPreimage { } } -impl Readable for PaymentPreimage { - fn read(r: &mut R) -> Result { +impl Readable for PaymentPreimage { + fn read(r: &mut R) -> Result { let buf: [u8; 32] = Readable::read(r)?; Ok(PaymentPreimage(buf)) } @@ -575,19 +584,34 @@ impl Writeable for PaymentHash { } } -impl Readable for PaymentHash { - fn read(r: &mut R) -> Result { +impl Readable for PaymentHash { + fn read(r: &mut R) -> Result { let buf: [u8; 32] = Readable::read(r)?; Ok(PaymentHash(buf)) } } +impl Writeable for PaymentSecret { + fn write(&self, w: &mut W) -> Result<(), ::std::io::Error> { + self.0.write(w) + } +} + +impl Readable for PaymentSecret { + fn read(r: &mut R) -> Result { + let buf: [u8; 32] = Readable::read(r)?; + Ok(PaymentSecret(buf)) + } +} + impl Writeable for Option { fn write(&self, w: &mut W) -> Result<(), ::std::io::Error> { match *self { None => 0u8.write(w)?, Some(ref data) => { - 1u8.write(w)?; + let mut len_calc = LengthCalculatingWriter(0); + data.write(&mut len_calc).expect("No in-memory data may fail to serialize"); + BigSize(len_calc.0 as u64 + 1).write(w)?; data.write(w)?; } } @@ -595,15 +619,15 @@ impl Writeable for Option { } } -impl Readable for Option - where R: Read, - T: Readable +impl Readable for Option { - fn read(r: &mut R) -> Result { - match >::read(r)? { + fn read(r: &mut R) -> Result { + match BigSize::read(r)?.0 { 0 => Ok(None), - 1 => Ok(Some(Readable::read(r)?)), - _ => return Err(DecodeError::InvalidValue), + len => { + let mut reader = FixedLengthReader::new(r, len - 1); + Ok(Some(Readable::read(&mut reader)?)) + } } } } @@ -616,8 +640,8 @@ impl Writeable for OutPoint { } } -impl Readable for OutPoint { - fn read(r: &mut R) -> Result { +impl Readable for OutPoint { + fn read(r: &mut R) -> Result { let txid = Readable::read(r)?; let vout = Readable::read(r)?; Ok(OutPoint { @@ -627,29 +651,35 @@ impl Readable for OutPoint { } } -impl Writeable for Transaction { - fn write(&self, writer: &mut W) -> Result<(), ::std::io::Error> { - match self.consensus_encode(WriterWriteAdaptor(writer)) { - Ok(_) => Ok(()), - Err(consensus::encode::Error::Io(e)) => Err(e), - Err(_) => panic!("We shouldn't get a consensus::encode::Error unless our Write generated an std::io::Error"), +macro_rules! impl_consensus_ser { + ($bitcoin_type: ty) => { + impl Writeable for $bitcoin_type { + fn write(&self, writer: &mut W) -> Result<(), ::std::io::Error> { + match self.consensus_encode(WriterWriteAdaptor(writer)) { + Ok(_) => Ok(()), + Err(consensus::encode::Error::Io(e)) => Err(e), + Err(_) => panic!("We shouldn't get a consensus::encode::Error unless our Write generated an std::io::Error"), + } + } } - } -} -impl Readable for Transaction { - fn read(r: &mut R) -> Result { - match consensus::encode::Decodable::consensus_decode(r) { - Ok(t) => Ok(t), - Err(consensus::encode::Error::Io(ref e)) if e.kind() == ::std::io::ErrorKind::UnexpectedEof => Err(DecodeError::ShortRead), - Err(consensus::encode::Error::Io(e)) => Err(DecodeError::Io(e)), - Err(_) => Err(DecodeError::InvalidValue), + impl Readable for $bitcoin_type { + fn read(r: &mut R) -> Result { + match consensus::encode::Decodable::consensus_decode(r) { + Ok(t) => Ok(t), + Err(consensus::encode::Error::Io(ref e)) if e.kind() == ::std::io::ErrorKind::UnexpectedEof => Err(DecodeError::ShortRead), + Err(consensus::encode::Error::Io(e)) => Err(DecodeError::Io(e)), + Err(_) => Err(DecodeError::InvalidValue), + } + } } } } +impl_consensus_ser!(Transaction); +impl_consensus_ser!(TxOut); -impl> Readable for Mutex { - fn read(r: &mut R) -> Result { +impl Readable for Mutex { + fn read(r: &mut R) -> Result { let t: T = Readable::read(r)?; Ok(Mutex::new(t)) } @@ -660,8 +690,8 @@ impl Writeable for Mutex { } } -impl, B: Readable> Readable for (A, B) { - fn read(r: &mut R) -> Result { +impl Readable for (A, B) { + fn read(r: &mut R) -> Result { let a: A = Readable::read(r)?; let b: B = Readable::read(r)?; Ok((a, b))