absolutebi/serai
1
0
Fork 0
mirror of https://github.com/serai-dex/serai.git synced 2025-12-08 12:19:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

3.7 Replace unwraps with expects

Browse Source 
Doesn't replace unwraps on integer conversions.
This commit is contained in:
Luke Parker
2023-07-10 14:02:55 -04:00
parent 3d00d405a3
commit d75115ce13
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
coins/bitcoin/src/crypto.rs
View File

@@ -32,9 +32,9 @@ pub fn x(key: &ProjectivePoint) -> [u8; 32] {
(*encoded.x().expect("point at infinity")).into() (*encoded.x().expect("point at infinity")).into()
} }
/// Convert a non-infinite even point to a XOnlyPublicKey. Panics on invalid input. /// Convert a non-infinity even point to a XOnlyPublicKey. Panics on invalid input.
pub fn x_only(key: &ProjectivePoint) -> XOnlyPublicKey { pub fn x_only(key: &ProjectivePoint) -> XOnlyPublicKey {
XOnlyPublicKey::from_slice(&x(key)).unwrap() XOnlyPublicKey::from_slice(&x(key)).expect("x_only was passed a point which was infinity or odd")
} }
/// Make a point even by adding the generator until it is even. Returns the even point and the /// Make a point even by adding the generator until it is even. Returns the even point and the
@@ -145,7 +145,8 @@ impl<T: Sync + Clone + Debug + Transcript> Algorithm<Secp256k1> for Schnorr<T> {
// s = r + cx. Since we added to the r, add to s // s = r + cx. Since we added to the r, add to s
sig.s += Scalar::from(offset); sig.s += Scalar::from(offset);
// Convert to a secp256k1 signature // Convert to a secp256k1 signature
Signature::from_slice(&sig.serialize()[1 ..]).unwrap() Signature::from_slice(&sig.serialize()[1 ..])
.expect("couldn't convert SchnorrSignature to Signature")
}) })
} }

4
coins/bitcoin/src/wallet/send.rs
View File

@@ -339,7 +339,9 @@ impl SignMachine<Transaction> for TransactionSignMachine {
commitments[i].clone(), commitments[i].clone(),
cache cache
.taproot_key_spend_signature_hash(i, &prevouts, TapSighashType::Default) .taproot_key_spend_signature_hash(i, &prevouts, TapSighashType::Default)
.unwrap() // This should never happen since the inputs align with the TX the cache was
// constructed with, and because i is always < prevouts.len()
.expect("taproot_key_spend_signature_hash failed to return a hash")
.as_ref(), .as_ref(),
)?; )?;
shares.push(share); shares.push(share);