f - make explicit test pubkeys

Author: jkczyz

lightning/src/offers/offer.rs

@@ -427,27 +427,18 @@ mod tests {
 	use ln::features::OfferFeatures;
 	use onion_message::{BlindedHop, BlindedPath};
 
-	fn pubkey() -> PublicKey {
+	fn pubkey(byte: u8) -> PublicKey {
 		let secp_ctx = Secp256k1::new();
-		PublicKey::from_secret_key(&secp_ctx, &privkey())
+		PublicKey::from_secret_key(&secp_ctx, &privkey(byte))
 	}
 
-	fn privkey() -> SecretKey {
-		SecretKey::from_slice(&[42; 32]).unwrap()
-	}
-
-	fn blinded_pubkey(byte: u8) -> PublicKey {
-		let secp_ctx = Secp256k1::new();
-		PublicKey::from_secret_key(&secp_ctx, &blinded_privkey(byte))
-	}
-
-	fn blinded_privkey(byte: u8) -> SecretKey {
+	fn privkey(byte: u8) -> SecretKey {
 		SecretKey::from_slice(&[byte; 32]).unwrap()
 	}
 
 	#[test]
 	fn builds_offer_with_defaults() {
-		let offer = OfferBuilder::new("foo".into(), pubkey()).build();
+		let offer = OfferBuilder::new("foo".into(), pubkey(42)).build();
 		let tlv_stream = offer.as_tlv_stream();
 
 		assert_eq!(offer.as_bytes(), &offer.to_bytes()[..]);
@@ -463,7 +454,7 @@ mod tests {
 		assert_eq!(offer.issuer(), None);
 		assert_eq!(offer.quantity_min(), 1);
 		assert_eq!(offer.quantity_max(), 1);
-		assert_eq!(offer.node_id(), pubkey());
+		assert_eq!(offer.node_id(), pubkey(42));
 
 		assert_eq!(tlv_stream.chains, None);
 		assert_eq!(tlv_stream.metadata, None);
@@ -476,7 +467,7 @@ mod tests {
 		assert_eq!(tlv_stream.issuer, None);
 		assert_eq!(tlv_stream.quantity_min, None);
 		assert_eq!(tlv_stream.quantity_max, None);
-		assert_eq!(tlv_stream.node_id, Some(&pubkey()));
+		assert_eq!(tlv_stream.node_id, Some(&pubkey(42)));
 	}
 
 	#[test]
@@ -487,20 +478,20 @@ mod tests {
 			ChainHash::using_genesis_block(Network::Testnet),
 		];
 
-		let offer = OfferBuilder::new("foo".into(), pubkey())
+		let offer = OfferBuilder::new("foo".into(), pubkey(42))
 			.chain(Network::Bitcoin)
 			.build();
 		assert_eq!(offer.chains(), vec![chain]);
 		assert_eq!(offer.as_tlv_stream().chains, Some(&vec![chain]));
 
-		let offer = OfferBuilder::new("foo".into(), pubkey())
+		let offer = OfferBuilder::new("foo".into(), pubkey(42))
 			.chain(Network::Bitcoin)
 			.chain(Network::Bitcoin)
 			.build();
 		assert_eq!(offer.chains(), vec![chain]);
 		assert_eq!(offer.as_tlv_stream().chains, Some(&vec![chain]));
 
-		let offer = OfferBuilder::new("foo".into(), pubkey())
+		let offer = OfferBuilder::new("foo".into(), pubkey(42))
 			.chain(Network::Bitcoin)
 			.chain(Network::Testnet)
 			.build();
@@ -510,13 +501,13 @@ mod tests {
 
 	#[test]
 	fn builds_offer_with_metadata() {
-		let offer = OfferBuilder::new("foo".into(), pubkey())
+		let offer = OfferBuilder::new("foo".into(), pubkey(42))
 			.metadata(vec![42; 32])
 			.build();
 		assert_eq!(offer.metadata(), Some(&vec![42; 32]));
 		assert_eq!(offer.as_tlv_stream().metadata, Some(&vec![42; 32]));
 
-		let offer = OfferBuilder::new("foo".into(), pubkey())
+		let offer = OfferBuilder::new("foo".into(), pubkey(42))
 			.metadata(vec![42; 32])
 			.metadata(vec![43; 32])
 			.build();
@@ -529,23 +520,23 @@ mod tests {
 		let bitcoin_amount = Amount::Bitcoin { amount_msats: 1000 };
 		let currency_amount = Amount::Currency { iso4217_code: *b"USD", amount: 10 };
 
-		let offer = OfferBuilder::new("foo".into(), pubkey())
+		let offer = OfferBuilder::new("foo".into(), pubkey(42))
 			.amount(bitcoin_amount.clone())
 			.build();
 		let tlv_stream = offer.as_tlv_stream();
 		assert_eq!(offer.amount(), Some(&bitcoin_amount));
 		assert_eq!(tlv_stream.amount, Some(1000));
 		assert_eq!(tlv_stream.currency, None);
 
-		let offer = OfferBuilder::new("foo".into(), pubkey())
+		let offer = OfferBuilder::new("foo".into(), pubkey(42))
 			.amount(currency_amount.clone())
 			.build();
 		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"));
 
-		let offer = OfferBuilder::new("foo".into(), pubkey())
+		let offer = OfferBuilder::new("foo".into(), pubkey(42))
 			.amount(currency_amount.clone())
 			.amount(bitcoin_amount.clone())
 			.build();
@@ -556,13 +547,13 @@ mod tests {
 
 	#[test]
 	fn builds_offer_with_features() {
-		let offer = OfferBuilder::new("foo".into(), pubkey())
+		let offer = OfferBuilder::new("foo".into(), pubkey(42))
 			.features(OfferFeatures::empty())
 			.build();
 		assert_eq!(offer.features(), Some(&OfferFeatures::empty()));
 		assert_eq!(offer.as_tlv_stream().features, Some(&OfferFeatures::empty()));
 
-		let offer = OfferBuilder::new("foo".into(), pubkey())
+		let offer = OfferBuilder::new("foo".into(), pubkey(42))
 			.features(OfferFeatures::unknown())
 			.features(OfferFeatures::empty())
 			.build();
@@ -575,15 +566,15 @@ mod tests {
 		let future_expiry = Duration::from_secs(u64::max_value());
 		let past_expiry = Duration::from_secs(0);
 
-		let offer = OfferBuilder::new("foo".into(), pubkey())
+		let offer = OfferBuilder::new("foo".into(), pubkey(42))
 			.absolute_expiry(future_expiry)
 			.build();
 		#[cfg(feature = "std")]
 		assert!(!offer.is_expired());
 		assert_eq!(offer.absolute_expiry(), Some(future_expiry));
 		assert_eq!(offer.as_tlv_stream().absolute_expiry, Some(future_expiry.as_secs()));
 
-		let offer = OfferBuilder::new("foo".into(), pubkey())
+		let offer = OfferBuilder::new("foo".into(), pubkey(42))
 			.absolute_expiry(future_expiry)
 			.absolute_expiry(past_expiry)
 			.build();
@@ -595,55 +586,46 @@ mod tests {
 
 	#[test]
 	fn builds_offer_with_paths() {
-		// TODO: Use more realistic data
 		let paths = vec![
 			BlindedPath {
-				introduction_node_id: pubkey(),
-				blinding_point: pubkey(),
+				introduction_node_id: pubkey(40),
+				blinding_point: pubkey(41),
 				blinded_hops: vec![
-					BlindedHop {
-						blinded_node_id: blinded_pubkey(43), encrypted_payload: vec![0; 43],
-					},
-					BlindedHop {
-						blinded_node_id: blinded_pubkey(44), encrypted_payload: vec![0; 44],
-					},
+					BlindedHop { blinded_node_id: pubkey(43), encrypted_payload: vec![0; 43] },
+					BlindedHop { blinded_node_id: pubkey(44), encrypted_payload: vec![0; 44] },
 				],
 			},
 			BlindedPath {
-				introduction_node_id: pubkey(),
-				blinding_point: pubkey(),
+				introduction_node_id: pubkey(40),
+				blinding_point: pubkey(41),
 				blinded_hops: vec![
-					BlindedHop {
-						blinded_node_id: blinded_pubkey(45), encrypted_payload: vec![0; 45],
-					},
-					BlindedHop {
-						blinded_node_id: blinded_pubkey(46), encrypted_payload: vec![0; 46],
-					},
+					BlindedHop { blinded_node_id: pubkey(45), encrypted_payload: vec![0; 45] },
+					BlindedHop { blinded_node_id: pubkey(46), encrypted_payload: vec![0; 46] },
 				],
 			},
 		];
 
-		let offer = OfferBuilder::new("foo".into(), pubkey())
+		let offer = OfferBuilder::new("foo".into(), pubkey(42))
 			.path(paths[0].clone())
 			.path(paths[1].clone())
 			.build();
 		let tlv_stream = offer.as_tlv_stream();
 		assert_eq!(offer.paths(), Some(&paths));
-		assert_eq!(offer.node_id(), pubkey());
-		assert_ne!(pubkey(), blinded_pubkey(44));
+		assert_eq!(offer.node_id(), pubkey(42));
+		assert_ne!(pubkey(42), pubkey(44));
 		assert_eq!(tlv_stream.paths, Some(&paths));
-		assert_eq!(tlv_stream.node_id, Some(&pubkey()));
+		assert_eq!(tlv_stream.node_id, Some(&pubkey(42)));
 	}
 
 	#[test]
 	fn builds_offer_with_issuer() {
-		let offer = OfferBuilder::new("foo".into(), pubkey())
+		let offer = OfferBuilder::new("foo".into(), pubkey(42))
 			.issuer("bar".into())
 			.build();
 		assert_eq!(offer.issuer(), Some(&String::from("bar")));
 		assert_eq!(offer.as_tlv_stream().issuer, Some(&String::from("bar")));
 
-		let offer = OfferBuilder::new("foo".into(), pubkey())
+		let offer = OfferBuilder::new("foo".into(), pubkey(42))
 			.issuer("bar".into())
 			.issuer("baz".into())
 			.build();
@@ -657,7 +639,7 @@ mod tests {
 		let five = NonZeroU64::new(5).unwrap();
 		let ten = NonZeroU64::new(10).unwrap();
 
-		let offer = OfferBuilder::new("foo".into(), pubkey())
+		let offer = OfferBuilder::new("foo".into(), pubkey(42))
 			.quantity_fixed(one)
 			.build();
 		let tlv_stream = offer.as_tlv_stream();
@@ -666,7 +648,7 @@ mod tests {
 		assert_eq!(tlv_stream.quantity_min, None);
 		assert_eq!(tlv_stream.quantity_max, None);
 
-		let offer = OfferBuilder::new("foo".into(), pubkey())
+		let offer = OfferBuilder::new("foo".into(), pubkey(42))
 			.quantity_fixed(ten)
 			.build();
 		let tlv_stream = offer.as_tlv_stream();
@@ -675,7 +657,7 @@ mod tests {
 		assert_eq!(tlv_stream.quantity_min, Some(10));
 		assert_eq!(tlv_stream.quantity_max, Some(10));
 
-		let offer = OfferBuilder::new("foo".into(), pubkey())
+		let offer = OfferBuilder::new("foo".into(), pubkey(42))
 			.quantity_fixed(ten)
 			.quantity_fixed(five)
 			.build();
@@ -685,7 +667,7 @@ mod tests {
 		assert_eq!(tlv_stream.quantity_min, Some(5));
 		assert_eq!(tlv_stream.quantity_max, Some(5));
 
-		let offer = OfferBuilder::new("foo".into(), pubkey())
+		let offer = OfferBuilder::new("foo".into(), pubkey(42))
 			.quantity_range(..ten)
 			.quantity_fixed(five)
 			.build();
@@ -702,7 +684,7 @@ mod tests {
 		let five = NonZeroU64::new(5).unwrap();
 		let ten = NonZeroU64::new(10).unwrap();
 
-		let offer = OfferBuilder::new("foo".into(), pubkey())
+		let offer = OfferBuilder::new("foo".into(), pubkey(42))
 			.quantity_range(..)
 			.build();
 		let tlv_stream = offer.as_tlv_stream();
@@ -711,7 +693,7 @@ mod tests {
 		assert_eq!(tlv_stream.quantity_min, Some(1));
 		assert_eq!(tlv_stream.quantity_max, None);
 
-		let offer = OfferBuilder::new("foo".into(), pubkey())
+		let offer = OfferBuilder::new("foo".into(), pubkey(42))
 			.quantity_range(..ten)
 			.build();
 		let tlv_stream = offer.as_tlv_stream();
@@ -720,7 +702,7 @@ mod tests {
 		assert_eq!(tlv_stream.quantity_min, None);
 		assert_eq!(tlv_stream.quantity_max, Some(9));
 
-		let offer = OfferBuilder::new("foo".into(), pubkey())
+		let offer = OfferBuilder::new("foo".into(), pubkey(42))
 			.quantity_range(one..ten)
 			.build();
 		let tlv_stream = offer.as_tlv_stream();
@@ -729,7 +711,7 @@ mod tests {
 		assert_eq!(tlv_stream.quantity_min, None);
 		assert_eq!(tlv_stream.quantity_max, Some(9));
 
-		let offer = OfferBuilder::new("foo".into(), pubkey())
+		let offer = OfferBuilder::new("foo".into(), pubkey(42))
 			.quantity_range(five..=ten)
 			.build();
 		let tlv_stream = offer.as_tlv_stream();
@@ -739,7 +721,7 @@ mod tests {
 		assert_eq!(tlv_stream.quantity_max, Some(10));
 
 		let one = NonZeroU64::new(1).unwrap();
-		let offer = OfferBuilder::new("foo".into(), pubkey())
+		let offer = OfferBuilder::new("foo".into(), pubkey(42))
 			.quantity_range(one..=one)
 			.build();
 		let tlv_stream = offer.as_tlv_stream();
@@ -748,7 +730,7 @@ mod tests {
 		assert_eq!(tlv_stream.quantity_min, None);
 		assert_eq!(tlv_stream.quantity_max, None);
 
-		let offer = OfferBuilder::new("foo".into(), pubkey())
+		let offer = OfferBuilder::new("foo".into(), pubkey(42))
 			.quantity_range(five..=five)
 			.build();
 		let tlv_stream = offer.as_tlv_stream();
@@ -757,7 +739,7 @@ mod tests {
 		assert_eq!(tlv_stream.quantity_min, Some(5));
 		assert_eq!(tlv_stream.quantity_max, Some(5));
 
-		let offer = OfferBuilder::new("foo".into(), pubkey())
+		let offer = OfferBuilder::new("foo".into(), pubkey(42))
 			.quantity_range(ten..five)
 			.build();
 		let tlv_stream = offer.as_tlv_stream();
@@ -766,7 +748,7 @@ mod tests {
 		assert_eq!(tlv_stream.quantity_min, None);
 		assert_eq!(tlv_stream.quantity_max, None);
 
-		let offer = OfferBuilder::new("foo".into(), pubkey())
+		let offer = OfferBuilder::new("foo".into(), pubkey(42))
 			.quantity_fixed(five)
 			.quantity_range(..ten)
 			.build();