f - convert directly from bytes to message

Author: jkczyz

lightning/src/offers/offer.rs

@@ -466,18 +466,14 @@ tlv_stream!(OfferTlvStream, OfferTlvStreamRef, {
 });
 
 impl Bech32Encode for Offer {
-	type TlvStream = OfferTlvStream;
-
 	const BECH32_HRP: &'static str = "lno";
 }
 
 impl FromStr for Offer {
 	type Err = ParseError;
 
 	fn from_str(s: &str) -> Result<Self, <Self as FromStr>::Err> {
-		let (tlv_stream, bytes) = Offer::from_bech32_str(s)?;
-		let contents = OfferContents::try_from(tlv_stream)?;
-		Ok(Offer { bytes, contents })
+		Self::from_bech32_str(s)
 	}
 }
 

lightning/src/offers/parse.rs

@@ -11,22 +11,19 @@
 
 use bitcoin::bech32;
 use bitcoin::bech32::{FromBase32, ToBase32};
+use core::convert::TryFrom;
 use core::fmt;
 use ln::msgs::DecodeError;
-use util::ser::Readable;
 
 use prelude::*;
 
 /// Indicates a message can be encoded using bech32.
-pub(crate) trait Bech32Encode: AsRef<[u8]> {
-	/// TLV stream that a bech32-encoded message is parsed into.
-	type TlvStream: Readable;
-
+pub(crate) trait Bech32Encode: AsRef<[u8]> + TryFrom<Vec<u8>, Error=ParseError> {
 	/// Human readable part of the message's bech32 encoding.
 	const BECH32_HRP: &'static str;
 
 	/// Parses a bech32-encoded message into a TLV stream.
-	fn from_bech32_str(s: &str) -> Result<(Self::TlvStream, Vec<u8>), ParseError> {
+	fn from_bech32_str(s: &str) -> Result<Self, ParseError> {
 		// Offer encoding may be split by '+' followed by optional whitespace.
 		for chunk in s.split('+') {
 			let chunk = chunk.trim_start();
@@ -43,7 +40,7 @@ pub(crate) trait Bech32Encode: AsRef<[u8]> {
 		}
 
 		let data = Vec::<u8>::from_base32(&data)?;
-		Ok((Readable::read(&mut &data[..])?, data))
+		Self::try_from(data)
 	}
 
 	/// Formats the message using bech32-encoding.