X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fchannelmanager.rs;h=9ef63973ddc02f3c348746e9e76401c2bfef1e9c;hb=1173e06f38bc1f3143883a478341ab4657057a29;hp=80b98b2b6f5bacaafb31739744ea1357d5a0e1c1;hpb=17b77e0bcf0fd6721ac820df07a92ff697b3f50f;p=rust-lightning

diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs
index 80b98b2b..9ef63973 100644
--- a/lightning/src/ln/channelmanager.rs
+++ b/lightning/src/ln/channelmanager.rs
@@ -10272,12 +10272,12 @@ where
 				};
 
 				match response {
-					Ok(invoice) => return responder.respond(OffersMessage::Invoice(invoice)),
-					Err(error) => return responder.respond(OffersMessage::InvoiceError(error.into())),
+					Ok(invoice) => responder.respond(OffersMessage::Invoice(invoice)),
+					Err(error) => responder.respond(OffersMessage::InvoiceError(error.into())),
 				}
 			},
 			OffersMessage::Invoice(invoice) => {
-				let response = invoice
+				let result = invoice
 					.verify(expanded_key, secp_ctx)
 					.map_err(|()| InvoiceError::from_string("Unrecognized invoice".to_owned()))
 					.and_then(|payment_id| {
@@ -10293,21 +10293,20 @@ where
 						}
 					});
 
-				match (responder, response) {
-					(Some(responder), Err(e)) => responder.respond(OffersMessage::InvoiceError(e)),
-					(None, Err(_)) => {
-						log_trace!(
-							self.logger,
-							"A response was generated, but there is no reply_path specified for sending the response."
-						);
-						return ResponseInstruction::NoResponse;
-					}
-					_ => return ResponseInstruction::NoResponse,
+				match result {
+					Ok(()) => ResponseInstruction::NoResponse,
+					Err(e) => match responder {
+						Some(responder) => responder.respond(OffersMessage::InvoiceError(e)),
+						None => {
+							log_trace!(self.logger, "No reply path for sending invoice error: {:?}", e);
+							ResponseInstruction::NoResponse
+						},
+					},
 				}
 			},
 			OffersMessage::InvoiceError(invoice_error) => {
 				log_trace!(self.logger, "Received invoice_error: {}", invoice_error);
-				return ResponseInstruction::NoResponse;
+				ResponseInstruction::NoResponse
 			},
 		}
 	}