f - remove UnsupportedChain and UnsupportedCurrency checks

Author: jkczyz

lightning/src/offers/offer.rs

@@ -220,11 +220,9 @@ impl OfferBuilder {
 
 	/// Builds an [`Offer`] from the builder's settings.
 	pub fn build(self) -> Result<Offer, ()> {
+		// TODO: Also check for Amount::Currency
 		if let Some(Amount::Currency { .. }) = self.offer.amount {
-			return Err(());
-		}
-
-		if self.offer.amount_msats() > MAX_VALUE_MSAT {
+		} else if self.offer.amount_msats() > MAX_VALUE_MSAT {
 			return Err(());
 		}
 
@@ -486,26 +484,11 @@ impl TryFrom<OfferTlvStream> for OfferContents {
 			issuer, quantity_min, quantity_max, node_id,
 		} = tlv_stream;
 
-		let supported_chains = [
-			ChainHash::using_genesis_block(Network::Bitcoin),
-			ChainHash::using_genesis_block(Network::Testnet),
-			ChainHash::using_genesis_block(Network::Signet),
-			ChainHash::using_genesis_block(Network::Regtest),
-		];
-		let chains = match chains {
-			None => None,
-			Some(chains) => match chains.first() {
-				None => Some(chains),
-				Some(chain) if supported_chains.contains(chain) => Some(chains),
-				_ => return Err(SemanticError::UnsupportedChain),
-			},
-		};
-
 		let amount = match (currency, amount) {
 			(None, None) => None,
 			(None, Some(amount_msats)) => Some(Amount::Bitcoin { amount_msats }),
 			(Some(_), None) => return Err(SemanticError::MissingAmount),
-			(Some(_), Some(_)) => return Err(SemanticError::UnsupportedCurrency),
+			(Some(iso4217_code), Some(amount)) => Some(Amount::Currency { iso4217_code, amount }),
 		};
 
 		let description = match description {
@@ -682,16 +665,14 @@ mod tests {
 		assert_eq!(tlv_stream.amount, Some(1000));
 		assert_eq!(tlv_stream.currency, None);
 
-		let builder = OfferBuilder::new("foo".into(), pubkey(42))
-			.amount(currency_amount.clone());
-		let tlv_stream = builder.offer.as_tlv_stream();
-		assert_eq!(builder.offer.amount.as_ref(), Some(&currency_amount));
+		let offer = OfferBuilder::new("foo".into(), pubkey(42))
+			.amount(currency_amount.clone())
+			.build()
+			.unwrap();
+		let tlv_stream = offer.as_tlv_stream();
+		assert_eq!(offer.amount(), Some(&currency_amount));
 		assert_eq!(tlv_stream.amount, Some(10));
 		assert_eq!(tlv_stream.currency, Some(b"USD"));
-		match builder.build() {
-			Ok(_) => panic!("expected error"),
-			Err(e) => assert_eq!(e, ()),
-		}
 
 		let offer = OfferBuilder::new("foo".into(), pubkey(42))
 			.amount(currency_amount.clone())

lightning/src/offers/parse.rs

@@ -72,12 +72,8 @@ pub enum ParseError {
 /// Error when interpreting a TLV stream as a specific type.
 #[derive(Debug, PartialEq)]
 pub enum SemanticError {
-	/// The provided block hash does not correspond to a supported chain.
-	UnsupportedChain,
 	/// An amount was expected but was missing.
 	MissingAmount,
-	/// A currency was provided that is not supported.
-	UnsupportedCurrency,
 	/// A required description was not provided.
 	MissingDescription,
 	/// A node id was not provided.