Partially address review

- Use `check_closed_event` instead of clearing pending events
- Write new property and read it from TLVs

Author: QPotato

lightning/src/chain/channelmonitor.rs

@@ -955,7 +955,6 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 
 		self.lockdown_from_offchain.write(writer)?;
 		self.holder_tx_signed.write(writer)?;
-		self.allow_automated_broadcast.write(writer)?;
 
 		write_tlv_fields!(writer, {
 			(1, self.funding_spend_confirmed, option),
@@ -3372,7 +3371,6 @@ impl<'a, Signer: Sign, K: KeysInterface<Signer = Signer>> ReadableArgs<&'a K>
 
 		let lockdown_from_offchain = Readable::read(reader)?;
 		let holder_tx_signed = Readable::read(reader)?;
-		let allow_automated_broadcast: bool = Readable::read(reader)?;
 
 		if let Some(prev_commitment_tx) = prev_holder_signed_commitment_tx.as_mut() {
 			let prev_holder_value = onchain_tx_handler.get_prev_holder_commitment_to_self_value();
@@ -3458,7 +3456,7 @@ impl<'a, Signer: Sign, K: KeysInterface<Signer = Signer>> ReadableArgs<&'a K>
 
 			secp_ctx,
 
-			allow_automated_broadcast,
+			allow_automated_broadcast: allow_automated_broadcast.unwrap(),
 		})))
 	}
 }

lightning/src/ln/functional_tests.rs

@@ -4807,8 +4807,7 @@ fn test_deserialize_monitor_force_closed_without_broadcasting_txn() {
 
 	assert!(nodes[0].chain_monitor.watch_channel(deserialized_chanmon.get_funding_txo().0, deserialized_chanmon).is_ok());
 	check_added_monitors!(nodes[0], 1);
-	nodes[0].node.get_and_clear_pending_msg_events();
-	nodes[0].node.get_and_clear_pending_events();
+	check_closed_event!(nodes[0], 1, ClosureReason::HolderForceClosed);
 }
 
 macro_rules! check_spendable_outputs {