Fix unit tests.

Author: arik-so

lightning/src/ln/chan_utils.rs

@@ -1840,7 +1840,7 @@ mod tests {
 	use bitcoin::secp256k1::{PublicKey, SecretKey, Secp256k1};
 	use crate::util::test_utils;
 	use crate::sign::{ChannelSigner, SignerProvider};
-	use bitcoin::{Network, Txid, ScriptBuf};
+	use bitcoin::{Network, Txid, ScriptBuf, CompressedPublicKey};
 	use bitcoin::hashes::Hash;
 	use bitcoin::hashes::hex::FromHex;
 	use crate::ln::types::PaymentHash;
@@ -1916,7 +1916,7 @@ mod tests {
 		// Generate broadcaster and counterparty outputs
 		let tx = builder.build(1000, 2000);
 		assert_eq!(tx.built.transaction.output.len(), 2);
-		assert_eq!(tx.built.transaction.output[1].script_pubkey, BitcoinPublicKey::new(builder.counterparty_pubkeys.payment_point).p2wpkh_script_code().unwrap());
+		assert_eq!(tx.built.transaction.output[1].script_pubkey, bitcoin::address::Address::p2wpkh(&CompressedPublicKey(builder.counterparty_pubkeys.payment_point), Network::Testnet).script_pubkey());
 
 		// Generate broadcaster and counterparty outputs as well as two anchors
 		builder.channel_parameters.channel_type_features = ChannelTypeFeatures::anchors_zero_htlc_fee_and_dependencies();

lightning/src/offers/invoice.rs

@@ -2004,7 +2004,7 @@ mod tests {
 			.sign(payer_sign)
 		{
 			Ok(_) => panic!("expected error"),
-			Err(e) => assert_eq!(e, SignError::Verification(secp256k1::Error::InvalidSignature)),
+			Err(e) => assert_eq!(e, SignError::Verification(secp256k1::Error::IncorrectSignature)),
 		}
 	}
 
@@ -2415,7 +2415,8 @@ mod tests {
 		match Bolt12Invoice::try_from(buffer) {
 			Ok(_) => panic!("expected error"),
 			Err(e) => {
-				assert_eq!(e, Bolt12ParseError::InvalidSignature(secp256k1::Error::InvalidSignature));
+				// todo: ensure there is no serious underlying issue here
+				assert_eq!(e, Bolt12ParseError::InvalidSignature(secp256k1::Error::IncorrectSignature));
 			},
 		}
 	}

lightning/src/offers/invoice_request.rs

@@ -1850,7 +1850,7 @@ mod tests {
 			.sign(recipient_sign)
 		{
 			Ok(_) => panic!("expected error"),
-			Err(e) => assert_eq!(e, SignError::Verification(secp256k1::Error::InvalidSignature)),
+			Err(e) => assert_eq!(e, SignError::Verification(secp256k1::Error::IncorrectSignature)),
 		}
 	}
 
@@ -2237,7 +2237,7 @@ mod tests {
 		match InvoiceRequest::try_from(buffer) {
 			Ok(_) => panic!("expected error"),
 			Err(e) => {
-				assert_eq!(e, Bolt12ParseError::InvalidSignature(secp256k1::Error::InvalidSignature));
+				assert_eq!(e, Bolt12ParseError::InvalidSignature(secp256k1::Error::IncorrectSignature));
 			},
 		}
 	}