Replace ToHex with DisplayHex

Author: wpaulino

lightning-block-sync/Cargo.toml

@@ -19,6 +19,7 @@ rpc-client = [ "serde_json", "chunked_transfer" ]
 
 [dependencies]
 bitcoin = "0.30.2"
+hex = { package = "hex-conservative", version = "0.1.1", default-features = false }
 lightning = { version = "0.0.118", path = "../lightning" }
 tokio = { version = "1.0", features = [ "io-util", "net", "time" ], optional = true }
 serde_json = { version = "1.0", optional = true }

lightning-block-sync/src/convert.rs

@@ -292,8 +292,8 @@ pub(crate) mod tests {
 	use super::*;
 	use bitcoin::blockdata::constants::genesis_block;
 	use bitcoin::hashes::Hash;
-	use bitcoin::hashes::hex::ToHex;
 	use bitcoin::network::constants::Network;
+	use hex::DisplayHex;
 	use serde_json::value::Number;
 	use serde_json::Value;
 
@@ -302,13 +302,13 @@ pub(crate) mod tests {
 		fn from(data: BlockHeaderData) -> Self {
 			let BlockHeaderData { chainwork, height, header } = data;
 			serde_json::json!({
-				"chainwork": chainwork.to_string()["0x".len()..],
+				"chainwork": chainwork.to_be_bytes().as_hex().to_string(),
 				"height": height,
 				"version": header.version.to_consensus(),
 				"merkleroot": header.merkle_root.to_string(),
 				"time": header.time,
 				"nonce": header.nonce,
-				"bits": header.bits.to_hex(),
+				"bits": header.bits.to_consensus().to_be_bytes().as_hex().to_string(),
 				"previousblockhash": header.prev_blockhash.to_string(),
 			})
 		}

lightning/Cargo.toml

@@ -17,7 +17,7 @@ rustdoc-args = ["--cfg", "docsrs"]
 
 [features]
 # Internal test utilities exposed to other repo crates
-_test_utils = ["hex", "regex", "bitcoin/bitcoinconsensus"]
+_test_utils = ["regex", "bitcoin/bitcoinconsensus"]
 # Unlog messages superior at targeted level.
 max_level_off = []
 max_level_error = []
@@ -43,14 +43,13 @@ default = ["std", "grind_signatures"]
 bitcoin = { version = "0.30.2", default-features = false, features = ["secp-recovery"] }
 
 hashbrown = { version = "0.8", optional = true }
-hex = { package = "hex-conservative", version = "0.1.1", default-features = false, optional = true }
+hex = { package = "hex-conservative", version = "0.1.1", default-features = false }
 regex = { version = "1.5.6", optional = true }
 backtrace = { version = "0.3", optional = true }
 
 core2 = { version = "0.3.0", optional = true, default-features = false }
 
 [dev-dependencies]
-hex = { package = "hex-conservative", version = "0.1.1", default-features = false }
 regex = "1.5.6"
 
 [dev-dependencies.bitcoin]

lightning/src/lib.rs

@@ -66,7 +66,7 @@ extern crate bitcoin;
 #[cfg(any(test, feature = "std"))]
 extern crate core;
 
-#[cfg(any(test, feature = "_test_utils"))] extern crate hex;
+extern crate hex;
 #[cfg(any(test, feature = "_test_utils"))] extern crate regex;
 
 #[cfg(not(feature = "std"))] extern crate core2;

lightning/src/ln/channel.rs

@@ -8338,6 +8338,7 @@ 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};
@@ -8436,7 +8437,7 @@ mod tests {
 				let redeemscript = chan.context.get_funding_redeemscript();
 				let counterparty_signature = Signature::from_der(&<Vec<u8>>::from_hex($counterparty_sig_hex).unwrap()[..]).unwrap();
 				let sighash = unsigned_tx.get_sighash_all(&redeemscript, chan.context.channel_value_satoshis);
-				log_trace!(logger, "unsigned_tx = {}", hex::encode(serialize(&unsigned_tx.transaction)));
+				log_trace!(logger, "unsigned_tx = {}", serialize(&unsigned_tx.transaction).as_hex());
 				assert!(secp_ctx.verify_ecdsa(&sighash, &counterparty_signature, chan.context.counterparty_funding_pubkey()).is_ok(), "verify counterparty commitment sig");
 
 				let mut per_htlc: Vec<(HTLCOutputInCommitment, Option<Signature>)> = Vec::new();
@@ -8514,7 +8515,7 @@ mod tests {
 					assert_eq!(signature, htlc_holder_sig, "htlc sig");
 					let trusted_tx = holder_commitment_tx.trust();
 					htlc_tx.input[0].witness = trusted_tx.build_htlc_input_witness($htlc_idx, htlc_counterparty_sig, &htlc_holder_sig, &preimage);
-					log_trace!(logger, "htlc_tx = {}", hex::encode(serialize(&htlc_tx)));
+					log_trace!(logger, "htlc_tx = {}", serialize(&htlc_tx).as_hex());
 					assert_eq!(serialize(&htlc_tx)[..], <Vec<u8>>::from_hex($htlc_tx_hex).unwrap()[..], "htlc tx");
 				})*
 				assert!(htlc_counterparty_sig_iter.next().is_none());

lightning/src/ln/channel_id.rs

@@ -13,10 +13,7 @@ use crate::ln::msgs::DecodeError;
 use crate::sign::EntropySource;
 use crate::util::ser::{Readable, Writeable, Writer};
 
-use bitcoin::hashes::hex::ToHex;
-
 use crate::io;
-use crate::prelude::*;
 use core::fmt;
 use core::ops::Deref;
 
@@ -79,12 +76,6 @@ impl Readable for ChannelId {
 	}
 }
 
