Make route_handler and chan_handler Option<>al in MessageHandler

We currently "support" not having a router or channel in memory by
forcing users to implement the handler trait and ignore every
message. Instead, we can just do that ourselves to simplify the API.

Author: TheBlueMatt

lightning-c-bindings/include/lightning.h

@@ -5246,6 +5246,8 @@ struct LDKCResult_HTLCUpdateDecodeErrorZ HTLCUpdate_read(struct LDKu8slice ser);
 
 void ChannelMonitor_free(struct LDKChannelMonitor this_ptr);
 
+struct LDKChannelMonitor ChannelMonitor_clone(const struct LDKChannelMonitor *NONNULL_PTR orig);
+
 struct LDKCVec_u8Z ChannelMonitor_write(const struct LDKChannelMonitor *NONNULL_PTR obj);
 
 /**

lightning-c-bindings/src/c_types/derived.rs

@@ -3540,6 +3540,14 @@ impl Drop for CVec_ChannelMonitorZ {
 		unsafe { Box::from_raw(std::slice::from_raw_parts_mut(self.data, self.datalen)) };
 	}
 }
+impl Clone for CVec_ChannelMonitorZ {
+	fn clone(&self) -> Self {
+		let mut res = Vec::new();
+		if self.datalen == 0 { return Self::from(res); }
+		res.extend_from_slice(unsafe { std::slice::from_raw_parts_mut(self.data, self.datalen) });
+		Self::from(res)
+	}
+}
 #[repr(C)]
 pub struct C2Tuple_BlockHashChannelManagerZ {
 	pub a: crate::c_types::ThirtyTwoBytes,

lightning-c-bindings/src/chain/channelmonitor.rs

@@ -493,6 +493,24 @@ impl ChannelMonitor {
 		ret
 	}
 }
+impl Clone for ChannelMonitor {
+	fn clone(&self) -> Self {
+		Self {
+			inner: if self.inner.is_null() { std::ptr::null_mut() } else {
+				Box::into_raw(Box::new(unsafe { &*self.inner }.clone())) },
+			is_owned: true,
+		}
+	}
+}
+#[allow(unused)]
+/// Used only if an object of this type is returned as a trait impl by a method
+pub(crate) extern "C" fn ChannelMonitor_clone_void(this_ptr: *const c_void) -> *mut c_void {
+	Box::into_raw(Box::new(unsafe { (*(this_ptr as *mut nativeChannelMonitor)).clone() })) as *mut c_void
+}
+#[no_mangle]
+pub extern "C" fn ChannelMonitor_clone(orig: &ChannelMonitor) -> ChannelMonitor {
+	orig.clone()
+}
 #[no_mangle]
 pub extern "C" fn ChannelMonitor_write(obj: &ChannelMonitor) -> crate::c_types::derived::CVec_u8Z {
 	crate::c_types::serialize_obj(unsafe { &*unsafe { &*obj }.inner })

lightning-net-tokio/src/lib.rs

@@ -600,8 +600,8 @@ mod tests {
 			msg_events: Mutex::new(Vec::new()),
 		});
 		let a_manager = Arc::new(PeerManager::new(MessageHandler {
-			chan_handler: Arc::clone(&a_handler),
-			route_handler: Arc::clone(&a_handler),
+			chan_handler: Some(Arc::clone(&a_handler)),
+			route_handler: Some(Arc::clone(&a_handler)),
 		}, a_key.clone(), &[1; 32], Arc::new(TestLogger())));
 
 		let (b_connected_sender, mut b_connected) = mpsc::channel(1);
@@ -614,8 +614,8 @@ mod tests {
 			msg_events: Mutex::new(Vec::new()),
 		});
 		let b_manager = Arc::new(PeerManager::new(MessageHandler {
-			chan_handler: Arc::clone(&b_handler),
-			route_handler: Arc::clone(&b_handler),
+			chan_handler: Some(Arc::clone(&b_handler)),
+			route_handler: Some(Arc::clone(&b_handler)),
 		}, b_key.clone(), &[2; 32], Arc::new(TestLogger())));
 
 		// We bind on localhost, hoping the environment is properly configured with a local