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.

diff --git a/fuzz/src/full_stack.rs b/fuzz/src/full_stack.rs
index 0a4bb98099f49984e0ac339a93166d9275387ef1..5499dc5e902a9d0e961bd6ab17565ebb0887d88a 100644 (file)
--- a/fuzz/src/full_stack.rs
+++ b/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};

diff --git a/fuzz/src/onion_message.rs b/fuzz/src/onion_message.rs
index 0b9aceaf97b7210faca820ecb982bf8d8701a9a8..a05551410f349313a9bdf975a88c8946a3d5cdc6 100644 (file)
--- a/fuzz/src/onion_message.rs
+++ b/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;

diff --git a/lightning-block-sync/src/convert.rs b/lightning-block-sync/src/convert.rs
index 9ab6ef23cb9f2492086a754d92c0a98f79b76adb..ea01039f2cc6c7fee0e8a070d2fa697818f4a116 100644 (file)
--- a/lightning-block-sync/src/convert.rs
+++ b/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;

diff --git a/lightning-block-sync/src/utils.rs b/lightning-block-sync/src/utils.rs
index 746dcb23394ac800983b7fe537c9e2a1f2c7ec0c..494a1e53f34288073cc7928906083789c2d7b786 100644 (file)
--- a/lightning-block-sync/src/utils.rs
+++ b/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]

diff --git a/lightning-invoice/tests/ser_de.rs b/lightning-invoice/tests/ser_de.rs
index 356cc9ae6febfaec75581ce535db98f356387573..d0058c9a1e3f771e31092dfd47cde7512e072485 100644 (file)
--- a/lightning-invoice/tests/ser_de.rs
+++ b/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;

diff --git a/lightning/src/chain/channelmonitor.rs b/lightning/src/chain/channelmonitor.rs
index 1eb40da57e8aed7a790272cedff055d731e6a45d..10aab828753a517e0582cc80ecedaedfbdcdb703 100644 (file)
--- a/lightning/src/chain/channelmonitor.rs
+++ b/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};

diff --git a/lightning/src/chain/package.rs b/lightning/src/chain/package.rs
index 77ac356680cecc184e9a7d3afa9c778dd0933db6..b0dfca4c207018366c9beee09b8ab98cf383645e 100644 (file)
--- a/lightning/src/chain/package.rs
+++ b/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;

diff --git a/lightning/src/chain/transaction.rs b/lightning/src/chain/transaction.rs
index 9533836de890a488978ab870a0c8052f5225af31..e9b75a6396fb979aa0b413b32bf364c366204c6b 100644 (file)
--- a/lightning/src/chain/transaction.rs
+++ b/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() {

diff --git a/lightning/src/ln/chan_utils.rs b/lightning/src/ln/chan_utils.rs
index cf42d5d84c9f76875ef5fae790af53497d04929c..4d2572e895f1e12090877c233a740b771ba9daf4 100644 (file)
--- a/lightning/src/ln/chan_utils.rs
+++ b/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;

diff --git a/lightning/src/ln/channel.rs b/lightning/src/ln/channel.rs
index 7dd11b643935e3ddb88c713be5e3c595ad3144fc..afd4e73578fad563999f8fd1bdd689d67ed2bbe1 100644 (file)
--- a/lightning/src/ln/channel.rs
+++ b/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;

diff --git a/lightning/src/ln/channel_keys.rs b/lightning/src/ln/channel_keys.rs
index 79993cd2ae92b27add5fcef1175b7eee8e274696..d6a98e24e3a4bb0e356f6cb48218d1968be048c2 100644 (file)
--- a/lightning/src/ln/channel_keys.rs
+++ b/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]

diff --git a/lightning/src/ln/monitor_tests.rs b/lightning/src/ln/monitor_tests.rs
index 7b43bf037395f71277390cc394dc9dd391a5ce9d..6f9a145771292cbe961485dc1666fd43d78ebf36 100644 (file)
--- a/lightning/src/ln/monitor_tests.rs
+++ b/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;

diff --git a/lightning/src/ln/msgs.rs b/lightning/src/ln/msgs.rs
index 82d0e6a83e8997c8b367ac9e3483b2884c3a5093..5cc1257c46192313de28eed222a116d8bc9adcb9 100644 (file)
--- a/lightning/src/ln/msgs.rs
+++ b/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;

