CRC: add response testing and fix corresponding bug

Signed-off-by: Jacinta Ferrant <[email protected]>

Author: jferrant

stackslib/src/net/api/getsigner.rs

@@ -151,7 +151,7 @@ impl RPCRequestHandler for GetSignerRequestHandler {
             )
         });
 
-        let response = match result {
+        let blocks_signed = match result {
             Ok(response) => response,
             Err(error) => {
                 return StacksHttpResponse::new_error(
@@ -163,6 +163,8 @@ impl RPCRequestHandler for GetSignerRequestHandler {
             }
         };
 
+        let response = GetSignerResponse { blocks_signed };
+
         let mut preamble = HttpResponsePreamble::ok_json(&preamble);
         preamble.set_canonical_stacks_tip_height(Some(node.canonical_stacks_tip_height()));
         let body = HttpResponseContents::try_from_json(&response)?;

stackslib/src/net/api/tests/getsigner.rs

@@ -94,3 +94,56 @@ fn test_try_parse_request() {
         }
     }
 }
+
+#[test]
+fn test_try_make_response() {
+    let addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 33333);
+
+    let test_observer = TestEventObserver::new();
+    let rpc_test = TestRPC::setup_nakamoto(function_name!(), &test_observer);
+    // Copy pasta of the test setup values
+    let cycle_num = 5;
+    let public_key = StacksPublicKey::from_hex(
+        "0243311589af63c2adda04fcd7792c038a05c12a4fe40351b3eb1612ff6b2e5a0e",
+    )
+    .unwrap();
+
+    let random_private_key = StacksPrivateKey::new();
+    let random_public_key = StacksPublicKey::from_private(&random_private_key);
+
+    let nakamoto_chain_tip = rpc_test.canonical_tip.clone();
+
+    let mut requests = vec![];
+
+    // Query existing signer
+    let info = StacksHttpRequest::new_getsigner(
+        addr.into(),
+        &public_key,
+        cycle_num,
+        TipRequest::SpecificTip(nakamoto_chain_tip),
+    );
+    requests.push(info);
+
+    // query random signer that doesn't exist
+    let request = StacksHttpRequest::new_getsigner(
+        addr.into(),
+        &random_public_key,
+        cycle_num,
+        TipRequest::SpecificTip(nakamoto_chain_tip),
+    );
+    requests.push(request);
+
+    let mut responses = rpc_test.run(requests);
+
+    // Existing signer
+    let response = responses.remove(0);
+    info!("response: {:?}", &response);
+    let signer_response = response.decode_signer().unwrap();
+    assert_eq!(signer_response.blocks_signed, 40);
+
+    // Signer doesn't exist so it should not have signed anything
+    let response = responses.remove(0);
+    info!("response: {:?}", &response);
+    let signer_response = response.decode_signer().unwrap();
+    assert_eq!(signer_response.blocks_signed, 0);
+}

testnet/stacks-node/src/tests/nakamoto_integrations.rs

@@ -67,6 +67,7 @@ use stacks::core::{
 use stacks::libstackerdb::SlotMetadata;
 use stacks::net::api::callreadonly::CallReadOnlyRequestBody;
 use stacks::net::api::get_tenures_fork_info::TenureForkingInfo;
+use stacks::net::api::getsigner::GetSignerResponse;
 use stacks::net::api::getstackers::GetStackersResponse;
 use stacks::net::api::postblock_proposal::{
     BlockValidateReject, BlockValidateResponse, NakamotoBlockProposal, ValidateRejectCode,
@@ -8555,11 +8556,9 @@ fn v3_signer_api_endpoint() {
         info!("Send request: GET {url}");
         reqwest::blocking::get(url)
             .unwrap_or_else(|e| panic!("GET request failed: {e}"))
-            .text()
-            .inspect(|response| info!("Recieved response: GET {url} -> {response}"))
-            .expect("Empty response")
-            .parse::<u64>()
-            .unwrap_or_else(|e| panic!("Failed to parse response as `u64`: {e}"))
+            .json::<GetSignerResponse>()
+            .unwrap()
+            .blocks_signed
     };
 
     // Check reward cycle 1, should be 0 (pre-nakamoto)