rename hex_conservative to hex, re-export it, delete old hex module

Tada!

Author: apoelstra

Cargo.toml

@@ -37,7 +37,7 @@ serde_json = { version = "1.0", optional = true }
 actual-serde = { package = "serde", version = "1.0.103", features = [
     "derive",
 ], optional = true }
-hex-conservative = "1.1.0"
+hex = { package = "hex-conservative", version = "1.1.0" }
 
 
 [target.wasm32-unknown-unknown.dev-dependencies]

src/blind.rs

@@ -1380,7 +1380,6 @@ mod tests {
     use crate::encode::deserialize;
     use crate::Script;
     use bitcoin::{PrivateKey, PublicKey};
-    use hex_conservative as hex;
     use rand::thread_rng;
     use secp256k1_zkp::SECP256K1;
     use std::str::FromStr;

src/block.rs

@@ -395,7 +395,6 @@ impl Block {
 #[cfg(test)]
 mod tests {
     use crate::Block;
-    use hex_conservative as hex;
 
     use super::*;
 

src/confidential.rs

@@ -18,7 +18,6 @@
 //!
 
 use crate::hashes::{sha256d, Hash};
-use hex_conservative as hex;
 use secp256k1_zkp::{self, CommitmentSecrets, Generator, PedersenCommitment,
     PublicKey, Secp256k1, SecretKey, Signing, Tweak, ZERO_TWEAK,
     compute_adaptive_blinding_factor,
@@ -724,7 +723,7 @@ impl<'de> Deserialize<'de> for Nonce {
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum TweakHexDecodeError {
     /// Invalid hexadecimal string.
-    InvalidHex(hex_conservative::DecodeFixedLengthBytesError),
+    InvalidHex(hex::DecodeFixedLengthBytesError),
     /// Invalid tweak after decoding hexadecimal string.
     InvalidTweak(secp256k1_zkp::Error),
 }
@@ -743,8 +742,8 @@ impl fmt::Display for TweakHexDecodeError {
 }
 
 #[doc(hidden)]
-impl From<hex_conservative::DecodeFixedLengthBytesError> for TweakHexDecodeError {
-    fn from(err: hex_conservative::DecodeFixedLengthBytesError) -> Self {
+impl From<hex::DecodeFixedLengthBytesError> for TweakHexDecodeError {
+    fn from(err: hex::DecodeFixedLengthBytesError) -> Self {
         TweakHexDecodeError::InvalidHex(err)
     }
 }
@@ -821,7 +820,7 @@ impl str::FromStr for AssetBlindingFactor {
     type Err = encode::Error;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let mut slice: [u8; 32] = hex_conservative::decode_to_array(s)?;
+        let mut slice: [u8; 32] = hex::decode_to_array(s)?;
         slice.reverse();
 
         let inner = Tweak::from_inner(slice)?;
@@ -1017,7 +1016,7 @@ impl str::FromStr for ValueBlindingFactor {
     type Err = encode::Error;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let mut slice: [u8; 32] = hex_conservative::decode_to_array(s)?;
+        let mut slice: [u8; 32] = hex::decode_to_array(s)?;
         slice.reverse();
 
         let inner = Tweak::from_inner(slice)?;

src/dynafed.rs

@@ -16,7 +16,7 @@
 
 use std::{fmt, io};
 
-use hex_conservative::DisplayHex as _;
+use hex::DisplayHex as _;
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 #[cfg(feature = "serde")]
@@ -459,7 +459,6 @@ impl<'de> Deserialize<'de> for Params {
                             }
 
                             fn visit_str<E: de::Error>(self, v: &str) -> Result<Self::Value, E> {
-                                use hex_conservative as hex;
                                 Ok(HexBytes(hex::decode_to_vec(v).map_err(E::custom)?))
                             }
 

src/encode.rs

@@ -19,7 +19,7 @@ use std::io::Cursor;
 use std::{any, error, fmt, io, mem};
 
 use bitcoin::ScriptBuf;
-use hex_conservative::{DecodeFixedLengthBytesError, DecodeVariableLengthBytesError};
+use hex::{DecodeFixedLengthBytesError, DecodeVariableLengthBytesError};
 use secp256k1_zkp::{self, RangeProof, SurjectionProof, Tweak};
 
 use crate::hashes::{sha256, Hash};
@@ -174,7 +174,7 @@ pub fn serialize<T: Encodable + ?Sized>(data: &T) -> Vec<u8> {
 
 /// Encode an object into a hex-encoded string
 pub fn serialize_hex<T: Encodable + ?Sized>(data: &T) -> String {
-    hex_conservative::DisplayHex::to_lower_hex_string(&serialize(data)[..])
+    hex::DisplayHex::to_lower_hex_string(&serialize(data)[..])
 }
 
 /// Deserialize an object from a vector, will error if said deserialization