f - update Offer tests for PrintableString

Author: jkczyz

lightning/src/offers/offer.rs

@@ -458,6 +458,7 @@ mod tests {
 	use ln::msgs::MAX_VALUE_MSAT;
 	use onion_message::{BlindedHop, BlindedPath};
 	use util::ser::Writeable;
+	use util::string::PrintableString;
 
 	fn pubkey(byte: u8) -> PublicKey {
 		let secp_ctx = Secp256k1::new();
@@ -479,7 +480,7 @@ mod tests {
 		assert_eq!(offer.chains(), vec![ChainHash::using_genesis_block(Network::Bitcoin)]);
 		assert_eq!(offer.metadata(), None);
 		assert_eq!(offer.amount(), None);
-		assert_eq!(offer.description(), "foo");
+		assert_eq!(offer.description(), PrintableString("foo"));
 		assert_eq!(offer.features(), &OfferFeatures::empty());
 		assert_eq!(offer.absolute_expiry(), None);
 		#[cfg(feature = "std")]
@@ -678,15 +679,15 @@ mod tests {
 			.issuer("bar".into())
 			.build()
 			.unwrap();
-		assert_eq!(offer.issuer(), Some("bar"));
+		assert_eq!(offer.issuer(), Some(PrintableString("bar")));
 		assert_eq!(offer.as_tlv_stream().issuer, Some(&String::from("bar")));
 
 		let offer = OfferBuilder::new("foo".into(), pubkey(42))
 			.issuer("bar".into())
 			.issuer("baz".into())
 			.build()
 			.unwrap();
-		assert_eq!(offer.issuer(), Some("baz"));
+		assert_eq!(offer.issuer(), Some(PrintableString("baz")));
 		assert_eq!(offer.as_tlv_stream().issuer, Some(&String::from("baz")));
 	}
 

lightning/src/util/string.rs

@@ -13,6 +13,7 @@ use core::fmt;
 
 /// A string that displays only printable characters, replacing control characters with
 /// [`core::char::REPLACEMENT_CHARACTER`].
+#[derive(Debug, PartialEq)]
 pub struct PrintableString<'a>(pub &'a str);
 
 impl<'a> fmt::Display for PrintableString<'a> {