chore: expand test coverage to include errors

Author: jcnelson

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

@@ -213,6 +213,16 @@ fn test_try_make_response() {
 
     let mut requests = vec![];
 
+    // query invalid metadata key (wrong store type)
+    let request = StacksHttpRequest::new_getclaritymetadata(
+        addr.into(),
+        StacksAddress::from_string("ST2DS4MSWSGJ3W9FBC6BVT0Y92S345HY8N3T6AV7R").unwrap(),
+        "hello-world".try_into().unwrap(),
+        "vm-metadata::2::bar".to_string(),
+        TipRequest::UseLatestAnchoredTip,
+    );
+    requests.push(request);
+
     // query existing contract size metadata
     let request = StacksHttpRequest::new_getclaritymetadata(
         addr.into(),
@@ -223,7 +233,7 @@ fn test_try_make_response() {
     );
     requests.push(request);
 
-    // query existing data var metadata
+    // query existing data map metadata
     let request = StacksHttpRequest::new_getclaritymetadata(
         addr.into(),
         StacksAddress::from_string("ST2DS4MSWSGJ3W9FBC6BVT0Y92S345HY8N3T6AV7R").unwrap(),
@@ -233,7 +243,7 @@ fn test_try_make_response() {
     );
     requests.push(request);
 
-    // query existing data map metadata
+    // query existing data var metadata
     let request = StacksHttpRequest::new_getclaritymetadata(
         addr.into(),
         StacksAddress::from_string("ST2DS4MSWSGJ3W9FBC6BVT0Y92S345HY8N3T6AV7R").unwrap(),
@@ -243,22 +253,32 @@ fn test_try_make_response() {
     );
     requests.push(request);
 
-    // query undeclared var metadata
+    // query existing data var metadata
     let request = StacksHttpRequest::new_getclaritymetadata(
         addr.into(),
         StacksAddress::from_string("ST2DS4MSWSGJ3W9FBC6BVT0Y92S345HY8N3T6AV7R").unwrap(),
         "hello-world".try_into().unwrap(),
-        "vm-metadata::6::non-existing-var".to_string(),
+        "vm-metadata::6::bar".to_string(),
         TipRequest::UseLatestAnchoredTip,
     );
     requests.push(request);
 
-    // query invalid metadata key (wrong store type)
+    // query existing data var metadata
     let request = StacksHttpRequest::new_getclaritymetadata(
         addr.into(),
         StacksAddress::from_string("ST2DS4MSWSGJ3W9FBC6BVT0Y92S345HY8N3T6AV7R").unwrap(),
         "hello-world".try_into().unwrap(),
-        "vm-metadata::2::bar".to_string(),
+        "vm-metadata::6::bar".to_string(),
+        TipRequest::UseLatestAnchoredTip,
+    );
+    requests.push(request);
+
+    // query undeclared var metadata
+    let request = StacksHttpRequest::new_getclaritymetadata(
+        addr.into(),
+        StacksAddress::from_string("ST2DS4MSWSGJ3W9FBC6BVT0Y92S345HY8N3T6AV7R").unwrap(),
+        "hello-world".try_into().unwrap(),
+        "vm-metadata::6::non-existing-var".to_string(),
         TipRequest::UseLatestAnchoredTip,
     );
     requests.push(request);
@@ -273,8 +293,23 @@ fn test_try_make_response() {
     );
     requests.push(request);
 
+    // query invalid metadata key (wrong store type)
+    let request = StacksHttpRequest::new_getclaritymetadata(
+        addr.into(),
+        StacksAddress::from_string("ST2DS4MSWSGJ3W9FBC6BVT0Y92S345HY8N3T6AV7R").unwrap(),
+        "hello-world".try_into().unwrap(),
+        "vm-metadata::2::bar".to_string(),
+        TipRequest::UseLatestAnchoredTip,
+    );
+    requests.push(request);
+
     let mut responses = test_rpc(function_name!(), requests);
 
+    // unknwnon data var
+    let response = responses.remove(0);
+    let (preamble, body) = response.destruct();
+    assert_eq!(preamble.status_code, 400);
+
     // contract size metadata
     let response = responses.remove(0);
     assert_eq!(
@@ -301,11 +336,36 @@ fn test_try_make_response() {
     };
     assert_eq!(resp.data, expected.serialize());
 
+    // data var metadata
+    let response = responses.remove(0);
+    let resp = response.decode_clarity_metadata_response().unwrap();
+    let expected = DataVariableMetadata {
+        value_type: TypeSignature::IntType,
+    };
+    assert_eq!(resp.data, expected.serialize());
+
+    // data var metadata
+    let response = responses.remove(0);
+    let resp = response.decode_clarity_metadata_response().unwrap();
+    let expected = DataVariableMetadata {
+        value_type: TypeSignature::IntType,
+    };
+    assert_eq!(resp.data, expected.serialize());
+
     // invalid metadata key
     let response = responses.remove(0);
     let (preamble, body) = response.destruct();
     assert_eq!(preamble.status_code, 404);
 
+    // contract size metadata
+    let response = responses.remove(0);
+    assert_eq!(
+        response.preamble().get_canonical_stacks_tip_height(),
+        Some(1)
+    );
+    let resp = response.decode_clarity_metadata_response().unwrap();
+    assert_eq!(resp.data, "1432");
+
     // unknwnon data var
     let response = responses.remove(0);
     let (preamble, body) = response.destruct();

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

@@ -1024,7 +1024,7 @@ impl<'a> TestRPC<'a> {
 
             peer_2.sortdb = Some(peer_2_sortdb);
             peer_2.stacks_node = Some(peer_2_stacks_node);
-            let mut peer_1_mempool = peer_1.mempool.take().unwrap();
+            peer_2.mempool = Some(peer_2_mempool);
 
             convo_send_recv(&mut convo_2, &mut convo_1);
 
@@ -1033,8 +1033,6 @@ impl<'a> TestRPC<'a> {
             // hack around the borrow-checker
             convo_send_recv(&mut convo_1, &mut convo_2);
 
-            peer_2.mempool = Some(peer_2_mempool);
-
             let peer_1_sortdb = peer_1.sortdb.take().unwrap();
             let mut peer_1_stacks_node = peer_1.stacks_node.take().unwrap();
 
@@ -1056,27 +1054,45 @@ impl<'a> TestRPC<'a> {
                 .unwrap();
             }
 
-            {
-                let rpc_args = RPCHandlerArgs::default();
-                let mut node_state = StacksNodeState::new(
-                    &mut peer_1.network,
-                    &peer_1_sortdb,
-                    &mut peer_1_stacks_node.chainstate,
-                    &mut peer_1_mempool,
-                    &rpc_args,
-                    false,
-                );
-                convo_1.chat(&mut node_state).unwrap();
-            }
-
-            convo_1.try_flush().unwrap();
-
             peer_1.sortdb = Some(peer_1_sortdb);
             peer_1.stacks_node = Some(peer_1_stacks_node);
-            peer_1.mempool = Some(peer_1_mempool);
 
-            // should have gotten a reply
-            let resp_opt = convo_1.try_get_response();
+            let resp_opt = loop {
+                debug!("Peer 1 try get response");
+                convo_send_recv(&mut convo_1, &mut convo_2);
+                {
+                    let peer_1_sortdb = peer_1.sortdb.take().unwrap();
+                    let mut peer_1_stacks_node = peer_1.stacks_node.take().unwrap();
+                    let mut peer_1_mempool = peer_1.mempool.take().unwrap();
+
+                    let rpc_args = RPCHandlerArgs::default();
+                    let mut node_state = StacksNodeState::new(
+                        &mut peer_1.network,
+                        &peer_1_sortdb,
+                        &mut peer_1_stacks_node.chainstate,
+                        &mut peer_1_mempool,
+                        &rpc_args,
+                        false,
+                    );
+
+                    convo_1.chat(&mut node_state).unwrap();
+
+                    peer_1.sortdb = Some(peer_1_sortdb);
+                    peer_1.stacks_node = Some(peer_1_stacks_node);
+                    peer_1.mempool = Some(peer_1_mempool);
+                }
+
+                convo_1.try_flush().unwrap();
+
+                info!("Try get response from request {:?}", &request);
+
+                // should have gotten a reply
+                let resp_opt = convo_1.try_get_response();
+                if resp_opt.is_some() {
+                    break resp_opt;
+                }
+            };
+
             assert!(resp_opt.is_some());
 
             let resp = resp_opt.unwrap();