Skip to content

Fix NodeEntropy type mismatch in UniFFI builds #750

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tnull merged 2 commits into from
Jan 13, 2026
Merged

Fix NodeEntropy type mismatch in UniFFI builds #750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
295b2ce
Handle conditional NodeEntropy types for UniFFI
chuksys Jan 11, 2026
168be27
fixup! Handle conditional NodeEntropy types for UniFFI
chuksys Jan 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions tests/common/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1288,6 +1288,18 @@ pub(crate) async fn do_channel_full_cycle<E: ElectrumApi>(
println!("\nB stopped");
}

// Helper to unify entropy creation
Copy link
Collaborator

@tnull tnull Jan 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, actually, if need this let's rather just avoid the issue altogether by using what we do elsewhere (i.e., in TestConfig::default):

		let mnemonic = generate_entropy_mnemonic(None);
		let node_entropy = NodeEntropy::from_bip39_mnemonic(mnemonic, None);

rather than seed bytes in fn persistence_backwards_compatibility.

pub(crate) fn create_test_entropy(seed: [u8; 64]) -> NodeEntropy {
#[cfg(feature = "uniffi")]
{
NodeEntropy::from_seed_bytes(seed.to_vec()).unwrap()
}
#[cfg(not(feature = "uniffi"))]
{
NodeEntropy::from_seed_bytes(seed)
}
}

// A `KVStore` impl for testing purposes that wraps all our `KVStore`s and asserts their synchronicity.
#[derive(Clone)]
pub(crate) struct TestSyncStore {
Expand Down
10 changes: 5 additions & 5 deletions tests/integration_tests_rust.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ use bitcoin::hashes::Hash;
use bitcoin::{Address, Amount, ScriptBuf};
use common::logging::{init_log_logger, validate_log_entry, MultiNodeLogger, TestLogWriter};
use common::{
bump_fee_and_broadcast, distribute_funds_unconfirmed, do_channel_full_cycle,
expect_channel_pending_event, expect_channel_ready_event, expect_event,
bump_fee_and_broadcast, create_test_entropy, distribute_funds_unconfirmed,
do_channel_full_cycle, expect_channel_pending_event, expect_channel_ready_event, expect_event,
expect_payment_claimable_event, expect_payment_received_event, expect_payment_successful_event,
expect_splice_pending_event, generate_blocks_and_wait, open_channel, open_channel_push_amt,
premine_and_distribute_funds, premine_blocks, prepare_rbf, random_config,
Expand All @@ -27,7 +27,6 @@ use common::{
TestSyncStore,
};
use ldk_node::config::{AsyncPaymentsRole, EsploraSyncConfig};
use ldk_node::entropy::NodeEntropy;
use ldk_node::liquidity::LSPS2ServiceConfig;
use ldk_node::payment::{
ConfirmationStatus, PaymentDetails, PaymentDirection, PaymentKind, PaymentStatus,
Expand Down Expand Up @@ -2445,7 +2444,8 @@ async fn persistence_backwards_compatibility() {

let storage_path = common::random_storage_path().to_str().unwrap().to_owned();
let seed_bytes = [42u8; 64];
let node_entropy = NodeEntropy::from_seed_bytes(seed_bytes);

let node_entropy = create_test_entropy(seed_bytes);

// Setup a v0.6.2 `Node`
let (old_balance, old_node_id) = {
Expand Down Expand Up @@ -2482,7 +2482,7 @@ async fn persistence_backwards_compatibility() {
builder_new.set_storage_dir_path(storage_path);
builder_new.set_chain_source_esplora(esplora_url, None);

let node_new = builder_new.build(node_entropy).unwrap();
let node_new = builder_new.build(node_entropy.into()).unwrap();

node_new.start().unwrap();
node_new.sync_wallets().unwrap();
Expand Down
Loading