fixup! feat: support chain sourcing via REST interface

Author: enigbe

src/builder.rs

@@ -767,8 +767,7 @@ impl ArcedNodeBuilder {
 	/// Configures the [`Node`] instance to connect to a Bitcoin Core node via RPC.
 	///
 	/// This method establishes an RPC connection that enables all essential chain operations including
-	/// transaction broadcasting and chain data synchronization. RPC is the minimum required configuration
-	/// for Bitcoin Core chain interactions and must be set up before any other Bitcoin Core connection options.
+	/// transaction broadcasting and chain data synchronization.
 	///
 	/// ## Parameters:
 	/// * `rpc_host`, `rpc_port`, `rpc_user`, `rpc_password` - Required parameters for the Bitcoin Core RPC
@@ -786,13 +785,13 @@ impl ArcedNodeBuilder {
 
 	/// Configures the [`Node`] instance to synchronize chain data from a Bitcoin Core REST endpoint.
 	///
-	/// This method enables chain data synchronization via Bitcoin Core's REST interface.
-	/// It must be called after [`set_chain_source_bitcoind_rpc`] because REST is used only for chain
-	/// synchronization, while RPC is still required for other essential operations like transaction
-	/// broadcasting.
+	/// This method enables chain data synchronization via Bitcoin Core's REST interface. We pass
+	/// additional RPC configuration to non-REST-supported API calls like transaction broadcasting.
 	///
 	/// ## Parameters:
 	/// * `rest_host`, `rest_port` - Required parameters for the Bitcoin Core REST connection.
+	/// * `rpc_host`, `rpc_port`, `rpc_user`, `rpc_password` - Required parameters for the Bitcoin Core RPC
+	///   connection
 	pub fn set_chain_source_bitcoind_rest(
 		&self, rest_host: String, rest_port: u16, rpc_host: String, rpc_port: u16,
 		rpc_user: String, rpc_password: String,

src/chain/bitcoind.rs

@@ -16,7 +16,9 @@ use lightning_block_sync::http::{HttpEndpoint, JsonResponse};
 use lightning_block_sync::poll::ValidatedBlockHeader;
 use lightning_block_sync::rest::RestClient;
 use lightning_block_sync::rpc::{RpcClient, RpcError};
-use lightning_block_sync::{BlockSource, Cache};
+use lightning_block_sync::{
+	AsyncBlockSourceResult, BlockData, BlockHeaderData, BlockSource, Cache,
+};
 
 use serde::Serialize;
 
@@ -573,7 +575,7 @@ impl BitcoindClient {
 impl BlockSource for BitcoindClient {
 	fn get_header<'a>(
 		&'a self, header_hash: &'a bitcoin::BlockHash, height_hint: Option<u32>,
-	) -> lightning_block_sync::AsyncBlockSourceResult<'a, lightning_block_sync::BlockHeaderData> {
+	) -> AsyncBlockSourceResult<'a, BlockHeaderData> {
 		match self {
 			BitcoindClient::Rpc { rpc_client, .. } => {
 				Box::pin(async move { rpc_client.get_header(header_hash, height_hint).await })
@@ -586,7 +588,7 @@ impl BlockSource for BitcoindClient {
 
 	fn get_block<'a>(
 		&'a self, header_hash: &'a bitcoin::BlockHash,
-	) -> lightning_block_sync::AsyncBlockSourceResult<'a, lightning_block_sync::BlockData> {
+	) -> AsyncBlockSourceResult<'a, BlockData> {
 		match self {
 			BitcoindClient::Rpc { rpc_client, .. } => {
 				Box::pin(async move { rpc_client.get_block(header_hash).await })
@@ -597,9 +599,7 @@ impl BlockSource for BitcoindClient {
 		}
 	}
 
-	fn get_best_block(
-		&self,
-	) -> lightning_block_sync::AsyncBlockSourceResult<(bitcoin::BlockHash, Option<u32>)> {
+	fn get_best_block(&self) -> AsyncBlockSourceResult<(bitcoin::BlockHash, Option<u32>)> {
 		match self {
 			BitcoindClient::Rpc { rpc_client, .. } => {
 				Box::pin(async move { rpc_client.get_best_block().await })