Skip to content

Commit bc474c0

Browse files
authored
Merge pull request #9 from TheBlueMatt/main
Clean up some rustfmt garbage
2 parents f9e5fb0 + da6f72c commit bc474c0

File tree

1 file changed

+7
-21
lines changed

1 file changed

+7
-21
lines changed

src/http_resolver.rs

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -156,15 +156,8 @@ impl HTTPHrnResolver {
156156

157157
async fn resolve_lnurl_impl(&self, lnurl_url: &str) -> Result<HrnResolution, &'static str> {
158158
let err = "Failed to fetch LN-Address initial well-known endpoint";
159-
let init: LNURLInitResponse = self
160-
.client
161-
.get(lnurl_url)
162-
.send()
163-
.await
164-
.map_err(|_| err)?
165-
.json()
166-
.await
167-
.map_err(|_| err)?;
159+
let init_result = self.client.get(lnurl_url).send().await.map_err(|_| err)?;
160+
let init: LNURLInitResponse = init_result.json().await.map_err(|_| err)?;
168161

169162
if init.tag != "payRequest" {
170163
return Err("LNURL initial init_response had an incorrect tag value");
@@ -225,21 +218,14 @@ impl HrnResolver for HTTPHrnResolver {
225218
} else {
226219
write!(&mut callback, "?amount={}", amt.milli_sats()).expect("Write to String");
227220
}
228-
let callback_response: LNURLCallbackResponse = self
229-
.client
230-
.get(callback)
231-
.send()
232-
.await
233-
.map_err(|_| err)?
234-
.json()
235-
.await
236-
.map_err(|_| err)?;
237-
238-
if !callback_response.routes.is_empty() {
221+
let http_response = self.client.get(callback).send().await.map_err(|_| err)?;
222+
let response: LNURLCallbackResponse = http_response.json().await.map_err(|_| err)?;
223+
224+
if !response.routes.is_empty() {
239225
return Err("LNURL callback response contained a non-empty routes array");
240226
}
241227

242-
let invoice = Bolt11Invoice::from_str(&callback_response.pr).map_err(|_| err)?;
228+
let invoice = Bolt11Invoice::from_str(&response.pr).map_err(|_| err)?;
243229
if invoice.amount_milli_satoshis() != Some(amt.milli_sats()) {
244230
return Err("LNURL callback response contained an invoice with the wrong amount");
245231
}

0 commit comments

Comments
 (0)