Don't override DecodeError on BOLT 12 message read

Previously when reading a BOLT 12 message from bytes, if it resulted in a
DecodeError then that error would be overridden by DecodeError::InvalidValue
specifically. Better to return to underlying specific error.

Author: valentinewallace

lightning/src/offers/invoice.rs

@@ -1403,7 +1403,10 @@ impl LengthReadable for Bolt12Invoice {
 		reader: &mut R,
 	) -> Result<Self, DecodeError> {
 		let bytes: WithoutLength<Vec<u8>> = LengthReadable::read_from_fixed_length_buffer(reader)?;
-		Self::try_from(bytes.0).map_err(|_| DecodeError::InvalidValue)
+		Self::try_from(bytes.0).map_err(|e| match e {
+			Bolt12ParseError::Decode(e) => e,
+			_ => DecodeError::InvalidValue,
+		})
 	}
 }
 

lightning/src/offers/invoice_request.rs

@@ -1123,7 +1123,10 @@ impl Writeable for InvoiceRequestContents {
 impl LengthReadable for InvoiceRequest {
 	fn read_from_fixed_length_buffer<R: LengthLimitedRead>(r: &mut R) -> Result<Self, DecodeError> {
 		let bytes: WithoutLength<Vec<u8>> = LengthReadable::read_from_fixed_length_buffer(r)?;
-		Self::try_from(bytes.0).map_err(|_| DecodeError::InvalidValue)
+		Self::try_from(bytes.0).map_err(|e| match e {
+			Bolt12ParseError::Decode(e) => e,
+			_ => DecodeError::InvalidValue,
+		})
 	}
 }
 

lightning/src/offers/offer.rs

@@ -1039,7 +1039,10 @@ impl LengthReadable for Offer {
 		reader: &mut R,
 	) -> Result<Self, DecodeError> {
 		let bytes: WithoutLength<Vec<u8>> = LengthReadable::read_from_fixed_length_buffer(reader)?;
-		Self::try_from(bytes.0).map_err(|_| DecodeError::InvalidValue)
+		Self::try_from(bytes.0).map_err(|e| match e {
+			Bolt12ParseError::Decode(e) => e,
+			_ => DecodeError::InvalidValue,
+		})
 	}
 }
 

lightning/src/offers/refund.rs

@@ -829,7 +829,10 @@ impl LengthReadable for Refund {
 		reader: &mut R,
 	) -> Result<Self, DecodeError> {
 		let bytes: WithoutLength<Vec<u8>> = LengthReadable::read_from_fixed_length_buffer(reader)?;
-		Self::try_from(bytes.0).map_err(|_| DecodeError::InvalidValue)
+		Self::try_from(bytes.0).map_err(|e| match e {
+			Bolt12ParseError::Decode(e) => e,
+			_ => DecodeError::InvalidValue,
+		})
 	}
 }