test: channel full cycle with chain source in REST sync

Additionally adds the BlockSource implementation for BitcoindSyncClient

Author: enigbe

docker-compose.yml

@@ -13,10 +13,11 @@ services:
         "-rpcbind=0.0.0.0",
         "-rpcuser=user",
         "-rpcpassword=pass",
-        "-fallbackfee=0.00001"
+        "-fallbackfee=0.00001",
+        "-rest"
       ]
     ports:
-      - "18443:18443"  # Regtest RPC port
+      - "18443:18443"  # Regtest REST and RPC port
       - "18444:18444"  # Regtest P2P port
     networks:
       - bitcoin-electrs

src/chain/mod.rs

@@ -203,7 +203,9 @@ impl BlockSource for BitcoindSyncClient {
 			BitcoindSyncClient::Rpc(rpc_client) => {
 				Box::pin(async move { rpc_client.get_header(header_hash, height_hint).await })
 			},
-			BitcoindSyncClient::Rest(_rest_client) => todo!(),
+			BitcoindSyncClient::Rest(rest_client) => {
+				Box::pin(async move { rest_client.get_header(header_hash, height_hint).await })
+			},
 		}
 	}
 
@@ -214,7 +216,9 @@ impl BlockSource for BitcoindSyncClient {
 			BitcoindSyncClient::Rpc(rpc_client) => {
 				Box::pin(async move { rpc_client.get_block(header_hash).await })
 			},
-			BitcoindSyncClient::Rest(_rest_client) => todo!(),
+			BitcoindSyncClient::Rest(rest_client) => {
+				Box::pin(async move { rest_client.get_block(header_hash).await })
+			},
 		}
 	}
 
@@ -225,7 +229,9 @@ impl BlockSource for BitcoindSyncClient {
 			BitcoindSyncClient::Rpc(rpc_client) => {
 				Box::pin(async move { rpc_client.get_best_block().await })
 			},
-			BitcoindSyncClient::Rest(_rest_client) => todo!(),
+			BitcoindSyncClient::Rest(rest_client) => {
+				Box::pin(async move { rest_client.get_best_block().await })
+			},
 		}
 	}
 }
@@ -349,7 +355,9 @@ impl ChainSource {
 				endpoint(host, port),
 			))),
 			BitcoindSyncClientConfig::Rest { rest_host, rest_port } => {
-				Arc::new(BitcoindSyncClient::Rest(RestClient::new(endpoint(rest_host, rest_port))))
+				Arc::new(BitcoindSyncClient::Rest(RestClient::new(
+					endpoint(rest_host, rest_port).with_path("/rest".to_string()),
+				)))
 			},
 		};
 

tests/common/mod.rs

@@ -12,7 +12,7 @@ pub(crate) mod logging;
 
 use logging::TestLogWriter;
 
-use ldk_node::config::{Config, ElectrumSyncConfig, EsploraSyncConfig};
+use ldk_node::config::{BitcoindSyncClientConfig, Config, ElectrumSyncConfig, EsploraSyncConfig};
 use ldk_node::io::sqlite_store::SqliteStore;
 use ldk_node::payment::{PaymentDirection, PaymentKind, PaymentStatus};
 use ldk_node::{
@@ -174,6 +174,7 @@ pub(crate) fn setup_bitcoind_and_electrsd() -> (BitcoinD, ElectrsD) {
 		);
 	let mut bitcoind_conf = corepc_node::Conf::default();
 	bitcoind_conf.network = "regtest";
+	bitcoind_conf.args.push("-rest");
 	let bitcoind = BitcoinD::with_conf(bitcoind_exe, &bitcoind_conf).unwrap();
 
 	let electrs_exe = env::var("ELECTRS_EXE")
@@ -256,7 +257,8 @@ type TestNode = Node;
 pub(crate) enum TestChainSource<'a> {
 	Esplora(&'a ElectrsD),
 	Electrum(&'a ElectrsD),
-	BitcoindRpc(&'a BitcoinD),
+	BitcoindRpcSync(&'a BitcoinD),
+	BitcoindRestSync(&'a BitcoinD),
 }
 
 #[derive(Clone, Default)]
@@ -317,14 +319,30 @@ pub(crate) fn setup_node(
 			let sync_config = ElectrumSyncConfig { background_sync_config: None };
 			builder.set_chain_source_electrum(electrum_url.clone(), Some(sync_config));
 		},
-		TestChainSource::BitcoindRpc(bitcoind) => {
+		TestChainSource::BitcoindRpcSync(bitcoind) => {
 			let rpc_host = bitcoind.params.rpc_socket.ip().to_string();
 			let rpc_port = bitcoind.params.rpc_socket.port();
 			let values = bitcoind.params.get_cookie_values().unwrap().unwrap();
 			let rpc_user = values.user;
 			let rpc_password = values.password;
 			builder.set_chain_source_bitcoind(rpc_host, rpc_port, rpc_user, rpc_password, None);
 		},
+		TestChainSource::BitcoindRestSync(bitcoind) => {
+			let rpc_host = bitcoind.params.rpc_socket.ip().to_string();
+			let rpc_port = bitcoind.params.rpc_socket.port();
+			let values = bitcoind.params.get_cookie_values().unwrap().unwrap();
+			let rpc_user = values.user;
+			let rpc_password = values.password;
+			let sync_client_config =
+				BitcoindSyncClientConfig::Rest { rest_host: rpc_host.clone(), rest_port: rpc_port };
+			builder.set_chain_source_bitcoind(
+				rpc_host,
+				rpc_port,
+				rpc_user,
+				rpc_password,
+				Some(sync_client_config),
+			);
+		},
 	}
 
 	match &config.log_writer {

tests/integration_tests_rust.rs

@@ -54,9 +54,17 @@ fn channel_full_cycle_electrum() {
 }
 
 #[test]
-fn channel_full_cycle_bitcoind() {
+fn channel_full_cycle_bitcoind_rpc_sync() {
 	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
-	let chain_source = TestChainSource::BitcoindRpc(&bitcoind);
+	let chain_source = TestChainSource::BitcoindRpcSync(&bitcoind);
+	let (node_a, node_b) = setup_two_nodes(&chain_source, false, true, false);
+	do_channel_full_cycle(node_a, node_b, &bitcoind.client, &electrsd.client, false, true, false);
+}
+
+#[test]
+fn channel_full_cycle_bitcoind_rest_sync() {
+	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
+	let chain_source = TestChainSource::BitcoindRestSync(&bitcoind);
 	let (node_a, node_b) = setup_two_nodes(&chain_source, false, true, false);
 	do_channel_full_cycle(node_a, node_b, &bitcoind.client, &electrsd.client, false, true, false);
 }