f move and fix Vec<Witness> ser impl

Author: dunxen

lightning/src/ln/msgs.rs

@@ -1625,33 +1625,6 @@ impl_writeable_msg!(TxSignatures, {
 	witnesses,
 }, {});
 
-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.len() as u16).write(w)?;
-			for element in witness.iter() {
-				element.to_vec().write(w)?;
-			}
-		}
-		Ok(())
-	}
-}
-
-impl Readable for Vec<Witness> {
-	fn read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
-		let num_witnesses: u16 = Readable::read(r)?;
-		let mut witnesses = Vec::with_capacity(num_witnesses as usize);
-		for _ in 0..num_witnesses {
-			let num_elements: u16 = Readable::read(r)?;
-			let mut witness_stack = Vec::with_capacity(num_elements as usize);
-			for _ in 0..num_elements { witness_stack.push(Readable::read(r)?) }
-			witnesses.push(Witness::from_vec(witness_stack));
-		}
-		Ok(witnesses)
-	}
-}
-
 impl_writeable_msg!(TxInitRbf, {
 	channel_id,
 	locktime,

lightning/src/util/ser.rs

@@ -31,7 +31,7 @@ use bitcoin::secp256k1::schnorr;
 use bitcoin::blockdata::constants::ChainHash;
 use bitcoin::blockdata::script::Script;
 use bitcoin::blockdata::transaction::{OutPoint, Transaction, TxOut};
-use bitcoin::consensus;
+use bitcoin::{consensus, Witness};
 use bitcoin::consensus::Encodable;
 use bitcoin::hashes::sha256d::Hash as Sha256dHash;
 use bitcoin::hash_types::{Txid, BlockHash};
@@ -772,6 +772,39 @@ impl Readable for Vec<u8> {
 impl_for_vec!(ecdsa::Signature);
 impl_for_vec!((A, B), A, B);
 
+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.len() as u16).write(w)?;
+			for element in witness.iter() {
+				(element.len() as u16).write(w)?;
+				w.write_all(element)?;
+			}
+		}
+		Ok(())
+	}
+}
+
+impl Readable for Vec<Witness> {
+	fn read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
+		let num_witnesses = <u16 as Readable>::read(r)? as usize;
+		let mut witnesses = Vec::with_capacity(num_witnesses);
+		for _ in 0..num_witnesses {
+			let num_elements = <u16 as Readable>::read(r)? as usize;
+			let mut witness_stack = Vec::with_capacity(num_elements);
+			for _ in 0..num_elements {
+				let len = <u16 as Readable>::read(r)? as usize;
+				let mut buf = vec![0; len];
+				r.read_exact(&mut buf)?;
+				witness_stack.push(buf);
+			}
+			witnesses.push(Witness::from_vec(witness_stack));
+		}
+		Ok(witnesses)
+	}
+}
+
 impl Writeable for Script {
 	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
 		(self.len() as u16).write(w)?;