Account for chain::Watch::watch_channel returning a Result

Author: tnull

bindings/ldk_node.udl

@@ -129,6 +129,7 @@ enum BuildError {
 	"InvalidSeedBytes",
 	"InvalidSeedFile",
 	"InvalidSystemTime",
+	"InvalidChannelMonitor",
 	"ReadFailed",
 	"WriteFailed",
 	"StoragePathAccessFailed",

src/builder.rs

@@ -86,6 +86,8 @@ pub enum BuildError {
 	InvalidSeedFile,
 	/// The current system time is invalid, clocks might have gone backwards.
 	InvalidSystemTime,
+	/// The a read channel monitor is invalid.
+	InvalidChannelMonitor,
 	/// We failed to read data from the [`KVStore`].
 	ReadFailed,
 	/// We failed to write data to the [`KVStore`].
@@ -108,6 +110,9 @@ impl fmt::Display for BuildError {
 			Self::InvalidSystemTime => {
 				write!(f, "System time is invalid. Clocks might have gone back in time.")
 			}
+			Self::InvalidChannelMonitor => {
+				write!(f, "Failed to watch a deserialzed ChannelMonitor")
+			}
 			Self::ReadFailed => write!(f, "Failed to read from store."),
 			Self::WriteFailed => write!(f, "Failed to write to store."),
 			Self::StoragePathAccessFailed => write!(f, "Failed to access the given storage path."),
@@ -608,7 +613,10 @@ fn build_with_store_internal<K: KVStore + Sync + Send + 'static>(
 	// Give ChannelMonitors to ChainMonitor
 	for (_blockhash, channel_monitor) in channel_monitors.into_iter() {
 		let funding_outpoint = channel_monitor.get_funding_txo().0;
-		chain_monitor.watch_channel(funding_outpoint, channel_monitor);
+		chain_monitor.watch_channel(funding_outpoint, channel_monitor).map_err(|e| {
+			log_error!(logger, "Failed to watch channel monitor: {:?}", e);
+			BuildError::InvalidChannelMonitor
+		})?;
 	}
 
 	// Initialize the PeerManager