fixup! Integrate TierStore into NodeBuilder

- Remove set_backup_storage_dir_path and set_ephemeral_store from
ArcedNodeBuilder — these tiered-storage configuration methods belong
to the FFI bindings PR (#871) and should not be introduced here.

- Gate builder_configures_sqlite_backup_store and
sqlite_backup_rejects_primary_storage_path tests behind
not exposed through the arced wrapper.

- Revert the setup_node_with_builder helper added to test utils:
the backup-related test now configures its builder inline, which also
removes the &mut Builder requirement that forced setup_builder! to emit
mut unconditionally. It's now correctly immutable when uniffi is enabled.

Author: enigbe

src/builder.rs

@@ -1251,38 +1251,6 @@ impl ArcedNodeBuilder {
 		self.inner.write().expect("lock").set_wallet_recovery_mode();
 	}
 
-	/// Configures a local SQLite backup store for disaster recovery.
-	///
-	/// When building with tiered storage, a SQLite store will be created at the
-	/// given directory path using [`SQLITE_BACKUP_DB_FILE_NAME`] as its database
-	/// file name. It receives a second durable copy of data written to the
-	/// primary store.
-	///
-	/// Writes and removals for primary-backed data only succeed once both the
-	/// primary and backup SQLite stores complete successfully.
-	///
-	/// The configured path must point to a distinct local directory from the
-	/// primary storage path. If the backup path equals the primary storage path,
-	/// building will fail with [`BuildError::BackupStorePathConflict`].
-	///
-	/// If not set, durable data will be stored only in the primary store.
-	///
-	/// [`SQLITE_BACKUP_DB_FILE_NAME`]: crate::io::sqlite_store::SQLITE_BACKUP_DB_FILE_NAME
-	pub fn set_backup_storage_dir_path(&self, backup_storage_dir_path: String) {
-		self.inner.write().expect("lock").set_backup_storage_dir_path(backup_storage_dir_path);
-	}
-
-	/// Configures the ephemeral store for non-critical, frequently-accessed data.
-	///
-	/// When building with tiered storage, this store is used for ephemeral data like
-	/// the network graph and scorer data to reduce latency for reads. Data stored here
-	/// can be rebuilt if lost.
-	///
-	/// If not set, non-critical data will be stored in the primary store.
-	pub fn set_ephemeral_store(&self, ephemeral_store: Arc<DynStore>) {
-		self.inner.write().expect("lock").set_ephemeral_store(ephemeral_store);
-	}
-
 	/// Builds a [`Node`] instance with a [`SqliteStore`] backend and according to the options
 	/// previously configured.
 	pub fn build(&self, node_entropy: Arc<NodeEntropy>) -> Result<Arc<Node>, BuildError> {

tests/common/mod.rs

@@ -461,7 +461,9 @@ impl Default for TestConfig {
 
 macro_rules! setup_builder {
 	($builder:ident, $config:expr) => {
-		#[allow(unused_mut)]
+		#[cfg(feature = "uniffi")]
+		let $builder = Builder::from_config($config.clone());
+		#[cfg(not(feature = "uniffi"))]
 		let mut $builder = Builder::from_config($config.clone());
 	};
 }
@@ -529,15 +531,6 @@ pub(crate) fn setup_two_nodes_with_store(
 }
 
 pub(crate) fn setup_node(chain_source: &TestChainSource, config: TestConfig) -> TestNode {
-	setup_node_with_builder(chain_source, config, |_| {})
-}
-
-pub(crate) fn setup_node_with_builder<F>(
-	chain_source: &TestChainSource, config: TestConfig, configure_builder: F,
-) -> TestNode
-where
-	F: FnOnce(&mut Builder),
-{
 	setup_builder!(builder, config.node_config);
 
 	match chain_source {
@@ -598,8 +591,6 @@ where
 		builder.set_wallet_recovery_mode();
 	}
 
-	configure_builder(&mut builder);
-
 	let node = match config.store_type {
 		TestStoreType::TestSyncStore => {
 			let kv_store = TestSyncStore::new(config.node_config.storage_dir_path.into());

tests/integration_tests_rust.rs

@@ -30,6 +30,7 @@ use electrsd::corepc_node::Node as BitcoinD;
 use electrsd::ElectrsD;
 use ldk_node::config::{AsyncPaymentsRole, EsploraSyncConfig};
 use ldk_node::entropy::NodeEntropy;
+#[cfg(not(feature = "uniffi"))]
 use ldk_node::io::sqlite_store::SqliteStore;
 use ldk_node::liquidity::LSPS2ServiceConfig;
 use ldk_node::payment::{
@@ -40,6 +41,7 @@ use ldk_node::{Builder, Event, NodeError};
 use lightning::ln::channelmanager::PaymentId;
 use lightning::routing::gossip::{NodeAlias, NodeId};
 use lightning::routing::router::RouteParametersConfig;
+#[cfg(not(feature = "uniffi"))]
 use lightning::util::persist::KVStore;
 use lightning_invoice::{Bolt11InvoiceDescription, Description};
 use lightning_types::payment::{PaymentHash, PaymentPreimage};
@@ -3048,6 +3050,7 @@ async fn splice_in_with_all_balance() {
 	node_b.stop().unwrap();
 }
 
+#[cfg(not(feature = "uniffi"))]
 #[tokio::test(flavor = "multi_thread", worker_threads = 1)]
 async fn lsps2_multi_lsp_picks_cheapest() {
 	do_lsps2_multi_lsp_picks_cheapest(false).await;
@@ -3152,9 +3155,20 @@ async fn builder_configures_sqlite_backup_store() {
 	config_a.store_type = TestStoreType::Sqlite;
 	let primary_dir = config_a.node_config.storage_dir_path.clone();
 	let backup_dir = common::random_storage_path();
-	let node_a = common::setup_node_with_builder(&chain_source, config_a.clone(), |builder| {
-		builder.set_backup_storage_dir_path(backup_dir.to_str().unwrap().to_owned());
-	});
+
+	// Build node_a with backup storage configured
+	setup_builder!(builder_a, config_a.node_config.clone());
+	builder_a.set_chain_source_esplora(
+		format!("http://{}", electrsd.esplora_url.as_ref().unwrap()),
+		None,
+	);
+	builder_a.set_filesystem_logger(None, None);
+	builder_a.set_backup_storage_dir_path(backup_dir.to_str().unwrap().to_owned());
+
+	let node_a = builder_a.build(config_a.node_entropy.into()).unwrap();
+	node_a.start().unwrap();
+	assert!(node_a.status().is_running);
+	assert!(node_a.status().latest_fee_rate_cache_update_timestamp.is_some());
 
 	let config_b = random_config(true);
 	let node_b = setup_node(&chain_source, config_b);
@@ -3200,14 +3214,15 @@ async fn builder_configures_sqlite_backup_store() {
 	}
 }
 
+#[cfg(not(feature = "uniffi"))]
 #[test]
 fn sqlite_backup_rejects_primary_storage_path() {
 	let mut config = random_config(false);
 	config.store_type = TestStoreType::Sqlite;
 
 	let primary_dir = config.node_config.storage_dir_path.clone();
 
-	setup_builder!(builder, config.node_config);
+	setup_builder!(builder, config.node_config.clone());
 	builder.set_backup_storage_dir_path(primary_dir);
 
 	let res = builder.build(config.node_entropy.into());