f Change back error types

Author: tnull

src/error.rs

@@ -14,11 +14,11 @@ pub enum Error {
 	/// Payment of the given invoice has already been intiated.
 	NonUniquePaymentHash,
 	/// The given invoice is invalid.
-	InvoiceInvalid,
+	InvalidInvoice,
 	/// Invoice creation failed.
 	InvoiceCreationFailed,
 	/// There are insufficient funds to complete the given operation.
-	FundsInsufficient,
+	InsufficientFunds,
 	/// An attempted payment has failed.
 	PaymentFailed,
 	/// A given peer info could not be parsed.
@@ -47,9 +47,9 @@ impl fmt::Display for Error {
 			}
 			Self::ConnectionFailed => write!(f, "Network connection closed."),
 			Self::NonUniquePaymentHash => write!(f, "An invoice must not get payed twice."),
-			Self::InvoiceInvalid => write!(f, "The given invoice is invalid."),
+			Self::InvalidInvoice => write!(f, "The given invoice is invalid."),
 			Self::InvoiceCreationFailed => write!(f, "Failed to create invoice."),
-			Self::FundsInsufficient => {
+			Self::InsufficientFunds => {
 				write!(f, "There are insufficient funds to complete the given operation.")
 			}
 			Self::PaymentFailed => write!(f, "Failed to send the given payment."),

src/lib.rs

@@ -720,7 +720,7 @@ impl Node {
 		let cur_balance = self.wallet.get_balance()?;
 		if cur_balance.get_spendable() < channel_amount_sats {
 			log_error!(self.logger, "Unable to create channel due to insufficient funds.");
-			return Err(Error::FundsInsufficient);
+			return Err(Error::InsufficientFunds);
 		}
 
 		let peer_info = PeerInfo::try_from(node_pubkey_and_address.to_string())?;
@@ -868,7 +868,7 @@ impl Node {
 			}
 			Err(payment::PaymentError::Invoice(e)) => {
 				log_error!(self.logger, "Failed to send payment due to invalid invoice: {}", e);
-				Err(Error::InvoiceInvalid)
+				Err(Error::InvalidInvoice)
 			}
 			Err(payment::PaymentError::Sending(e)) => {
 				log_error!(self.logger, "Failed to send payment: {:?}", e);

src/tests/functional_tests.rs

@@ -226,7 +226,7 @@ fn channel_open_fails_when_funds_insufficient() {
 	let node_b_addr =
 		format!("{}@{}", node_b.node_id().unwrap(), node_b.listening_address().unwrap());
 	assert_eq!(
-		Err(Error::FundsInsufficient),
+		Err(Error::InsufficientFunds),
 		node_a.connect_open_channel(&node_b_addr, 120000, true)
 	);
 }