Remove explicit dependency on hex-conservative

The `hex` crate is re-exported by `rust-bitcoin` so we can get it from
there instead of explicitly depending on it. Doing so reduces the
maintenance burden and helps reduce the likelyhood of getting two
versions in the dependency graph.

diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml
index 4d9f7e0dea33697c8ec85cad904c737a2ffde4b0..002cc54a91e04cc726d7a1fed167ad940bfb5abd 100644 (file)
--- 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/lib.rs b/fuzz/src/lib.rs
index 2e132edce423ecbd23a015af80b6ea8105a1f976..123ee88ea31a7e0a8b146ca3711acf28149e21f3 100644 (file)
--- 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/lightning-block-sync/Cargo.toml b/lightning-block-sync/Cargo.toml
index 2e827000017a63844ae3a2320f07e6c66bdfc03d..c3a230967b411b0e92533ce9bdf95a452fbc805a 100644 (file)
--- 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
index 7a1bc02ac19904d4d3814e0fec180631df67db3f..9ab6ef23cb9f2492086a754d92c0a98f79b76adb 100644 (file)
--- a/lightning-block-sync/src/convert.rs
+++ b/lightning-block-sync/src/convert.rs
@@ -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-invoice/Cargo.toml b/lightning-invoice/Cargo.toml
index d89f8d08e4a72f00e87e6ed9521d8ba4b6296c73..94b3071676a36f57d31abb81a47706750896d962 100644 (file)
--- 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
index 6b5e99476b02427e254b931260f9b5ee9e9b9cd8..356cc9ae6febfaec75581ce535db98f356387573 100644 (file)
--- a/lightning-invoice/tests/ser_de.rs
+++ b/lightning-invoice/tests/ser_de.rs
@@ -2,7 +2,6 @@ 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;

diff --git a/lightning/Cargo.toml b/lightning/Cargo.toml
index cf4a5329476dd2c88e9c5de9cf9fceb7d71ac740..a0f1e4027f609d86cb59bfcdbcaf4fa4ce38e007 100644 (file)
--- 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/lib.rs b/lightning/src/lib.rs
index 5274ea0bf309ce2d0709936d496d8a098b561ebc..54652e32015d439631def51913514dee87fb9e69 100644 (file)
--- 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/channel.rs b/lightning/src/ln/channel.rs
index 9abe997890fe0bee01e75f4c3a85dc18ed89aa3c..7dd11b643935e3ddb88c713be5e3c595ad3144fc 100644 (file)
--- a/lightning/src/ln/channel.rs
+++ b/lightning/src/ln/channel.rs
@@ -10274,6 +10274,7 @@ mod tests {
                use bitcoin::sighash::EcdsaSighashType;
                use bitcoin::hashes::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/msgs.rs b/lightning/src/ln/msgs.rs
index a41072add6ed2f5c890908ff5172c6a18907ff41..82d0e6a83e8997c8b367ac9e3483b2884c3a5093 100644 (file)
--- 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};

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

diff --git a/lightning/src/ln/types.rs b/lightning/src/ln/types.rs
index c6fa5986764d4ec717ebc3b7489bf0da343d5724..b813239786ab76b279f5750aa89d75c79bba8576 100644 (file)
--- 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/routing/gossip.rs b/lightning/src/routing/gossip.rs
index f058aa7470681d313fdf81178eec49312e821bc8..a74a599ae834a652b6c4c4bb289de1a1f6b105e8 100644 (file)
--- 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))
        }
 }

diff --git a/lightning/src/routing/utxo.rs b/lightning/src/routing/utxo.rs
index a8fe58831847625e6300708a4b1a91b077dd9e7a..f885c47efef1c7729d9b5722d1d9675d6db6e7de 100644 (file)
--- 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;