Skip to content

Commit 0de791a

Browse files
committed
Prevent other tests from failing
1 parent b529320 commit 0de791a

File tree

7 files changed

+64
-9
lines changed

7 files changed

+64
-9
lines changed

bindings/kotlin/ldk-node-jvm/lib/src/test/kotlin/org/lightningdevkit/ldknode/LibraryTest.kt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,13 +176,29 @@ class LibraryTest {
176176
config1.storageDirPath = tmpDir1
177177
config1.listeningAddresses = listOf(listenAddress1)
178178
config1.network = Network.REGTEST
179+
if (System.getenv("HRN_TESTS") == null) {
180+
config1.hrnConfig = HumanReadableNamesConfig(
181+
resolutionConfig = HrnResolverConfig.Dns(
182+
dnsServerAddress = "8.8.8.8:53",
183+
enableHrnResolutionService = false
184+
)
185+
)
186+
}
179187

180188
println("Config 1: $config1")
181189

182190
val config2 = defaultConfig()
183191
config2.storageDirPath = tmpDir2
184192
config2.listeningAddresses = listOf(listenAddress2)
185193
config2.network = Network.REGTEST
194+
if (System.getenv("HRN_TESTS") == null) {
195+
config2.hrnConfig = HumanReadableNamesConfig(
196+
resolutionConfig = HrnResolverConfig.Dns(
197+
dnsServerAddress = "8.8.8.8:53",
198+
enableHrnResolutionService = false
199+
)
200+
)
201+
}
186202
println("Config 2: $config2")
187203

188204
val builder1 = Builder.fromConfig(config1)

bindings/python/src/ldk_node/test_ldk_node.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@ def setup_node(tmp_dir, esplora_endpoint, listening_addresses):
100100
mnemonic = generate_entropy_mnemonic(None)
101101
node_entropy = NodeEntropy.from_bip39_mnemonic(mnemonic, None)
102102
config = default_config()
103+
if os.getenv("HRN_TESTS") is None:
104+
config.hrn_config.resolution_config = HrnResolverConfig.DNS("8.8.8.8:53", False)
103105
builder = Builder.from_config(config)
104106
builder.set_storage_dir_path(tmp_dir)
105107
builder.set_chain_source_esplora(esplora_endpoint, None)

src/lib.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1940,13 +1940,17 @@ impl Node {
19401940
/// For example, you could retrieve all stored outbound payments as follows:
19411941
/// ```
19421942
/// # use ldk_node::Builder;
1943-
/// # use ldk_node::config::Config;
1943+
/// # use ldk_node::config::{Config, HRNResolverConfig};
19441944
/// # use ldk_node::payment::PaymentDirection;
19451945
/// # use ldk_node::bitcoin::Network;
19461946
/// # use ldk_node::entropy::{generate_entropy_mnemonic, NodeEntropy};
19471947
/// # use rand::distr::Alphanumeric;
19481948
/// # use rand::{rng, Rng};
19491949
/// # let mut config = Config::default();
1950+
/// # config.hrn_config.resolution_config = HRNResolverConfig::Dns {
1951+
/// # dns_server_address: "8.8.8.8:53".to_string(),
1952+
/// # enable_hrn_resolution_service: false,
1953+
/// # };
19501954
/// # config.network = Network::Regtest;
19511955
/// # let mut temp_path = std::env::temp_dir();
19521956
/// # let rand_dir: String = (0..7).map(|_| rng().sample(Alphanumeric) as char).collect();

tests/common/mod.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,13 @@ pub(crate) fn random_node_alias() -> Option<NodeAlias> {
294294
pub(crate) fn random_config(anchor_channels: bool) -> TestConfig {
295295
let mut node_config = Config::default();
296296

297+
if !cfg!(hrn_tests) {
298+
node_config.hrn_config.resolution_config = HRNResolverConfig::Dns {
299+
dns_server_address: "8.8.8.8:53".to_string(),
300+
enable_hrn_resolution_service: false,
301+
};
302+
}
303+
297304
if !anchor_channels {
298305
node_config.anchor_channels_config = None;
299306
}

tests/integration_tests_rust.rs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ use common::{
2828
};
2929
use electrsd::corepc_node::Node as BitcoinD;
3030
use electrsd::ElectrsD;
31-
use ldk_node::config::{AsyncPaymentsRole, EsploraSyncConfig};
31+
use ldk_node::config::{AsyncPaymentsRole, Config, EsploraSyncConfig, HRNResolverConfig};
3232
use ldk_node::entropy::NodeEntropy;
3333
use ldk_node::liquidity::LSPS2ServiceConfig;
3434
use ldk_node::payment::{
@@ -2520,11 +2520,17 @@ async fn do_persistence_backwards_compatibility(version: OldLdkVersion) {
25202520
},
25212521
};
25222522

2523+
let mut config = Config::default();
2524+
config.hrn_config.resolution_config = HRNResolverConfig::Dns {
2525+
dns_server_address: "8.8.8.8:53".to_string(),
2526+
enable_hrn_resolution_service: false,
2527+
};
2528+
25232529
// Now ensure we can still reinit from the same backend.
25242530
#[cfg(feature = "uniffi")]
2525-
let builder_new = Builder::new();
2531+
let builder_new = Builder::from_config(config);
25262532
#[cfg(not(feature = "uniffi"))]
2527-
let mut builder_new = Builder::new();
2533+
let mut builder_new = Builder::from_config(config);
25282534
builder_new.set_network(bitcoin::Network::Regtest);
25292535
builder_new.set_storage_dir_path(storage_path);
25302536
builder_new.set_chain_source_esplora(esplora_url, None);

tests/integration_tests_vss.rs

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@ mod common;
1111

1212
use std::collections::HashMap;
1313

14+
use ldk_node::config::{Config, HRNResolverConfig};
1415
use ldk_node::entropy::NodeEntropy;
1516
use ldk_node::Builder;
17+
use ldk_node_070::lightning::util::config;
1618
use rand::RngCore;
1719

1820
#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
@@ -73,7 +75,12 @@ async fn vss_node_restart() {
7375

7476
// Setup initial node and fund it.
7577
let (expected_balance_sats, expected_node_id) = {
76-
let mut builder = Builder::new();
78+
let mut config = Config::default();
79+
config.hrn_config.resolution_config = HRNResolverConfig::Dns {
80+
dns_server_address: "8.8.8.8:53".to_string(),
81+
enable_hrn_resolution_service: false,
82+
};
83+
let mut builder = Builder::from_config(config);
7784
builder.set_network(bitcoin::Network::Regtest);
7885
builder.set_storage_dir_path(storage_path.clone());
7986
builder.set_chain_source_esplora(esplora_url.clone(), None);
@@ -105,8 +112,14 @@ async fn vss_node_restart() {
105112
(balance, node_id)
106113
};
107114

115+
let mut config = Config::default();
116+
config.hrn_config.resolution_config = HRNResolverConfig::Dns {
117+
dns_server_address: "8.8.8.8:53".to_string(),
118+
enable_hrn_resolution_service: false,
119+
};
120+
108121
// Verify node can be restarted from VSS backend.
109-
let mut builder = Builder::new();
122+
let mut builder = Builder::from_config(config);
110123
builder.set_network(bitcoin::Network::Regtest);
111124
builder.set_storage_dir_path(storage_path);
112125
builder.set_chain_source_esplora(esplora_url, None);

tests/integration_tests_vss_no_auth.rs

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ mod common;
1111

1212
use std::collections::HashMap;
1313

14-
use ldk_node::entropy::NodeEntropy;
15-
use ldk_node::Builder;
14+
use ldk_node::config::{Config, HRNResolverConfig};
15+
use ldk_node::{entropy::NodeEntropy, Builder};
16+
use ldk_node_070::lightning::util::config;
1617
use rand::{rng, Rng, RngCore};
1718

1819
#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
@@ -69,7 +70,13 @@ async fn vss_v0_schema_backwards_compatibility() {
6970
};
7071

7172
// Now ensure we can still reinit from the same backend.
72-
let mut builder_new = Builder::new();
73+
let mut config = Config::default();
74+
config.hrn_config.resolution_config = HRNResolverConfig::Dns {
75+
dns_server_address: "8.8.8.8:53".to_string(),
76+
enable_hrn_resolution_service: false,
77+
};
78+
let mut builder_new = Builder::from_config(config);
79+
7380
builder_new.set_network(bitcoin::Network::Regtest);
7481
builder_new.set_storage_dir_path(storage_path);
7582
builder_new.set_chain_source_esplora(esplora_url, None);

0 commit comments

Comments
 (0)