From: Max Fang <protonmail.com@maxfa.ng>
Date: Tue, 18 Oct 2022 02:29:52 +0000 (-0700)
Subject: impl `BlockSource` on `T`, instead of `&T`
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=7a95c69c4b465f555c01e582cb1f9bde2de2c374;p=ldk-sample

impl `BlockSource` on `T`, instead of `&T`
---

diff --git a/src/bitcoind_client.rs b/src/bitcoind_client.rs
index 70928a1..93321dd 100644
--- a/src/bitcoind_client.rs
+++ b/src/bitcoind_client.rs
@@ -33,7 +33,7 @@ pub enum Target {
 	HighPriority,
 }
 
-impl BlockSource for &BitcoindClient {
+impl BlockSource for BitcoindClient {
 	fn get_header<'a>(
 		&'a self, header_hash: &'a BlockHash, height_hint: Option<u32>,
 	) -> AsyncBlockSourceResult<'a, BlockHeaderData> {
diff --git a/src/main.rs b/src/main.rs
index 9c85b70..6229967 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -48,7 +48,6 @@ use std::fs;
 use std::fs::File;
 use std::io;
 use std::io::Write;
-use std::ops::Deref;
 use std::path::Path;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::{Arc, Mutex};
@@ -527,7 +526,7 @@ async fn start_ldk() {
 		}
 		chain_tip = Some(
 			init::synchronize_listeners(
-				&mut bitcoind_client.deref(),
+				bitcoind_client.as_ref(),
 				args.network,
 				&mut cache,
 				chain_listeners,
@@ -605,16 +604,14 @@ async fn start_ldk() {
 
 	// Step 14: Connect and Disconnect Blocks
 	if chain_tip.is_none() {
-		chain_tip =
-			Some(init::validate_best_block_header(&mut bitcoind_client.deref()).await.unwrap());
+		chain_tip = Some(init::validate_best_block_header(bitcoind_client.as_ref()).await.unwrap());
 	}
 	let channel_manager_listener = channel_manager.clone();
 	let chain_monitor_listener = chain_monitor.clone();
 	let bitcoind_block_source = bitcoind_client.clone();
 	let network = args.network;
 	tokio::spawn(async move {
-		let mut derefed = bitcoind_block_source.deref();
-		let chain_poller = poll::ChainPoller::new(&mut derefed, network);
+		let chain_poller = poll::ChainPoller::new(bitcoind_block_source.as_ref(), network);
 		let chain_listener = (chain_monitor_listener, channel_manager_listener);
 		let mut spv_client =
 			SpvClient::new(chain_tip.unwrap(), chain_poller, &mut cache, &chain_listener);