panic!

Author: devrandom

.gitignore

@@ -1,4 +1,5 @@
 /target/
+/hfuzz_target/
 /net-tokio/target/
 **/*.rs.bk
 Cargo.lock

lightning/src/util/enforcing_trait_impls.rs

@@ -30,7 +30,7 @@ impl EnforcingChannelKeys {
 
 impl EnforcingChannelKeys {
 	fn check_keys<T: secp256k1::Signing + secp256k1::Verification>(&self, secp_ctx: &Secp256k1<T>,
-	                                                               keys: &TxCreationKeys) -> Result<(), ()> {
+	                                                               keys: &TxCreationKeys) {
 		let revocation_base = PublicKey::from_secret_key(secp_ctx, &self.inner.revocation_base_key);
 		let payment_base = PublicKey::from_secret_key(secp_ctx, &self.inner.payment_base_key);
 		let htlc_base = PublicKey::from_secret_key(secp_ctx, &self.inner.htlc_base_key);
@@ -44,7 +44,7 @@ impl EnforcingChannelKeys {
 		                                        &revocation_base,
 		                                        &payment_base,
 		                                        &htlc_base).unwrap();
-		if keys == &keys_expected { Ok(()) } else { Err(()) }
+		if keys != &keys_expected { panic!("derived different per-tx keys") }
 	}
 }
 
@@ -57,8 +57,8 @@ impl ChannelKeys for EnforcingChannelKeys {
 	fn commitment_seed(&self) -> &[u8; 32] { self.inner.commitment_seed() }
 
 	fn sign_remote_commitment<T: secp256k1::Signing + secp256k1::Verification>(&self, channel_value_satoshis: u64, feerate_per_kw: u64, commitment_tx: &Transaction, keys: &TxCreationKeys, htlcs: &[&HTLCOutputInCommitment], to_self_delay: u16, secp_ctx: &Secp256k1<T>) -> Result<(Signature, Vec<Signature>), ()> {
-		if commitment_tx.input.len() != 1 { panic!(); }
-		self.check_keys(secp_ctx, keys)?;
+		if commitment_tx.input.len() != 1 { panic!("lightning commitment transactions have a single input"); }
+		self.check_keys(secp_ctx, keys);
 		let obscured_commitment_transaction_number = (commitment_tx.lock_time & 0xffffff) as u64 | ((commitment_tx.input[0].sequence as u64 & 0xffffff) << 3*8);
 
 		{