Merge branch 'develop' into bugfix/stackerdb-dkg-test

Author: wileyj

stackslib/src/net/http/request.rs

@@ -612,7 +612,7 @@ impl HttpRequestContents {
     }
 
     /// Get a query argument
-    pub fn get_query_arg(&self, key: &String) -> Option<&String> {
+    pub fn get_query_arg(&self, key: &str) -> Option<&String> {
         self.query_args.get(key)
     }
 

stackslib/src/net/httpcore.rs

@@ -329,13 +329,12 @@ impl HttpRequestContentsExtensions for HttpRequestContents {
 
     /// Get the proof= query parameter value
     fn get_with_proof(&self) -> bool {
-        let with_proof = if let Some(proof_val) = self.get_query_arg(&"proof".to_string()) {
-            proof_val == "1"
-        } else {
-            false
-        };
-
-        with_proof
+        let proof_value = self
+            .get_query_arg("proof")
+            .map(|x| x.to_owned())
+            // default to "with proof"
+            .unwrap_or("1".into());
+        &proof_value == "1"
     }
 }
 

stackslib/src/net/tests/httpcore.rs

@@ -1012,7 +1012,7 @@ fn test_http_parse_proof_request_query() {
     let proof_req = HttpRequestContents::new()
         .query_string(Some(query_txt))
         .get_with_proof();
-    assert!(!proof_req);
+    assert!(proof_req);
 
     let query_txt = "proof=0";
     let proof_req = HttpRequestContents::new()