Merge rust-bitcoin/rust-secp256k1#801: Explicitly set RecoveryId value

6ed3a580c1ea63ecc03dd2a5d74d2daf39c54a50 Explicitly set RecoveryId value (Tobin C. Harding)

Pull request description:

  At the moment its implicit in the name, make it explicit.
  
  Close: #777


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


Tree-SHA512: 7f44c95e57a556791433a0cc8b6e5718273e14dc5eb54bcef5ff890d117442a96324f52a9ddc198db28ce59de06ce4049379acdd83d3ad6aa5d7ac177f27d154

Author: chain-forgexcr45

src/ecdsa/recovery.rs

@@ -16,13 +16,13 @@ use crate::{key, Error, Message, Secp256k1, Signing, Verification};
 #[derive(Copy, Clone, PartialEq, Eq, Debug)]
 pub enum RecoveryId {
     /// Signature recovery ID 0
-    Zero,
+    Zero = 0,
     /// Signature recovery ID 1
-    One,
+    One = 1,
     /// Signature recovery ID 2
-    Two,
+    Two = 2,
     /// Signature recovery ID 3
-    Three,
+    Three = 3,
 }
 
 impl RecoveryId {
@@ -38,14 +38,7 @@ impl RecoveryId {
     }
 
     /// 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,
-        }
-    }
+    pub const fn to_u8(self) -> u8 { self as u8 }
 }
 
 impl TryFrom<i32> for RecoveryId {
@@ -64,14 +57,7 @@ impl TryFrom<i32> for RecoveryId {
 
 impl From<RecoveryId> for u8 {
     #[inline]
-    fn from(val: RecoveryId) -> Self {
-        match val {
-            RecoveryId::Zero => 0,
-            RecoveryId::One => 1,
-            RecoveryId::Two => 2,
-            RecoveryId::Three => 3,
-        }
-    }
+    fn from(val: RecoveryId) -> Self { val.to_u8() }
 }
 
 /// An ECDSA signature with a recovery ID for pubkey recovery.