X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Fser.rs;h=5f109e1a93c64529d09e462899fb539abf662c68;hb=1e580668684d4dbf11d69d75e5d4a5c4f8cc40bf;hp=7ff6b248cfb423feabf6d5277a0178aceaef82d7;hpb=3eb61f7e9b55531626936cf84c57cd7530a878a4;p=rust-lightning

diff --git a/lightning/src/util/ser.rs b/lightning/src/util/ser.rs
index 7ff6b248..5f109e1a 100644
--- a/lightning/src/util/ser.rs
+++ b/lightning/src/util/ser.rs
@@ -19,7 +19,6 @@ use crate::io_extras::{copy, sink};
 use core::hash::Hash;
 use crate::sync::{Mutex, RwLock};
 use core::cmp;
-use core::convert::TryFrom;
 use core::ops::Deref;
 
 use alloc::collections::BTreeMap;
@@ -28,6 +27,7 @@ use bitcoin::secp256k1::{PublicKey, SecretKey};
 use bitcoin::secp256k1::constants::{PUBLIC_KEY_SIZE, SECRET_KEY_SIZE, COMPACT_SIGNATURE_SIZE, SCHNORR_SIGNATURE_SIZE};
 use bitcoin::secp256k1::ecdsa;
 use bitcoin::secp256k1::schnorr;
+use bitcoin::amount::Amount;
 use bitcoin::blockdata::constants::ChainHash;
 use bitcoin::blockdata::script::{self, ScriptBuf};
 use bitcoin::blockdata::transaction::{OutPoint, Transaction, TxOut};
@@ -35,13 +35,12 @@ use bitcoin::{consensus, Witness};
 use bitcoin::consensus::Encodable;
 use bitcoin::hashes::sha256d::Hash as Sha256dHash;
 use bitcoin::hash_types::{Txid, BlockHash};
-use core::marker::Sized;
 use core::time::Duration;
 use crate::chain::ClaimId;
 use crate::ln::msgs::DecodeError;
 #[cfg(taproot)]
 use crate::ln::msgs::PartialSignatureWithNonce;
-use crate::ln::{PaymentPreimage, PaymentHash, PaymentSecret};
+use crate::ln::types::{PaymentPreimage, PaymentHash, PaymentSecret};
 
 use crate::util::byte_utils::{be48_to_array, slice_to_be48};
 use crate::util::string::UntrustedString;
@@ -902,7 +901,7 @@ impl Writeable for Vec<Witness> {
 	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
 		(self.len() as u16).write(w)?;
 		for witness in self {
-			(witness.serialized_len() as u16).write(w)?;
+			(witness.size() as u16).write(w)?;
 			witness.write(w)?;
 		}
 		Ok(())
@@ -922,7 +921,7 @@ impl Readable for Vec<Witness> {
 			// of witnesses. We'll just do a sanity check for the lengths and error if there is a mismatch.
 			let witness_len = <u16 as Readable>::read(r)? as usize;
 			let witness = <Witness as Readable>::read(r)?;
-			if witness.serialized_len() != witness_len {
+			if witness.size() != witness_len {
 				return Err(DecodeError::BadLengthDescriptor);
 			}
 			witnesses.push(witness);
@@ -1147,6 +1146,20 @@ impl<T: Readable> Readable for Option<T>
 	}
 }
 
+impl Writeable for Amount {
+	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
+		self.to_sat().write(w)
+	}
+}
+
+
+impl Readable for Amount {
+	fn read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
+		let amount: u64 = Readable::read(r)?;
+		Ok(Amount::from_sat(amount))
+	}
+}
+
 impl Writeable for Txid {
 	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
 		w.write_all(&self[..])
@@ -1494,10 +1507,10 @@ impl Readable for ClaimId {
 
 #[cfg(test)]
 mod tests {
-	use core::convert::TryFrom;
 	use bitcoin::hashes::hex::FromHex;
 	use bitcoin::secp256k1::ecdsa;
 	use crate::util::ser::{Readable, Hostname, Writeable};
+	use crate::prelude::*;
 
 	#[test]
 	fn hostname_conversion() {