Rename NonUniquePaymentHash error to DuplicatePayment

Author: tnull

bindings/ldk_node.udl

@@ -101,7 +101,7 @@ enum NodeError {
 	"InvalidInvoice",
 	"InvalidChannelId",
 	"InvalidNetwork",
-	"NonUniquePaymentHash",
+	"DuplicatePayment",
 	"InsufficientFunds",
 };
 

src/error.rs

@@ -53,8 +53,8 @@ pub enum Error {
 	InvalidChannelId,
 	/// The given network is invalid.
 	InvalidNetwork,
-	/// Payment of the given invoice has already been intiated.
-	NonUniquePaymentHash,
+	/// A payment with the given hash has already been intiated.
+	DuplicatePayment,
 	/// There are insufficient funds to complete the given operation.
 	InsufficientFunds,
 }
@@ -89,7 +89,9 @@ impl fmt::Display for Error {
 			Self::InvalidInvoice => write!(f, "The given invoice is invalid."),
 			Self::InvalidChannelId => write!(f, "The given channel ID is invalid."),
 			Self::InvalidNetwork => write!(f, "The given network is invalid."),
-			Self::NonUniquePaymentHash => write!(f, "An invoice must not get payed twice."),
+			Self::DuplicatePayment => {
+				write!(f, "A payment with the given hash has already been initiated.")
+			}
 			Self::InsufficientFunds => {
 				write!(f, "There are insufficient funds to complete the given operation.")
 			}

src/lib.rs

@@ -1404,7 +1404,7 @@ impl<K: KVStore + Sync + Send + 'static> Node<K> {
 
 		if self.payment_store.contains(&payment_hash) {
 			log_error!(self.logger, "Payment error: an invoice must not get paid twice.");
-			return Err(Error::NonUniquePaymentHash);
+			return Err(Error::DuplicatePayment);
 		}
 
 		let payment_secret = Some(*invoice.payment_secret());
@@ -1479,7 +1479,7 @@ impl<K: KVStore + Sync + Send + 'static> Node<K> {
 		let payment_hash = PaymentHash((*invoice.payment_hash()).into_inner());
 		if self.payment_store.contains(&payment_hash) {
 			log_error!(self.logger, "Payment error: an invoice must not get paid twice.");
-			return Err(Error::NonUniquePaymentHash);
+			return Err(Error::DuplicatePayment);
 		}
 
 		let payment_id = PaymentId(invoice.payment_hash().into_inner());

src/test/functional_tests.rs

@@ -131,7 +131,7 @@ fn channel_full_cycle() {
 	assert_eq!(node_b.payment(&payment_hash).unwrap().amount_msat, Some(invoice_amount_1_msat));
 
 	// Assert we fail duplicate outbound payments.
-	assert_eq!(Err(Error::NonUniquePaymentHash), node_a.send_payment(&invoice));
+	assert_eq!(Err(Error::DuplicatePayment), node_a.send_payment(&invoice));
 
 	// Test under-/overpayment
 	let invoice_amount_2_msat = 1000_000;