f move method into closure

Author: TheBlueMatt

lightning/src/ln/channelmanager.rs

@@ -2140,39 +2140,42 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 	///
 	/// Note that in some rare cases this may generate a `chain::Watch::update_channel` call.
 	pub fn timer_tick_occurred(&self) {
-		let should_persist = std::cell::RefCell::new(PersistenceGuardOption::SkipPersist);
-		let mut _persistence_guard = PersistenceNotifierGuard::optionally_persist(&self.total_consistency_lock, &self.persistence_notifier, || *should_persist.borrow());
-		if self.process_background_events() { *should_persist.borrow_mut() = PersistenceGuardOption::DoPersist; }
+		PersistenceNotifierGuard::optionally_persist(&self.total_consistency_lock, &self.persistence_notifier, || {
+			let mut should_persist = PersistenceGuardOption::SkipPersist;
+			if self.process_background_events() { should_persist = PersistenceGuardOption::DoPersist; }
 
-		let mut channel_state_lock = self.channel_state.lock().unwrap();
-		let channel_state = &mut *channel_state_lock;
-		for (_, chan) in channel_state.by_id.iter_mut() {
-			match chan.get_update_status() {
-				UpdateStatus::Enabled if !chan.is_live() => chan.set_update_status(UpdateStatus::DisabledStaged),
-				UpdateStatus::Disabled if chan.is_live() => chan.set_update_status(UpdateStatus::EnabledStaged),
-				UpdateStatus::DisabledStaged if chan.is_live() => chan.set_update_status(UpdateStatus::Enabled),
-				UpdateStatus::EnabledStaged if !chan.is_live() => chan.set_update_status(UpdateStatus::Disabled),
-				UpdateStatus::DisabledStaged if !chan.is_live() => {
-					if let Ok(update) = self.get_channel_update(&chan) {
-						channel_state.pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
-							msg: update
-						});
-					}
-					*should_persist.borrow_mut() = PersistenceGuardOption::DoPersist;
-					chan.set_update_status(UpdateStatus::Disabled);
-				},
-				UpdateStatus::EnabledStaged if chan.is_live() => {
-					if let Ok(update) = self.get_channel_update(&chan) {
-						channel_state.pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
-							msg: update
-						});
-					}
-					*should_persist.borrow_mut() = PersistenceGuardOption::DoPersist;
-					chan.set_update_status(UpdateStatus::Enabled);
-				},
-				_ => {},
+			let mut channel_state_lock = self.channel_state.lock().unwrap();
+			let channel_state = &mut *channel_state_lock;
+			for (_, chan) in channel_state.by_id.iter_mut() {
+				match chan.get_update_status() {
+					UpdateStatus::Enabled if !chan.is_live() => chan.set_update_status(UpdateStatus::DisabledStaged),
+					UpdateStatus::Disabled if chan.is_live() => chan.set_update_status(UpdateStatus::EnabledStaged),
+					UpdateStatus::DisabledStaged if chan.is_live() => chan.set_update_status(UpdateStatus::Enabled),
+					UpdateStatus::EnabledStaged if !chan.is_live() => chan.set_update_status(UpdateStatus::Disabled),
+					UpdateStatus::DisabledStaged if !chan.is_live() => {
+						if let Ok(update) = self.get_channel_update(&chan) {
+							channel_state.pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
+								msg: update
+							});
+						}
+						should_persist = PersistenceGuardOption::DoPersist;
+						chan.set_update_status(UpdateStatus::Disabled);
+					},
+					UpdateStatus::EnabledStaged if chan.is_live() => {
+						if let Ok(update) = self.get_channel_update(&chan) {
+							channel_state.pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate {
+								msg: update
+							});
+						}
+						should_persist = PersistenceGuardOption::DoPersist;
+						chan.set_update_status(UpdateStatus::Enabled);
+					},
+					_ => {},
+				}
 			}
-		}
+
+			should_persist
+		});
 	}
 
 	/// Indicates that the preimage for payment_hash is unknown or the received amount is incorrect