Use bitcoin::hex instead of bitcoin::hashes::hex

Use the `hex-conservative` crate directly from `bitcoin` instead of from
`hashes`. Although it makes no real difference it is slightly more clear
and more terse.

Author: tcharding

fuzz/src/full_stack.rs

@@ -24,10 +24,10 @@ use bitcoin::transaction::Version;
 use bitcoin::transaction::{Transaction, TxOut};
 
 use bitcoin::hash_types::{BlockHash, Txid};
-use bitcoin::hashes::hex::FromHex;
 use bitcoin::hashes::sha256::Hash as Sha256;
 use bitcoin::hashes::sha256d::Hash as Sha256dHash;
 use bitcoin::hashes::Hash as _;
+use bitcoin::hex::FromHex;
 use bitcoin::WPubkeyHash;
 
 use lightning::blinded_path::message::MessageContext;
@@ -1087,7 +1087,7 @@ pub extern "C" fn full_stack_run(data: *const u8, datalen: usize) {
 
 #[cfg(test)]
 mod tests {
-	use bitcoin::hashes::hex::FromHex;
+	use bitcoin::hex::FromHex;
 	use lightning::util::logger::{Logger, Record};
 	use std::collections::HashMap;
 	use std::sync::{Arc, Mutex};

fuzz/src/onion_message.rs

@@ -281,7 +281,7 @@ impl SignerProvider for KeyProvider {
 
 #[cfg(test)]
 mod tests {
-	use bitcoin::hashes::hex::FromHex;
+	use bitcoin::hex::FromHex;
 	use lightning::util::logger::{Logger, Record};
 	use std::collections::HashMap;
 	use std::sync::Mutex;

lightning-block-sync/src/convert.rs

@@ -5,7 +5,7 @@ use crate::{BlockHeaderData, BlockSourceError};
 use bitcoin::block::{Block, Header};
 use bitcoin::consensus::encode;
 use bitcoin::hash_types::{BlockHash, TxMerkleNode, Txid};
-use bitcoin::hashes::hex::FromHex;
+use bitcoin::hex::FromHex;
 use bitcoin::Transaction;
 
 use serde_json;

lightning-block-sync/src/utils.rs

@@ -1,4 +1,4 @@
-use bitcoin::hashes::hex::{FromHex, HexToArrayError};
+use bitcoin::hex::{FromHex, HexToArrayError};
 use bitcoin::pow::Work;
 
 pub fn hex_to_work(hex: &str) -> Result<Work, HexToArrayError> {
@@ -9,7 +9,7 @@ pub fn hex_to_work(hex: &str) -> Result<Work, HexToArrayError> {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use bitcoin::hashes::hex::HexToBytesError;
+	use bitcoin::hex::HexToBytesError;
 	use bitcoin::pow::Work;
 
 	#[test]

lightning-invoice/tests/ser_de.rs

@@ -4,7 +4,7 @@ extern crate lightning_invoice;
 extern crate secp256k1;
 
 use bitcoin::{PubkeyHash, ScriptHash, WitnessVersion};
-use bitcoin::hashes::hex::FromHex;
+use bitcoin::hex::FromHex;
 use bitcoin::hashes::{sha256, Hash};
 use lightning_invoice::*;
 use secp256k1::PublicKey;

lightning/src/chain/channelmonitor.rs

@@ -4819,7 +4819,7 @@ mod tests {
 	use bitcoin::sighash::EcdsaSighashType;
 	use bitcoin::hashes::Hash;
 	use bitcoin::hashes::sha256::Hash as Sha256;
-	use bitcoin::hashes::hex::FromHex;
+	use bitcoin::hex::FromHex;
 	use bitcoin::hash_types::{BlockHash, Txid};
 	use bitcoin::network::Network;
 	use bitcoin::secp256k1::{SecretKey,PublicKey};

lightning/src/chain/package.rs

@@ -1205,7 +1205,7 @@ mod tests {
 	use bitcoin::script::ScriptBuf;
 	use bitcoin::transaction::OutPoint as BitcoinOutPoint;
 
-	use bitcoin::hashes::hex::FromHex;
+	use bitcoin::hex::FromHex;
 
 	use bitcoin::secp256k1::{PublicKey,SecretKey};
 	use bitcoin::secp256k1::Secp256k1;

lightning/src/chain/transaction.rs

@@ -92,7 +92,7 @@ mod tests {
 
 	use bitcoin::transaction::Transaction;
 	use bitcoin::consensus::encode;
-	use bitcoin::hashes::hex::FromHex;
+	use bitcoin::hex::FromHex;
 
 	#[test]
 	fn test_channel_id_calculation() {

lightning/src/ln/chan_utils.rs

@@ -1842,7 +1842,7 @@ mod tests {
 	use crate::sign::{ChannelSigner, SignerProvider};
 	use bitcoin::{Network, Txid, ScriptBuf};
 	use bitcoin::hashes::Hash;
-	use bitcoin::hashes::hex::FromHex;
+	use bitcoin::hex::FromHex;
 	use crate::ln::types::PaymentHash;
 	use bitcoin::address::Payload;
 	use bitcoin::PublicKey as BitcoinPublicKey;

lightning/src/ln/channel.rs

@@ -9618,7 +9618,7 @@ mod tests {
 	use bitcoin::secp256k1::{SecretKey,PublicKey};
 	use bitcoin::hashes::sha256::Hash as Sha256;
 	use bitcoin::hashes::Hash;
-	use bitcoin::hashes::hex::FromHex;
+	use bitcoin::hex::FromHex;
 	use bitcoin::locktime::absolute::LockTime;
 	use bitcoin::{WitnessProgram, WitnessVersion, WPubkeyHash};
 	use crate::prelude::*;
@@ -10272,7 +10272,7 @@ mod tests {
 		use bitcoin::sighash;
 		use bitcoin::consensus::encode::serialize;
 		use bitcoin::sighash::EcdsaSighashType;
-		use bitcoin::hashes::hex::FromHex;
+		use bitcoin::hex::FromHex;
 		use bitcoin::hash_types::Txid;
 		use bitcoin::hex::DisplayHex;
 		use bitcoin::secp256k1::Message;

lightning/src/ln/channel_keys.rs

@@ -256,7 +256,7 @@ key_read_write!(RevocationKey);
 #[cfg(test)]
 mod test {
 	use super::derive_public_key;
-	use bitcoin::hashes::hex::FromHex;
+	use bitcoin::hex::FromHex;
 	use bitcoin::secp256k1::{PublicKey, Secp256k1, SecretKey};
 
 	#[test]

lightning/src/ln/monitor_tests.rs

@@ -28,7 +28,7 @@ use bitcoin::{Amount, PublicKey, ScriptBuf, Transaction, TxIn, TxOut, Witness};
 use bitcoin::locktime::absolute::LockTime;
 use bitcoin::script::Builder;
 use bitcoin::opcodes;
-use bitcoin::hashes::hex::FromHex;
+use bitcoin::hex::FromHex;
 use bitcoin::secp256k1::{Secp256k1, SecretKey};
 use bitcoin::sighash::{SighashCache, EcdsaSighashType};
 use bitcoin::transaction::Version;

lightning/src/ln/msgs.rs

@@ -3276,7 +3276,7 @@ mod tests {
 	use crate::util::ser::{BigSize, FixedLengthReader, Hostname, LengthReadable, Readable, ReadableArgs, TransactionU16LenLimited, Writeable};
 	use crate::util::test_utils;
 
-	use bitcoin::hashes::hex::FromHex;
+	use bitcoin::hex::FromHex;
 	use bitcoin::address::Address;
 	use bitcoin::network::Network;
 	use bitcoin::constants::ChainHash;

lightning/src/ln/onion_route_tests.rs

@@ -40,7 +40,7 @@ use bitcoin::secp256k1::{PublicKey, Secp256k1, SecretKey};
 
 use crate::io;
 use crate::prelude::*;
-use bitcoin::hashes::hex::FromHex;
+use bitcoin::hex::FromHex;
 
 use crate::ln::functional_test_utils::*;
 

lightning/src/ln/onion_utils.rs

@@ -1280,7 +1280,7 @@ mod tests {
 	#[allow(unused_imports)]
 	use crate::prelude::*;
 
-	use bitcoin::hashes::hex::FromHex;
+	use bitcoin::hex::FromHex;
 	use bitcoin::secp256k1::Secp256k1;
 	use bitcoin::secp256k1::{PublicKey, SecretKey};
 

lightning/src/ln/peer_channel_encryptor.rs

@@ -570,7 +570,7 @@ impl MessageBuf {
 mod tests {
 	use super::{MessageBuf, LN_MAX_MSG_LEN};
 
-	use bitcoin::hashes::hex::FromHex;
+	use bitcoin::hex::FromHex;
 	use bitcoin::secp256k1::{PublicKey, SecretKey};
 	use bitcoin::secp256k1::Secp256k1;
 

lightning/src/offers/merkle.rs

@@ -304,7 +304,7 @@ mod tests {
 	use super::{SIGNATURE_TYPES, TlvStream, WithoutSignatures};
 
 	use bitcoin::hashes::{Hash, sha256};
-	use bitcoin::hashes::hex::FromHex;
+	use bitcoin::hex::FromHex;
 	use bitcoin::secp256k1::{Keypair, Message, Secp256k1, SecretKey};
 	use bitcoin::secp256k1::schnorr::Signature;
 	use crate::offers::offer::{Amount, OfferBuilder};

lightning/src/onion_message/functional_tests.rs

@@ -25,7 +25,7 @@ use super::offers::{OffersMessage, OffersMessageHandler};
 use super::packet::{OnionMessageContents, Packet};
 
 use bitcoin::network::Network;
-use bitcoin::hashes::hex::FromHex;
+use bitcoin::hex::FromHex;
 use bitcoin::secp256k1::{All, PublicKey, Secp256k1, SecretKey};
 
 use crate::io;

lightning/src/onion_message/messenger.rs

@@ -144,7 +144,7 @@ for OnionMessenger<ES, NS, L, NL, MR, OMH, APH, CMH> where
 /// ```
 /// # extern crate bitcoin;
 /// # use bitcoin::hashes::_export::_core::time::Duration;
-/// # use bitcoin::hashes::hex::FromHex;
+/// # use bitcoin::hex::FromHex;
 /// # use bitcoin::secp256k1::{PublicKey, Secp256k1, SecretKey, self};
 /// # use lightning::blinded_path::{BlindedPath, EmptyNodeIdLookUp};
 /// # use lightning::blinded_path::message::{ForwardNode, MessageContext};

lightning/src/routing/gossip.rs

@@ -2430,7 +2430,7 @@ pub(crate) mod tests {
 
 	use bitcoin::hashes::sha256d::Hash as Sha256dHash;
 	use bitcoin::hashes::Hash;
-	use bitcoin::hashes::hex::FromHex;
+	use bitcoin::hex::FromHex;
 	use bitcoin::network::Network;
 	use bitcoin::amount::Amount;
 	use bitcoin::constants::ChainHash;

lightning/src/routing/router.rs

@@ -3598,7 +3598,7 @@ mod tests {
 	use bitcoin::script::Builder;
 	use bitcoin::opcodes;
 	use bitcoin::transaction::TxOut;
-	use bitcoin::hashes::hex::FromHex;
+	use bitcoin::hex::FromHex;
 	use bitcoin::secp256k1::{PublicKey,SecretKey};
 	use bitcoin::secp256k1::Secp256k1;
 

lightning/src/routing/test_utils.rs

@@ -16,7 +16,7 @@ use crate::util::ser::Writeable;
 use bitcoin::constants::ChainHash;
 use bitcoin::hashes::sha256d::Hash as Sha256dHash;
 use bitcoin::hashes::Hash;
-use bitcoin::hashes::hex::FromHex;
+use bitcoin::hex::FromHex;
 use bitcoin::network::Network;
 use bitcoin::secp256k1::{PublicKey,SecretKey};
 use bitcoin::secp256k1::{Secp256k1, All};

lightning/src/sign/mod.rs

@@ -328,7 +328,7 @@ impl SpendableOutputDescriptor {
 	/// To get the proprietary field use:
 	/// ```
 	/// use bitcoin::psbt::{Psbt};
-	/// use bitcoin::hashes::hex::FromHex;
+	/// use bitcoin::hex::FromHex;
 	///
 	/// # let s = "70736274ff0100520200000001dee978529ab3e61a2987bea5183713d0e6d5ceb5ac81100fdb54a1a2\
 	///	# 		 69cef505000000000090000000011f26000000000000160014abb3ab63280d4ccc5c11d6b50fd427a8\

lightning/src/util/ser.rs

@@ -1507,7 +1507,7 @@ impl Readable for ClaimId {
 
 #[cfg(test)]
 mod tests {
-	use bitcoin::hashes::hex::FromHex;
+	use bitcoin::hex::FromHex;
 	use bitcoin::secp256k1::ecdsa;
 	use crate::util::ser::{Readable, Hostname, Writeable};
 	use crate::prelude::*;

lightning/src/util/ser_macros.rs

@@ -1294,7 +1294,7 @@ mod tests {
 	use crate::io::{self, Cursor};
 	use crate::ln::msgs::DecodeError;
 	use crate::util::ser::{MaybeReadable, Readable, Writeable, HighZeroBytesDroppedBigSize, VecWriter};
-	use bitcoin::hashes::hex::FromHex;
+	use bitcoin::hex::FromHex;
 	use bitcoin::secp256k1::PublicKey;
 
 	// The BOLT TLV test cases don't include any tests which use our "required-value" logic since

lightning/src/util/transaction_utils.rs

@@ -78,7 +78,7 @@ mod tests {
 	use bitcoin::script::Builder;
 	use bitcoin::hash_types::Txid;
 	use bitcoin::hashes::Hash;
-	use bitcoin::hashes::hex::FromHex;
+	use bitcoin::hex::FromHex;
 	use bitcoin::{PubkeyHash, Sequence, Witness};
 
 	use alloc::vec;