ln/refactor: move hex test helpers from blinded payments to test_utils

Author: carlaKC

lightning/src/ln/blinded_payment_tests.rs

@@ -9,7 +9,6 @@
 // You may not use this file except in accordance with one or both of these
 // licenses.
 
-use bitcoin::hashes::hex::FromHex;
 use bitcoin::hex::DisplayHex;
 use bitcoin::secp256k1::{PublicKey, Scalar, Secp256k1, SecretKey, schnorr};
 use bitcoin::secp256k1::ecdh::SharedSecret;
@@ -37,7 +36,7 @@ use crate::routing::router::{BlindedTail, Path, Payee, PaymentParameters, RouteH
 use crate::sign::{NodeSigner, PeerStorageKey, ReceiveAuthKey, Recipient};
 use crate::util::config::UserConfig;
 use crate::util::ser::{WithoutLength, Writeable};
-use crate::util::test_utils;
+use crate::util::test_utils::{self, bytes_from_hex, secret_from_hex, pubkey_from_hex};
 use lightning_invoice::RawBolt11Invoice;
 use types::features::Features;
 use crate::blinded_path::BlindedHop;
@@ -1495,18 +1494,6 @@ fn blinded_payment_path_padding() {
 	claim_payment(&nodes[0], &[&nodes[1], &nodes[2], &nodes[3], &nodes[4]], payment_preimage);
 }
 
-fn secret_from_hex(hex: &str) -> SecretKey {
-	SecretKey::from_slice(&<Vec<u8>>::from_hex(hex).unwrap()).unwrap()
-}
-
-fn bytes_from_hex(hex: &str) -> Vec<u8> {
-	<Vec<u8>>::from_hex(hex).unwrap()
-}
-
-fn pubkey_from_hex(hex: &str) -> PublicKey {
-	PublicKey::from_slice(&<Vec<u8>>::from_hex(hex).unwrap()).unwrap()
-}
-
 fn update_add_msg(
 	amount_msat: u64, cltv_expiry: u32, blinding_point: Option<PublicKey>,
 	onion_routing_packet: msgs::OnionPacket

lightning/src/util/test_utils.rs

@@ -67,7 +67,7 @@ use bitcoin::block::Block;
 use bitcoin::constants::genesis_block;
 use bitcoin::constants::ChainHash;
 use bitcoin::hash_types::{BlockHash, Txid};
-use bitcoin::hashes::Hash;
+use bitcoin::hashes::{hex::FromHex, Hash};
 use bitcoin::network::Network;
 use bitcoin::script::{Builder, Script, ScriptBuf};
 use bitcoin::sighash::{EcdsaSighashType, SighashCache};
@@ -107,6 +107,18 @@ pub fn privkey(byte: u8) -> SecretKey {
 	SecretKey::from_slice(&[byte; 32]).unwrap()
 }
 
+pub fn secret_from_hex(hex: &str) -> SecretKey {
+	SecretKey::from_slice(&<Vec<u8>>::from_hex(hex).unwrap()).unwrap()
+}
+
+pub fn bytes_from_hex(hex: &str) -> Vec<u8> {
+	<Vec<u8>>::from_hex(hex).unwrap()
+}
+
+pub fn pubkey_from_hex(hex: &str) -> PublicKey {
+	PublicKey::from_slice(&<Vec<u8>>::from_hex(hex).unwrap()).unwrap()
+}
+
 pub struct TestVecWriter(pub Vec<u8>);
 impl Writer for TestVecWriter {
 	fn write_all(&mut self, buf: &[u8]) -> Result<(), io::Error> {