f - Use Offer instead of OfferTlvStream in tests

Author: jkczyz

lightning/src/offers/mod.rs

@@ -414,7 +414,7 @@ impl core::fmt::Display for OfferTlvStream {
 
 #[cfg(test)]
 mod tests {
-	use super::{OfferTlvStream, ParseError};
+	use super::{Offer, OfferTlvStream, ParseError};
 	use bitcoin::bech32;
 	use ln::msgs::DecodeError;
 
@@ -440,6 +440,7 @@ mod tests {
 			"lno1qcp4256ypqpq86q2pucnq42ngssx2an9wfujqerp0yg06qg2qdd7t628sgykwj5kuc837qmlv9m9gr7sq8ap6erfgacv26nhp8zzcqgzhdvttlk22pw8fmwqqrvzst792mj35ypylj886ljkcmug03wg6heqqsqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq6muh550qsfva9fdes0ruph7ctk2s8aqq06r4jxj3msc448wzwy9sqs9w6ckhlv55zuwnkuqqxc9qhu24h9rggzflyw04l9d3hcslzu340jqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq2pqun4wd68jtn00fkxzcnn9ehhyec6qgqsz83qfwdpl28qqmc78ymlvhmxcsywdk5wrjnj36jryg488qwlrnzyjczlqsp9nyu4phcg6dqhlhzgxagfu7zh3d9re0sqp9ts2yfugvnnm9gxkcnnnkdpa084a6t520h5zhkxsdnghvpukvd43lastpwuh73k29qsy",
 		];
 		for encoded_offer in &offers {
+			// TODO: Use Offer once Destination semantics are finalized.
 			if let Err(e) = encoded_offer.parse::<OfferTlvStream>() {
 				panic!("Invalid offer ({:?}): {}", e, encoded_offer);
 			}
@@ -457,7 +458,7 @@ mod tests {
 			"ln++o1qcp4256ypqpq86q2pucnq42ngssx2an9wfujqerp0y2pqun4wd68jtn00fkxzcnn9ehhyec6qgqsz83qfwdpl28qqmc78ymlvhmxcsywdk5wrjnj36jryg488qwlrnzyjczlqsp9nyu4phcg6dqhlhzgxagfu7zh3d9re0sqp9ts2yfugvnnm9gxkcnnnkdpa084a6t520h5zhkxsdnghvpukvd43lastpwuh73k29qsy",
 		];
 		for encoded_offer in &offers {
-			match encoded_offer.parse::<OfferTlvStream>() {
+			match encoded_offer.parse::<Offer>() {
 				Ok(_) => panic!("Valid offer: {}", encoded_offer),
 				Err(e) => assert_eq!(e, ParseError::InvalidContinuation),
 			}
@@ -468,7 +469,7 @@ mod tests {
 	#[test]
 	fn fails_parsing_bech32_encoded_offer_with_invalid_hrp() {
 		let encoded_offer = "lni1qcp4256ypqpq86q2pucnq42ngssx2an9wfujqerp0y2pqun4wd68jtn00fkxzcnn9ehhyec6qgqsz83qfwdpl28qqmc78ymlvhmxcsywdk5wrjnj36jryg488qwlrnzyjczlqsp9nyu4phcg6dqhlhzgxagfu7zh3d9re0sqp9ts2yfugvnnm9gxkcnnnkdpa084a6t520h5zhkxsdnghvpukvd43lastpwuh73k29qsy";
-		match encoded_offer.parse::<OfferTlvStream>() {
+		match encoded_offer.parse::<Offer>() {
 			Ok(_) => panic!("Valid offer: {}", encoded_offer),
 			Err(e) => assert_eq!(e, ParseError::InvalidBech32Hrp),
 		}
@@ -477,7 +478,7 @@ mod tests {
 	#[test]
 	fn fails_parsing_bech32_encoded_offer_with_invalid_bech32_data() {
 		let encoded_offer = "lno1qcp4256ypqpq86q2pucnq42ngssx2an9wfujqerp0y2pqun4wd68jtn00fkxzcnn9ehhyec6qgqsz83qfwdpl28qqmc78ymlvhmxcsywdk5wrjnj36jryg488qwlrnzyjczlqsp9nyu4phcg6dqhlhzgxagfu7zh3d9re0sqp9ts2yfugvnnm9gxkcnnnkdpa084a6t520h5zhkxsdnghvpukvd43lastpwuh73k29qso";
-		match encoded_offer.parse::<OfferTlvStream>() {
+		match encoded_offer.parse::<Offer>() {
 			Ok(_) => panic!("Valid offer: {}", encoded_offer),
 			Err(e) => assert_eq!(e, ParseError::Bech32(bech32::Error::InvalidChar('o'))),
 		}
@@ -486,7 +487,7 @@ mod tests {
 	#[test]
 	fn fails_parsing_bech32_encoded_offer_with_invalid_tlv_data() {
 		let encoded_offer = "lno1qcp4256ypqpq86q2pucnq42ngssx2an9wfujqerp0y2pqun4wd68jtn00fkxzcnn9ehhyec6qgqsz83qfwdpl28qqmc78ymlvhmxcsywdk5wrjnj36jryg488qwlrnzyjczlqsp9nyu4phcg6dqhlhzgxagfu7zh3d9re0sqp9ts2yfugvnnm9gxkcnnnkdpa084a6t520h5zhkxsdnghvpukvd43lastpwuh73k29qsyqqqqq";
-		match encoded_offer.parse::<OfferTlvStream>() {
+		match encoded_offer.parse::<Offer>() {
 			Ok(_) => panic!("Valid offer: {}", encoded_offer),
 			Err(e) => assert_eq!(e, ParseError::Decode(DecodeError::InvalidValue)),
 		}