Add tx_signatures encoding test

Author: dunxen

lightning/src/ln/msgs.rs

@@ -1489,16 +1489,15 @@ impl_writeable_msg!(TxSignatures, {
 
 impl Writeable for Vec<Witness> {
 	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
-        (self.len() as u16).write(w)?;
+		(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)?;
 				element.to_vec().write(w)?;
 			}
 		}
 		Ok(())
-    }
+	}
 }
 
 impl Readable for Vec<Witness> {
@@ -1507,15 +1506,8 @@ impl Readable for Vec<Witness> {
 		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<Vec<u8>> = Vec::with_capacity(num_elements as usize);
-			for _ in 0..num_elements {
-				let element_len: u16 = Readable::read(r)?;
-				let mut element_bytes: Vec<u8> = Vec::with_capacity(element_len as usize);
-				for _ in 0..element_len {
-					element_bytes.push(Readable::read(r)?);
-				}
-				witness_stack.push(element_bytes);
-			}
+			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)
@@ -2966,7 +2958,35 @@ mod tests {
 
 	#[test]
 	fn encoding_tx_signatures() {
-		// TODO
+		let tx_signatures = msgs::TxSignatures {
+			channel_id: [2; 32],
+			tx_hash: Txid::from_hex("c2d4449afa8d26140898dd54d3390b057ba2a5afcf03ba29d7dc0d8b9ffe966e").unwrap(),
+			witnesses: vec![
+				Witness::from_vec(vec![
+					hex::decode("304402206af85b7dd67450ad12c979302fac49dfacbc6a8620f49c5da2b5721cf9565ca502207002b32fed9ce1bf095f57aeb10c36928ac60b12e723d97d2964a54640ceefa701").unwrap(),
+					hex::decode("0301ab7dc16488303549bfcdd80f6ae5ee4c20bf97ab5410bbd6b1bfa85dcd6944").unwrap()]),
+				Witness::from_vec(vec![
+					hex::decode("3045022100ee00dbf4a862463e837d7c08509de814d620e4d9830fa84818713e0fa358f145022021c3c7060c4d53fe84fd165d60208451108a778c13b92ca4c6bad439236126cc01").unwrap(),
+					hex::decode("028fbbf0b16f5ba5bcb5dd37cd4047ce6f726a21c06682f9ec2f52b057de1dbdb5").unwrap()]),
+			],
+		};
+		let encoded_value = tx_signatures.encode();
+		let mut target_value = hex::decode("0202020202020202020202020202020202020202020202020202020202020202").unwrap(); // channel_id
+		target_value.append(&mut hex::decode("6e96fe9f8b0ddcd729ba03cfafa5a27b050b39d354dd980814268dfa9a44d4c2").unwrap()); // tx_hash (sha256) (big endian byte order)
+		target_value.append(&mut hex::decode("0002").unwrap()); // num_witnesses (u16)
+		// Witness 1
+		target_value.append(&mut hex::decode("0002").unwrap()); // num_witness_elements (u16)
+		target_value.append(&mut hex::decode("0047").unwrap()); // len of witness_element data (u16)
+		target_value.append(&mut hex::decode("304402206af85b7dd67450ad12c979302fac49dfacbc6a8620f49c5da2b5721cf9565ca502207002b32fed9ce1bf095f57aeb10c36928ac60b12e723d97d2964a54640ceefa701").unwrap());
+		target_value.append(&mut hex::decode("0021").unwrap()); // len of witness_element data (u16)
+		target_value.append(&mut hex::decode("0301ab7dc16488303549bfcdd80f6ae5ee4c20bf97ab5410bbd6b1bfa85dcd6944").unwrap());
+		// Witness 2
+		target_value.append(&mut hex::decode("0002").unwrap()); // num_witness_elements (u16)
+		target_value.append(&mut hex::decode("0048").unwrap()); // len of witness_element data (u16)
+		target_value.append(&mut hex::decode("3045022100ee00dbf4a862463e837d7c08509de814d620e4d9830fa84818713e0fa358f145022021c3c7060c4d53fe84fd165d60208451108a778c13b92ca4c6bad439236126cc01").unwrap());
+		target_value.append(&mut hex::decode("0021").unwrap()); // len of witness_element data (u16)
+		target_value.append(&mut hex::decode("028fbbf0b16f5ba5bcb5dd37cd4047ce6f726a21c06682f9ec2f52b057de1dbdb5").unwrap());
+		assert_eq!(encoded_value, target_value);
 	}
 
 	fn do_encoding_tx_init_rbf(contribution: bool) {