-impl ToHex for ChannelId {
-	fn to_hex(&self) -> String {
-		self.0.to_hex()
-	}
-}
-
 impl fmt::Display for ChannelId {
 	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 		crate::util::logger::DebugBytes(&self.0).fmt(f)
@@ -93,17 +84,18 @@ impl fmt::Display for ChannelId {
 
 #[cfg(test)]
 mod tests {
+	use hex::DisplayHex;
+
 	use crate::ln::ChannelId;
 	use crate::util::ser::{Readable, Writeable};
 	use crate::util::test_utils;
-	use bitcoin::hashes::hex::ToHex;
 	use crate::prelude::*;
 	use crate::io;
 
 	#[test]
 	fn test_channel_id_v1_from_funding_txid() {
 		let channel_id = ChannelId::v1_from_funding_txid(&[2; 32], 1);
-		assert_eq!(channel_id.to_hex(), "0202020202020202020202020202020202020202020202020202020202020203");
+		assert_eq!(channel_id.0.as_hex().to_string(), "0202020202020202020202020202020202020202020202020202020202020203");
 	}
 
 	#[test]

lightning/src/ln/msgs.rs

@@ -2800,7 +2800,7 @@ impl_writeable_msg!(GossipTimestampFilter, {
 mod tests {
 	use std::convert::TryFrom;
 	use bitcoin::{Transaction, TxIn, ScriptBuf, Sequence, Witness, TxOut};
-	use hex;
+	use hex::DisplayHex;
 	use crate::ln::{PaymentPreimage, PaymentHash, PaymentSecret};
 	use crate::ln::ChannelId;
 	use crate::ln::features::{ChannelFeatures, ChannelTypeFeatures, InitFeatures, NodeFeatures};
@@ -3462,7 +3462,7 @@ mod tests {
 			funding_pubkey: pubkey_1,
 		};
 		let encoded_value = splice.encode();
-		assert_eq!(hex::encode(encoded_value), "02020202020202020202020202020202020202020202020202020202020202026fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000000000000001e240000007d000000000031b84c5567b126440995d3ed5aaba0565d71e1834604819ff9c17f5e9d5dd078f");
+		assert_eq!(encoded_value.as_hex().to_string(), "02020202020202020202020202020202020202020202020202020202020202026fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000000000000001e240000007d000000000031b84c5567b126440995d3ed5aaba0565d71e1834604819ff9c17f5e9d5dd078f");
 	}
 
 	#[test]
@@ -3472,7 +3472,7 @@ mod tests {
 			initiator: 1,
 		};
 		let encoded_value = stfu.encode();
-		assert_eq!(hex::encode(encoded_value), "020202020202020202020202020202020202020202020202020202020202020201");
+		assert_eq!(encoded_value.as_hex().to_string(), "020202020202020202020202020202020202020202020202020202020202020201");
 	}
 
 	#[test]
@@ -3486,7 +3486,7 @@ mod tests {
 			funding_pubkey: pubkey_1,
 		};
 		let encoded_value = splice.encode();
-		assert_eq!(hex::encode(encoded_value), "02020202020202020202020202020202020202020202020202020202020202026fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000000000000001e240031b84c5567b126440995d3ed5aaba0565d71e1834604819ff9c17f5e9d5dd078f");
+		assert_eq!(encoded_value.as_hex().to_string(), "02020202020202020202020202020202020202020202020202020202020202026fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000000000000001e240031b84c5567b126440995d3ed5aaba0565d71e1834604819ff9c17f5e9d5dd078f");
 	}
 
 	#[test]
@@ -3495,7 +3495,7 @@ mod tests {
 			channel_id: ChannelId::from_bytes([2; 32]),
 		};
 		let encoded_value = splice.encode();
-		assert_eq!(hex::encode(encoded_value), "0202020202020202020202020202020202020202020202020202020202020202");
+		assert_eq!(encoded_value.as_hex().to_string(), "0202020202020202020202020202020202020202020202020202020202020202");
 	}
 
 	#[test]

lightning/src/ln/peer_channel_encryptor.rs

@@ -22,10 +22,11 @@ use bitcoin::secp256k1::{PublicKey,SecretKey};
 use bitcoin::secp256k1::ecdh::SharedSecret;
 use bitcoin::secp256k1;
 
+use hex::DisplayHex;
+
 use crate::util::chacha20poly1305rfc::ChaCha20Poly1305RFC;
 use crate::util::crypto::hkdf_extract_expand_twice;
 use crate::util::ser::VecWriter;
-use bitcoin::hashes::hex::ToHex;
 
 use core::ops::Deref;
 
@@ -235,7 +236,7 @@ impl PeerChannelEncryptor {
 		}
 
 		let their_pub = match PublicKey::from_slice(&act[1..34]) {
-			Err(_) => return Err(LightningError{err: format!("Invalid public key {}", &act[1..34].to_hex()), action: msgs::ErrorAction::DisconnectPeer{ msg: None }}),
+			Err(_) => return Err(LightningError{err: format!("Invalid public key {}", &act[1..34].as_hex()), action: msgs::ErrorAction::DisconnectPeer{ msg: None }}),
 			Ok(key) => key,
 		};
 
@@ -394,7 +395,7 @@ impl PeerChannelEncryptor {
 						PeerChannelEncryptor::decrypt_with_ad(&mut their_node_id, 1, &temp_k2.unwrap(), &bidirectional_state.h, &act_three[1..50])?;
 						self.their_node_id = Some(match PublicKey::from_slice(&their_node_id) {
 							Ok(key) => key,
-							Err(_) => return Err(LightningError{err: format!("Bad node_id from peer, {}", &their_node_id.to_hex()), action: msgs::ErrorAction::DisconnectPeer{ msg: None }}),
+							Err(_) => return Err(LightningError{err: format!("Bad node_id from peer, {}", &their_node_id.as_hex()), action: msgs::ErrorAction::DisconnectPeer{ msg: None }}),
 						});
 
 						let mut sha = Sha256::engine();

lightning/src/routing/utxo.rs

@@ -15,14 +15,14 @@
 
 use bitcoin::TxOut;
 use bitcoin::blockdata::constants::ChainHash;
-use bitcoin::hashes::hex::ToHex;
+
+use hex::DisplayHex;
 
 use crate::events::MessageSendEvent;
 use crate::ln::chan_utils::make_funding_redeemscript_from_slices;
 use crate::ln::msgs::{self, LightningError, ErrorAction};
 use crate::routing::gossip::{NetworkGraph, NodeId, P2PGossipSync};
 use crate::util::logger::{Level, Logger};
-use crate::util::ser::Writeable;
 
 use crate::prelude::*;
 
@@ -473,7 +473,7 @@ impl PendingChecks {
 				Err(UtxoLookupError::UnknownChain) => {
 					Err(LightningError {
 						err: format!("Channel announced on an unknown chain ({})",
-							msg.chain_hash.encode().to_hex()),
+							msg.chain_hash.to_bytes().as_hex()),
 						action: ErrorAction::IgnoreError
 					})
 				},