From: Matt Corallo <git@bluematt.me>
Date: Mon, 9 Sep 2024 15:32:12 +0000 (+0000)
Subject: Clean up imports in `lightning-types`
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=refs%2Fheads%2F2024-09-chan-id-hex;p=rust-lightning

Clean up imports in `lightning-types`

To remove the now-redundant `hex_conservative` explicit dependency.
---

diff --git a/lightning-types/Cargo.toml b/lightning-types/Cargo.toml
index 9e8feedf6..f3eeec0f1 100644
--- a/lightning-types/Cargo.toml
+++ b/lightning-types/Cargo.toml
@@ -17,8 +17,6 @@ _test_utils = []
 
 [dependencies]
 bitcoin = { version = "0.32.2", default-features = false }
-# TODO: Once we switch to bitcoin 0.32 drop this explicit dep:
-hex-conservative = { version = "0.2", default-features = false }
 bech32 = { version = "0.9", default-features = false }
 
 [lints]
diff --git a/lightning-types/src/payment.rs b/lightning-types/src/payment.rs
index 6b8854ac5..a2832c6b5 100644
--- a/lightning-types/src/payment.rs
+++ b/lightning-types/src/payment.rs
@@ -14,9 +14,7 @@ use alloc::vec::Vec;
 use core::borrow::Borrow;
 
 use bitcoin::hashes::{sha256::Hash as Sha256, Hash as _};
-
-// TODO: Once we switch to rust-bitcoin 0.32, import this as bitcoin::hex
-use hex_conservative::display::impl_fmt_traits;
+use bitcoin::hex::display::impl_fmt_traits;
 
 /// The payment hash is the hash of the [`PaymentPreimage`] which is the value used to lock funds
 /// in HTLCs while they transit the lightning network.