f Drop Entry prefix from PaymentStoreUpdateResult

Author: tnull

src/event.rs

@@ -906,12 +906,12 @@ where
 				};
 
 				match self.payment_store.update(&update) {
-					Ok(PaymentStoreUpdateResult::EntryUpdated)
-					| Ok(PaymentStoreUpdateResult::EntryUnchanged) => (
+					Ok(PaymentStoreUpdateResult::Updated)
+					| Ok(PaymentStoreUpdateResult::Unchanged) => (
 						// No need to do anything if the idempotent update was applied, which might
 						// be the result of a replayed event.
 					),
-					Ok(PaymentStoreUpdateResult::EntryNotFound) => {
+					Ok(PaymentStoreUpdateResult::NotFound) => {
 						log_error!(
 							self.logger,
 							"Claimed payment with ID {} couldn't be found in store",

src/payment/bolt11.rs

@@ -409,9 +409,8 @@ impl Bolt11Payment {
 		};
 
 		match self.payment_store.update(&update) {
-			Ok(PaymentStoreUpdateResult::EntryUpdated)
-			| Ok(PaymentStoreUpdateResult::EntryUnchanged) => (),
-			Ok(PaymentStoreUpdateResult::EntryNotFound) => {
+			Ok(PaymentStoreUpdateResult::Updated) | Ok(PaymentStoreUpdateResult::Unchanged) => (),
+			Ok(PaymentStoreUpdateResult::NotFound) => {
 				log_error!(
 					self.logger,
 					"Failed to manually fail unknown payment with hash {}",

src/payment/store.rs

@@ -592,9 +592,9 @@ impl From<&PaymentDetails> for PaymentDetailsUpdate {
 
 #[derive(PartialEq, Eq, Debug, Clone, Copy)]
 pub(crate) enum PaymentStoreUpdateResult {
-	EntryUpdated,
-	EntryUnchanged,
-	EntryNotFound,
+	Updated,
+	Unchanged,
+	NotFound,
 }
 
 pub(crate) struct PaymentStore<L: Deref>
@@ -686,12 +686,12 @@ where
 			let updated = payment.update(update);
 			if updated {
 				self.persist_info(&update.id, payment)?;
-				Ok(PaymentStoreUpdateResult::EntryUpdated)
+				Ok(PaymentStoreUpdateResult::Updated)
 			} else {
-				Ok(PaymentStoreUpdateResult::EntryUnchanged)
+				Ok(PaymentStoreUpdateResult::Unchanged)
 			}
 		} else {
-			Ok(PaymentStoreUpdateResult::EntryNotFound)
+			Ok(PaymentStoreUpdateResult::NotFound)
 		}
 	}
 
@@ -801,21 +801,21 @@ mod tests {
 		assert_eq!(Ok(true), payment_store.insert(payment));
 		assert!(payment_store.get(&id).is_some());
 
-		// Check update returns `EntryUpdated`
+		// Check update returns `Updated`
 		let mut update = PaymentDetailsUpdate::new(id);
 		update.status = Some(PaymentStatus::Succeeded);
-		assert_eq!(Ok(PaymentStoreUpdateResult::EntryUpdated), payment_store.update(&update));
+		assert_eq!(Ok(PaymentStoreUpdateResult::Updated), payment_store.update(&update));
 
-		// Check no-op update yields `EntryUnchanged`
+		// Check no-op update yields `Unchanged`
 		let mut update = PaymentDetailsUpdate::new(id);
 		update.status = Some(PaymentStatus::Succeeded);
-		assert_eq!(Ok(PaymentStoreUpdateResult::EntryUnchanged), payment_store.update(&update));
+		assert_eq!(Ok(PaymentStoreUpdateResult::Unchanged), payment_store.update(&update));
 
-		// Check bogus update yields `EntryNotFound`
+		// Check bogus update yields `NotFound`
 		let bogus_id = PaymentId([84u8; 32]);
 		let mut update = PaymentDetailsUpdate::new(bogus_id);
 		update.status = Some(PaymentStatus::Succeeded);
-		assert_eq!(Ok(PaymentStoreUpdateResult::EntryNotFound), payment_store.update(&update));
+		assert_eq!(Ok(PaymentStoreUpdateResult::NotFound), payment_store.update(&update));
 
 		assert!(payment_store.get(&id).is_some());