IGNORE: changes so it builds

Author: martinsaposnic

src/chain/bitcoind.rs

@@ -19,6 +19,7 @@ use crate::logger::{log_bytes, log_error, log_info, log_trace, LdkLogger, Logger
 use crate::types::{ChainMonitor, ChannelManager, DynStore, Sweeper, Wallet};
 use crate::{Error, NodeMetrics};
 
+use bitcoin::block::Header;
 use lightning::chain::chaininterface::ConfirmationTarget as LdkConfirmationTarget;
 use lightning::chain::Listen;
 use lightning::util::ser::Writeable;
@@ -1381,11 +1382,11 @@ impl Listen for ChainListener {
 		self.output_sweeper.block_connected(block, height);
 	}
 
-	fn blocks_disconnected(&self, fork_point_block: lightning::chain::BestBlock) {
-		self.onchain_wallet.blocks_disconnected(fork_point_block);
-		self.channel_manager.blocks_disconnected(fork_point_block);
-		self.chain_monitor.blocks_disconnected(fork_point_block);
-		self.output_sweeper.blocks_disconnected(fork_point_block);
+	fn block_disconnected(&self, header: &Header, height: u32) {
+		self.onchain_wallet.block_disconnected(header, height);
+		self.channel_manager.block_disconnected(header, height);
+		self.chain_monitor.block_disconnected(header, height);
+		self.output_sweeper.block_disconnected(header, height);
 	}
 }
 

src/wallet/mod.rs

@@ -5,6 +5,7 @@
 // http://opensource.org/licenses/MIT>, at your option. You may not use this file except in
 // accordance with one or both of these licenses.
 
+use bitcoin::block::Header;
 use persist::KVStoreWalletPersister;
 
 use crate::config::Config;
@@ -748,7 +749,7 @@ impl Listen for Wallet {
 		};
 	}
 
-	fn blocks_disconnected(&self, _fork_point_block: BestBlock) {
+	fn block_disconnected(&self, _header: &Header, _height: u32) {
 		// This is a no-op as we don't have to tell BDK about disconnections. According to the BDK
 		// team, it's sufficient in case of a reorg to always connect blocks starting from the last
 		// point of disagreement.