Merge pull request #3210 from tcharding/07-31-rm-hex-dep

TheBlueMatt · web-flow · commit bc1c026712d8 · 2024-08-12T17:11:56.000Z
Remove explicit dependency on hex-conservative
diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml
@@ -23,7 +23,6 @@ lightning-invoice = { path = "../lightning-invoice" }
 lightning-rapid-gossip-sync = { path = "../lightning-rapid-gossip-sync" }
 bech32 = "0.9.1"
 bitcoin = { version = "0.31.2", features = ["secp-lowmemory"] }
-hex = { package = "hex-conservative", version = "0.1.1", default-features = false }
 
 afl = { version = "0.12", optional = true }
 honggfuzz = { version = "0.5", optional = true, default-features = false }
diff --git 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/lib.rs b/fuzz/src/lib.rs
@@ -8,7 +8,6 @@
 // licenses.
 
 extern crate bitcoin;
-extern crate hex;
 extern crate lightning;
 extern crate lightning_rapid_gossip_sync;
 
diff --git 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/Cargo.toml b/lightning-block-sync/Cargo.toml
@@ -19,7 +19,6 @@ rpc-client = [ "serde_json", "chunked_transfer" ]
 
 [dependencies]
 bitcoin = "0.31.2"
-hex = { package = "hex-conservative", version = "0.1.1", default-features = false }
 lightning = { version = "0.0.123-beta", path = "../lightning" }
 tokio = { version = "1.35", features = [ "io-util", "net", "time", "rt" ], optional = true }
 serde_json = { version = "1.0", optional = true }
diff --git 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;
@@ -294,8 +294,8 @@ pub(crate) mod tests {
 	use super::*;
 	use bitcoin::constants::genesis_block;
 	use bitcoin::hashes::Hash;
+	use bitcoin::hex::DisplayHex;
 	use bitcoin::network::Network;
-	use hex::DisplayHex;
 	use serde_json::value::Number;
 	use serde_json::Value;
 
diff --git 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/Cargo.toml b/lightning-invoice/Cargo.toml
@@ -28,7 +28,6 @@ bitcoin = { version = "0.31.2", default-features = false }
 
 [dev-dependencies]
 lightning = { version = "0.0.123-beta", path = "../lightning", default-features = false, features = ["_test_utils"] }
-hex = { package = "hex-conservative", version = "0.1.1", default-features = false }
 serde_json = { version = "1"}
 hashbrown = { version = "0.13", default-features = false }
 
diff --git a/lightning-invoice/tests/ser_de.rs b/lightning-invoice/tests/ser_de.rs
@@ -2,10 +2,9 @@ extern crate bech32;
 extern crate lightning;
 extern crate lightning_invoice;
 extern crate secp256k1;
-extern crate hex;
 
 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/Cargo.toml b/lightning/Cargo.toml
@@ -45,7 +45,6 @@ bitcoin = { version = "0.31.2", default-features = false, features = ["secp-reco
 
 hashbrown = { version = "0.13", optional = true, default-features = false }
 possiblyrandom = { version = "0.2", optional = true, default-features = false }
-hex = { package = "hex-conservative", version = "0.1.1", default-features = false }
 regex = { version = "1.5.6", optional = true }
 backtrace = { version = "0.3", optional = true }
 
diff --git 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
@@ -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
@@ -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/lib.rs b/lightning/src/lib.rs
@@ -65,7 +65,6 @@ pub extern crate bitcoin;
 #[cfg(any(test, feature = "std"))]
 extern crate core;
 
-extern crate hex;
 #[cfg(any(test, feature = "_test_utils"))] extern crate regex;
 
 #[cfg(not(feature = "std"))] extern crate core2;
diff --git 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
@@ -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,8 +10272,9 @@ 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;
 		use crate::sign::{ChannelDerivationParameters, HTLCDescriptor, ecdsa::EcdsaChannelSigner};
 		use crate::ln::PaymentPreimage;
@@ -10283,7 +10284,6 @@ mod tests {
 		use crate::util::logger::Logger;
 		use crate::sync::Arc;
 		use core::str::FromStr;
-		use hex::DisplayHex;
 
 		// Test vectors from BOLT 3 Appendices C and F (anchors):
 		let feeest = TestFeeEstimator{fee_est: 15000};
diff --git 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
@@ -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
@@ -3267,7 +3267,7 @@ impl_writeable_msg!(GossipTimestampFilter, {
 #[cfg(test)]
 mod tests {
 	use bitcoin::{Amount, Transaction, TxIn, ScriptBuf, Sequence, Witness, TxOut};
-	use hex::DisplayHex;
+	use bitcoin::hex::DisplayHex;
 	use crate::ln::types::{ChannelId, PaymentPreimage, PaymentHash, PaymentSecret};
 	use crate::ln::features::{ChannelFeatures, ChannelTypeFeatures, InitFeatures, NodeFeatures};
 	use crate::ln::msgs::{self, FinalOnionHopData, OnionErrorPacket, CommonOpenChannelFields, CommonAcceptChannelFields, TrampolineOnionPacket};
@@ -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
@@ -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
@@ -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
@@ -17,13 +17,13 @@ use crate::ln::wire;
 use bitcoin::hashes::{Hash, HashEngine};
 use bitcoin::hashes::sha256::Hash as Sha256;
 
+use bitcoin::hex::DisplayHex;
+
 use bitcoin::secp256k1::Secp256k1;
 use bitcoin::secp256k1::{PublicKey,SecretKey};
 use bitcoin::secp256k1::ecdh::SharedSecret;
 use bitcoin::secp256k1;
 
-use hex::DisplayHex;
-
 use crate::crypto::chacha20poly1305rfc::ChaCha20Poly1305RFC;
 use crate::crypto::utils::hkdf_extract_expand_twice;
 use crate::util::ser::VecWriter;
@@ -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/ln/types.rs b/lightning/src/ln/types.rs
@@ -200,7 +200,7 @@ mod tests {
 		sha256::Hash as Sha256,
 	};
 	use bitcoin::secp256k1::PublicKey;
-	use hex::DisplayHex;
+	use bitcoin::hex::DisplayHex;
 
 	use super::ChannelId;
 	use crate::ln::channel_keys::RevocationBasepoint;
diff --git 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
@@ -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
@@ -145,7 +145,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
@@ -158,10 +158,10 @@ impl TryFrom<NodeId> for PublicKey {
 }
 
 impl FromStr for NodeId {
-	type Err = hex::parse::HexToArrayError;
+	type Err = bitcoin::hex::parse::HexToArrayError;
 
 	fn from_str(s: &str) -> Result<Self, Self::Err> {
-		let data: [u8; PUBLIC_KEY_SIZE] = hex::FromHex::from_hex(s)?;
+		let data: [u8; PUBLIC_KEY_SIZE] = bitcoin::hex::FromHex::from_hex(s)?;
 		Ok(NodeId(data))
 	}
 }
@@ -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
@@ -3596,7 +3596,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
@@ -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/routing/utxo.rs b/lightning/src/routing/utxo.rs
@@ -17,7 +17,7 @@ use bitcoin::TxOut;
 use bitcoin::amount::Amount;
 use bitcoin::constants::ChainHash;
 
-use hex::DisplayHex;
+use bitcoin::hex::DisplayHex;
 
 use crate::events::MessageSendEvent;
 use crate::ln::chan_utils::make_funding_redeemscript_from_slices;
diff --git 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
@@ -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
@@ -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
@@ -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;
