WIP

src/main.rs

@@ -269,12 +269,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
 pub(crate) struct Headers(hyper::HeaderMap);
 impl bip78::receiver::Headers for Headers {
-    fn get_header(&self, key: &str) -> Option<&str> {
-        if let Some(value) = self.0.get(key) {
-            return value.to_str().ok();
-        }
-        None
-    }
+    fn get_header(&self, key: &str) -> Option<&str> { self.0.get(key)?.to_str().ok() }
 }
 
 async fn handle_web_req(
@@ -306,18 +301,13 @@ async fn handle_web_req(
             let mut lnd = handler.client;
 
             let headers = Headers(req.headers().to_owned());
-            let query = {
-                let uri = req.uri();
-                if let Some(query) = uri.query() {
-                    Some(&query.to_owned());
-                }
-                None
-            };
+            let query = req.uri().query().map(ToString::to_string);
             let body = req.into_body();
             let bytes = hyper::body::to_bytes(body).await?;
             dbg!(&bytes); // this is correct by my accounts
             let reader = &*bytes;
-            let proposal = UncheckedProposal::from_request(reader, query, headers).unwrap();
+            let proposal =
+                UncheckedProposal::from_request(reader, query.as_deref(), headers).unwrap();
             if proposal.is_output_substitution_disabled() {
                 panic!("Output substitution must be enabled");
             }