Skip to content

Commit 3840ff6

Browse files
committed
Gate channel.rs Keys test util on the right cfg flag
The `Keys` struct is only used when building with `ldk_test_vectors` and thus should be gated on it, rather than being marked `#[allow(unused)]`.
1 parent 192618b commit 3840ff6

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

lightning/src/ln/channel.rs

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14136,6 +14136,7 @@ mod tests {
1413614136
use crate::ln::script::ShutdownScript;
1413714137
use crate::prelude::*;
1413814138
use crate::routing::router::{Path, RouteHop};
14139+
#[cfg(ldk_test_vectors)]
1413914140
use crate::sign::{ChannelSigner, EntropySource, InMemorySigner, SignerProvider};
1414014141
#[cfg(splicing)]
1414114142
use crate::sync::Mutex;
@@ -14156,8 +14157,7 @@ mod tests {
1415614157
use bitcoin::hex::FromHex;
1415714158
use bitcoin::locktime::absolute::LockTime;
1415814159
use bitcoin::network::Network;
14159-
use bitcoin::opcodes;
14160-
use bitcoin::script::{Builder, ScriptBuf};
14160+
use bitcoin::script::Builder;
1416114161
use bitcoin::secp256k1::ffi::Signature as FFISignature;
1416214162
use bitcoin::secp256k1::{ecdsa::Signature, Secp256k1};
1416314163
use bitcoin::secp256k1::{PublicKey, SecretKey};
@@ -14166,7 +14166,7 @@ mod tests {
1416614166
use bitcoin::transaction::{Transaction, TxOut, Version};
1416714167
#[cfg(splicing)]
1416814168
use bitcoin::Weight;
14169-
use bitcoin::{WPubkeyHash, WitnessProgram, WitnessVersion};
14169+
use bitcoin::{WitnessProgram, WitnessVersion};
1417014170
use std::cmp;
1417114171

1417214172
#[test]
@@ -14192,17 +14192,19 @@ mod tests {
1419214192
);
1419314193
}
1419414194

14195-
#[allow(dead_code)]
14195+
#[cfg(ldk_test_vectors)]
1419614196
struct Keys {
14197-
signer: InMemorySigner,
14197+
signer: crate::sign::InMemorySigner,
1419814198
}
1419914199

14200+
#[cfg(ldk_test_vectors)]
1420014201
impl EntropySource for Keys {
1420114202
fn get_secure_random_bytes(&self) -> [u8; 32] {
1420214203
[0; 32]
1420314204
}
1420414205
}
1420514206

14207+
#[cfg(ldk_test_vectors)]
1420614208
impl SignerProvider for Keys {
1420714209
type EcdsaSigner = InMemorySigner;
1420814210
#[cfg(taproot)]
@@ -14216,16 +14218,18 @@ mod tests {
1421614218
self.signer.clone()
1421714219
}
1421814220

14219-
fn get_destination_script(&self, _channel_keys_id: [u8; 32]) -> Result<ScriptBuf, ()> {
14221+
fn get_destination_script(
14222+
&self, _channel_keys_id: [u8; 32],
14223+
) -> Result<bitcoin::script::ScriptBuf, ()> {
1422014224
let secp_ctx = Secp256k1::signing_only();
1422114225
let hex = "0fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff";
1422214226
let channel_monitor_claim_key =
1422314227
SecretKey::from_slice(&<Vec<u8>>::from_hex(hex).unwrap()[..]).unwrap();
14224-
let channel_monitor_claim_key_hash = WPubkeyHash::hash(
14228+
let channel_monitor_claim_key_hash = bitcoin::WPubkeyHash::hash(
1422514229
&PublicKey::from_secret_key(&secp_ctx, &channel_monitor_claim_key).serialize(),
1422614230
);
1422714231
Ok(Builder::new()
14228-
.push_opcode(opcodes::all::OP_PUSHBYTES_0)
14232+
.push_opcode(bitcoin::opcodes::all::OP_PUSHBYTES_0)
1422914233
.push_slice(channel_monitor_claim_key_hash)
1423014234
.into_script())
1423114235
}
@@ -15906,7 +15910,7 @@ mod tests {
1590615910
fn funding_input_sats(input_value_sats: u64) -> (TxIn, Transaction, Weight) {
1590715911
use crate::sign::P2WPKH_WITNESS_WEIGHT;
1590815912

15909-
let input_1_prev_out = TxOut { value: Amount::from_sat(input_value_sats), script_pubkey: ScriptBuf::default() };
15913+
let input_1_prev_out = TxOut { value: Amount::from_sat(input_value_sats), script_pubkey: bitcoin::ScriptBuf::default() };
1591015914
let input_1_prev_tx = Transaction {
1591115915
input: vec![], output: vec![input_1_prev_out],
1591215916
version: Version::TWO, lock_time: bitcoin::absolute::LockTime::ZERO,

0 commit comments

Comments
 (0)