Skip to content

Commit c4a2e91

Browse files
committed
Merge rust-bitcoin#5163: chore: improve test panic messages
89c77e9 chore: improve test panic messages (Klaklax) Pull request description: In psbt_high_fee_checks, the fallback panic now reports the unexpected ExtractTxError variant instead of failing silently, so regressions immediately tell reviewers what went wrong. In public_key_from_str_invalid_str, the panic string now names the exact ParsePublicKeyError::InvalidChar variant we’re checking for, removing ambiguity when behavior changes. The assertions stay the same, but the failures are far more actionable. ACKs for top commit: apoelstra: ACK 89c77e9; successfully ran local tests; sure Tree-SHA512: d38ccdd1819152f87f5b45f5f2a2d77a5f041dfe6772c6e3125be76ff321dff43b43ecb6d10f5dd2e8001740a27ab3081bf896e2c33f1b081477e7caadaacd2e
2 parents eac9266 + 89c77e9 commit c4a2e91

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

bitcoin/src/crypto/key.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1825,7 +1825,7 @@ mod tests {
18251825
assert_eq!(err.invalid_char(), b'g');
18261826
assert_eq!(err.pos(), 129);
18271827
} else {
1828-
panic!("Expected Invalid char error");
1828+
panic!("expected ParsePublicKeyError::InvalidChar");
18291829
}
18301830

18311831
let s = "032e58afe51f9ed8ad3cc7897f634d881fdbe49a81564629ded8156bebd2ffd1ag";
@@ -1836,7 +1836,7 @@ mod tests {
18361836
assert_eq!(err.invalid_char(), b'g');
18371837
assert_eq!(err.pos(), 65);
18381838
} else {
1839-
panic!("Expected Invalid char error");
1839+
panic!("expected ParsePublicKeyError::InvalidChar");
18401840
}
18411841
}
18421842

bitcoin/src/psbt/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1447,7 +1447,7 @@ mod tests {
14471447
.extract_tx_with_fee_rate_limit(FeeRate::from_sat_per_vb(1))
14481448
.map_err(|e| match e {
14491449
ExtractTxError::AbsurdFeeRate { fee_rate, .. } => fee_rate,
1450-
_ => panic!(""),
1450+
other => panic!("expected AbsurdFeeRate error, got {other:?}"),
14511451
})
14521452
.unwrap_err();
14531453

@@ -1459,14 +1459,14 @@ mod tests {
14591459
assert_eq!(
14601460
psbt.clone().extract_tx().map_err(|e| match e {
14611461
ExtractTxError::AbsurdFeeRate { fee_rate, .. } => fee_rate,
1462-
_ => panic!(""),
1462+
other => panic!("expected AbsurdFeeRate error, got {other:?}"),
14631463
}),
14641464
Err(error_fee_rate)
14651465
);
14661466
assert_eq!(
14671467
psbt.clone().extract_tx_fee_rate_limit().map_err(|e| match e {
14681468
ExtractTxError::AbsurdFeeRate { fee_rate, .. } => fee_rate,
1469-
_ => panic!(""),
1469+
other => panic!("expected AbsurdFeeRate error, got {other:?}"),
14701470
}),
14711471
Err(error_fee_rate)
14721472
);
@@ -1480,7 +1480,7 @@ mod tests {
14801480
assert_eq!(
14811481
psbt_with_amounts(2076001, 1000).extract_tx().map_err(|e| match e {
14821482
ExtractTxError::AbsurdFeeRate { fee_rate, .. } => fee_rate,
1483-
_ => panic!(""),
1483+
other => panic!("expected AbsurdFeeRate error, got {other:?}"),
14841484
}),
14851485
Err(FeeRate::from_sat_per_kwu(6250003)) // 6250000 is 25k sat/vbyte
14861486
);

0 commit comments

Comments
 (0)