Merge pull request #790 from tnull/2026-02-update-by-value

Take `StorableObjectUpdate` by value in `StorableObject::update`

Author: tnull

src/data_store.rs

@@ -21,7 +21,7 @@ pub(crate) trait StorableObject: Clone + Readable + Writeable {
 	type Update: StorableObjectUpdate<Self>;
 
 	fn id(&self) -> Self::Id;
-	fn update(&mut self, update: &Self::Update) -> bool;
+	fn update(&mut self, update: Self::Update) -> bool;
 	fn to_update(&self) -> Self::Update;
 }
 
@@ -79,7 +79,7 @@ where
 		match locked_objects.entry(object.id()) {
 			hash_map::Entry::Occupied(mut e) => {
 				let update = object.to_update();
-				updated = e.get_mut().update(&update);
+				updated = e.get_mut().update(update);
 				if updated {
 					self.persist(&e.get())?;
 				}
@@ -124,7 +124,7 @@ where
 		self.objects.lock().unwrap().get(id).cloned()
 	}
 
-	pub(crate) fn update(&self, update: &SO::Update) -> Result<DataStoreUpdateResult, Error> {
+	pub(crate) fn update(&self, update: SO::Update) -> Result<DataStoreUpdateResult, Error> {
 		let mut locked_objects = self.objects.lock().unwrap();
 
 		if let Some(object) = locked_objects.get_mut(&update.id()) {
@@ -219,7 +219,7 @@ mod tests {
 			self.id
 		}
 
-		fn update(&mut self, update: &Self::Update) -> bool {
+		fn update(&mut self, update: Self::Update) -> bool {
 			if self.data != update.data {
 				self.data = update.data;
 				true
@@ -276,17 +276,17 @@ mod tests {
 
 		// Check update returns `Updated`
 		let update = TestObjectUpdate { id, data: [25u8; 3] };
-		assert_eq!(Ok(DataStoreUpdateResult::Updated), data_store.update(&update));
+		assert_eq!(Ok(DataStoreUpdateResult::Updated), data_store.update(update));
 		assert_eq!(data_store.get(&id).unwrap().data, [25u8; 3]);
 
 		// Check no-op update yields `Unchanged`
 		let update = TestObjectUpdate { id, data: [25u8; 3] };
-		assert_eq!(Ok(DataStoreUpdateResult::Unchanged), data_store.update(&update));
+		assert_eq!(Ok(DataStoreUpdateResult::Unchanged), data_store.update(update));
 
 		// Check bogus update yields `NotFound`
 		let bogus_id = TestObjectId { id: [84u8; 4] };
 		let update = TestObjectUpdate { id: bogus_id, data: [12u8; 3] };
-		assert_eq!(Ok(DataStoreUpdateResult::NotFound), data_store.update(&update));
+		assert_eq!(Ok(DataStoreUpdateResult::NotFound), data_store.update(update));
 
 		// Check `insert_or_update` inserts unknown objects
 		let iou_id = TestObjectId { id: [55u8; 4] };

src/event.rs

@@ -657,7 +657,7 @@ where
 							status: Some(PaymentStatus::Failed),
 							..PaymentDetailsUpdate::new(payment_id)
 						};
-						match self.payment_store.update(&update) {
+						match self.payment_store.update(update) {
 							Ok(_) => return Ok(()),
 							Err(e) => {
 								log_error!(self.logger, "Failed to access payment store: {}", e);
@@ -681,7 +681,7 @@ where
 							status: Some(PaymentStatus::Failed),
 							..PaymentDetailsUpdate::new(payment_id)
 						};
-						match self.payment_store.update(&update) {
+						match self.payment_store.update(update) {
 							Ok(_) => return Ok(()),
 							Err(e) => {
 								log_error!(self.logger, "Failed to access payment store: {}", e);
@@ -722,7 +722,7 @@ where
 							status: Some(PaymentStatus::Failed),
 							..PaymentDetailsUpdate::new(payment_id)
 						};
-						match self.payment_store.update(&update) {
+						match self.payment_store.update(update) {
 							Ok(_) => return Ok(()),
 							Err(e) => {
 								log_error!(self.logger, "Failed to access payment store: {}", e);
@@ -739,7 +739,7 @@ where
 									counterparty_skimmed_fee_msat: Some(Some(counterparty_skimmed_fee_msat)),
 									..PaymentDetailsUpdate::new(payment_id)
 								};
-								match self.payment_store.update(&update) {
+								match self.payment_store.update(update) {
 									Ok(_) => (),
 									Err(e) => {
 										log_error!(self.logger, "Failed to access payment store: {}", e);
@@ -910,7 +910,7 @@ where
 						status: Some(PaymentStatus::Failed),
 						..PaymentDetailsUpdate::new(payment_id)
 					};
-					match self.payment_store.update(&update) {
+					match self.payment_store.update(update) {
 						Ok(_) => return Ok(()),
 						Err(e) => {
 							log_error!(self.logger, "Failed to access payment store: {}", e);
@@ -978,7 +978,7 @@ where
 					},
 				};
 
-				match self.payment_store.update(&update) {
+				match self.payment_store.update(update) {
 					Ok(DataStoreUpdateResult::Updated) | Ok(DataStoreUpdateResult::Unchanged) => (
 						// No need to do anything if the idempotent update was applied, which might
 						// be the result of a replayed event.
@@ -1039,7 +1039,7 @@ where
 					..PaymentDetailsUpdate::new(payment_id)
 				};
 
-				match self.payment_store.update(&update) {
+				match self.payment_store.update(update) {
 					Ok(_) => {},
 					Err(e) => {
 						log_error!(self.logger, "Failed to access payment store: {}", e);
@@ -1090,7 +1090,7 @@ where
 					status: Some(PaymentStatus::Failed),
 					..PaymentDetailsUpdate::new(payment_id)
 				};
-				match self.payment_store.update(&update) {
+				match self.payment_store.update(update) {
 					Ok(_) => {},
 					Err(e) => {
 						log_error!(self.logger, "Failed to access payment store: {}", e);

src/payment/bolt11.rs

@@ -383,7 +383,7 @@ impl Bolt11Payment {
 			..PaymentDetailsUpdate::new(payment_id)
 		};
 
-		match self.payment_store.update(&update) {
+		match self.payment_store.update(update) {
 			Ok(DataStoreUpdateResult::Updated) | Ok(DataStoreUpdateResult::Unchanged) => (),
 			Ok(DataStoreUpdateResult::NotFound) => {
 				log_error!(

src/payment/pending_payment_store.rs

@@ -53,17 +53,17 @@ impl StorableObject for PendingPaymentDetails {
 		self.details.id
 	}
 
-	fn update(&mut self, update: &Self::Update) -> bool {
+	fn update(&mut self, update: Self::Update) -> bool {
 		let mut updated = false;
 
 		// Update the underlying payment details if present
-		if let Some(payment_update) = &update.payment_update {
+		if let Some(payment_update) = update.payment_update {
 			updated |= self.details.update(payment_update);
 		}
 
-		if let Some(new_conflicting_txids) = &update.conflicting_txids {
-			if &self.conflicting_txids != new_conflicting_txids {
-				self.conflicting_txids = new_conflicting_txids.clone();
+		if let Some(new_conflicting_txids) = update.conflicting_txids {
+			if self.conflicting_txids != new_conflicting_txids {
+				self.conflicting_txids = new_conflicting_txids;
 				updated = true;
 			}
 		}

src/payment/store.rs

@@ -170,7 +170,7 @@ impl StorableObject for PaymentDetails {
 		self.id
 	}
 
-	fn update(&mut self, update: &Self::Update) -> bool {
+	fn update(&mut self, update: Self::Update) -> bool {
 		debug_assert_eq!(
 			self.id, update.id,
 			"We should only ever override payment data for the same payment id"