diff --git a/lightning/src/ln/onion_route_tests.rs b/lightning/src/ln/onion_route_tests.rs
index 485f05a35414370a13bc6f30c2b94c6fc9b033a7..bd28f96988fc570407b01c0ecc5dcedc330d2233 100644 (file)
--- a/lightning/src/ln/onion_route_tests.rs
+++ b/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::*;
 

diff --git a/lightning/src/ln/onion_utils.rs b/lightning/src/ln/onion_utils.rs
index bab81e2de5c1d3672323d15555e281d3ae4339f8..d6fe281d1d32979979df9d6df8c2ea13ee989139 100644 (file)
--- a/lightning/src/ln/onion_utils.rs
+++ b/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};
 

diff --git a/lightning/src/ln/peer_channel_encryptor.rs b/lightning/src/ln/peer_channel_encryptor.rs
index df2a7bd89b59ea0893144414fe316cb03206baf5..00e45afb4d833fdcdb13051d2ba5d3fd02500749 100644 (file)
--- a/lightning/src/ln/peer_channel_encryptor.rs
+++ b/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;
 

diff --git a/lightning/src/offers/merkle.rs b/lightning/src/offers/merkle.rs
index 11f1d971330c7f1c3f7447aa2f2b7ee5a5f5ddd7..90bfc859e500d918b103af356f74c2b1a9f9be8a 100644 (file)
--- a/lightning/src/offers/merkle.rs
+++ b/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};

diff --git a/lightning/src/onion_message/functional_tests.rs b/lightning/src/onion_message/functional_tests.rs
index ad6fe7d99a353bf851f6907916732cb51f0c7667..7df69b82348297286d34236598ec2cb5a7709c3d 100644 (file)
--- a/lightning/src/onion_message/functional_tests.rs
+++ b/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;

diff --git a/lightning/src/onion_message/messenger.rs b/lightning/src/onion_message/messenger.rs
index b14210db4b577ca0b1a58e4b2710ccda0bec091d..dc670cc841decc3445255172cda8a7672764cde5 100644 (file)
--- a/lightning/src/onion_message/messenger.rs
+++ b/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};

diff --git a/lightning/src/routing/gossip.rs b/lightning/src/routing/gossip.rs
index a74a599ae834a652b6c4c4bb289de1a1f6b105e8..31f93db905c90b316bb8835af9346f4ea2e794b0 100644 (file)
--- a/lightning/src/routing/gossip.rs
+++ b/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;

diff --git a/lightning/src/routing/router.rs b/lightning/src/routing/router.rs
index d7c665ff117739a6b4d1feec2122ad5d9c95ffac..0dd32353f9fada24963b75d14e02e50e3146830b 100644 (file)
--- a/lightning/src/routing/router.rs
+++ b/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;
 

diff --git a/lightning/src/routing/test_utils.rs b/lightning/src/routing/test_utils.rs
index 939352cf53f8ee2c8441ba0ea19579eadd57caf4..cf991ed0a4042c7b6efeab2d02112fb9b90d853f 100644 (file)
--- a/lightning/src/routing/test_utils.rs
+++ b/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};

diff --git a/lightning/src/sign/mod.rs b/lightning/src/sign/mod.rs
index 2e6e69cc0f6b1555d29d3211b81ab30247eeab47..f5fc9bb19bdd82d0d725a5969e34f1025d5259ae 100644 (file)
--- a/lightning/src/sign/mod.rs
+++ b/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\

diff --git a/lightning/src/util/ser.rs b/lightning/src/util/ser.rs
index 2dda215237b1ac73194ac81ed593bbc27d873265..3d3d97252f284aec09a2c320125d71f5e5b8c14d 100644 (file)
--- a/lightning/src/util/ser.rs
+++ b/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::*;

diff --git a/lightning/src/util/ser_macros.rs b/lightning/src/util/ser_macros.rs
index f7a299d9b21a70e1767797eec158331ca9196ff3..210d8ff6d42caf258b4743958b4741e688eadd00 100644 (file)
--- a/lightning/src/util/ser_macros.rs
+++ b/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

diff --git a/lightning/src/util/transaction_utils.rs b/lightning/src/util/transaction_utils.rs
index 99c556f6314b3f7da38887b5aa5fcee5a1b211bd..7bc8175d82f0e50a472159691a93d2adc2cfa217 100644 (file)
--- a/lightning/src/util/transaction_utils.rs
+++ b/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;