Merge rust-bitcoin/rust-secp256k1#800: Improve RecoveryId conversion functions

fed623ef9803fe28f44e7cd331e25b9149a1154b Implement From on u8 for RecoveryId instead of i32 (Tobin C. Harding)
9b4fa8bdc05ef20f4fadd7f1fb73a51cb41d1854 Add RecoveryId getter (Tobin C. Harding)

Pull request description:

  Add the `to_u8` getter discussed in issue #774 and then make the `From` impl be on `u8`.

  Close: #774

ACKs for top commit:
  apoelstra:
    ACK fed623ef9803fe28f44e7cd331e25b9149a1154b; successfully ran local tests

Tree-SHA512: 5a341cbc78d53474a8ffa8fd7fa20796da28e67d226f0298873cd22bfa137d29642b22cabcac1bc8dcd03e6547ae5272990b315dd5808d7e5c775990705cd193

Author: chain-forgexcr45

examples/sign_verify_recovery.rs

@@ -47,8 +47,5 @@ fn main() {
 
     let (recovery_id, serialize_sig) = signature.serialize_compact();
 
-    assert_eq!(
-        recover(&secp, msg, serialize_sig, Into::<i32>::into(recovery_id) as u8),
-        Ok(pubkey)
-    );
+    assert_eq!(recover(&secp, msg, serialize_sig, recovery_id.to_u8()), Ok(pubkey));
 }

src/ecdsa/recovery.rs

@@ -36,6 +36,16 @@ impl RecoveryId {
             _ => RecoveryId::Three,
         }
     }
+
+    /// Returns the `RecoveryId` as an integer.
+    pub const fn to_u8(self) -> u8 {
+        match self {
+            RecoveryId::Zero => 0,
+            RecoveryId::One => 1,
+            RecoveryId::Two => 2,
+            RecoveryId::Three => 3,
+        }
+    }
 }
 
 impl TryFrom<i32> for RecoveryId {
@@ -52,7 +62,7 @@ impl TryFrom<i32> for RecoveryId {
     }
 }
 
-impl From<RecoveryId> for i32 {
+impl From<RecoveryId> for u8 {
     #[inline]
     fn from(val: RecoveryId) -> Self {
         match val {
@@ -86,7 +96,7 @@ impl RecoverableSignature {
                 super_ffi::secp256k1_context_no_precomp,
                 &mut ret,
                 data.as_c_ptr(),
-                recid.into(),
+                i32::from(recid.to_u8()),
             ) == 1
             {
                 Ok(RecoverableSignature(ret))
@@ -113,7 +123,7 @@ impl RecoverableSignature {
     /// Serializes the recoverable signature in compact format.
     pub fn serialize_compact(&self) -> (RecoveryId, [u8; 64]) {
         let mut ret = [0u8; 64];
-        let mut recid = RecoveryId::Zero.into();
+        let mut recid = i32::from(RecoveryId::Zero.to_u8());
         unsafe {
             let err = ffi::secp256k1_ecdsa_recoverable_signature_serialize_compact(
                 super_ffi::secp256k1_context_no_precomp,
@@ -451,9 +461,9 @@ mod tests {
         assert!(RecoveryId::try_from(3i32).is_ok());
         assert!(RecoveryId::try_from(4i32).is_err());
         let id0 = RecoveryId::Zero;
-        assert_eq!(Into::<i32>::into(id0), 0i32);
+        assert_eq!(Into::<u8>::into(id0), 0u8);
         let id1 = RecoveryId::One;
-        assert_eq!(Into::<i32>::into(id1), 1i32);
+        assert_eq!(Into::<u8>::into(id1), 1u8);
     }
 }