feature: add properties for JSON REST responses

crates/common/src/account.rs

@@ -9,7 +9,11 @@ use crate::{
 };
 
 #[derive(Clone, Serialize, Deserialize, Debug, PartialEq)]
-pub struct SignedData(pub VerifyingKey, #[serde(with = "raw_or_b64")] pub Vec<u8>);
+pub struct SignedData {
+    pub key: VerifyingKey,
+    #[serde(with = "raw_or_b64")]
+    pub data: Vec<u8>,
+}
 
 #[derive(Clone, Serialize, Deserialize, Debug, PartialEq, Default)]
 /// Represents an account or service on prism, making up the values of our state
@@ -169,19 +173,19 @@ impl Account {
                 data,
                 data_signature,
             } => {
-                self.signed_data.push(SignedData(
-                    data_signature.verifying_key.clone(),
-                    data.clone(),
-                ));
+                self.signed_data.push(SignedData {
+                    key: data_signature.verifying_key.clone(),
+                    data: data.clone(),
+                });
             }
             Operation::SetData {
                 data,
                 data_signature,
             } => {
-                self.signed_data = vec![SignedData(
-                    data_signature.verifying_key.clone(),
-                    data.clone(),
-                )];
+                self.signed_data = vec![SignedData {
+                    key: data_signature.verifying_key.clone(),
+                    data: data.clone(),
+                }];
             }
             Operation::CreateAccount { id, key, .. } => {
                 self.id = id.clone();

crates/node_types/prover/src/webserver.rs

@@ -76,6 +76,11 @@ pub struct JmtProofResponse {
     pub siblings: Vec<Digest>,
 }
 
+#[derive(Serialize, Deserialize, ToSchema)]
+pub struct CommitmentResponse {
+    commitment: Digest,
+}
+
 impl From<SparseMerkleProof<TreeHasher>> for JmtProofResponse {
     fn from(proof: SparseMerkleProof<TreeHasher>) -> Self {
         let leaf_hash = proof.leaf().map(|node| node.hash::<TreeHasher>()).map(Digest::new);
@@ -232,7 +237,7 @@ async fn get_account(
 )]
 async fn get_commitment(State(session): State<Arc<Prover>>) -> impl IntoResponse {
     match session.get_commitment().await {
-        Ok(commitment) => (StatusCode::OK, Json(commitment)).into_response(),
+        Ok(commitment) => (StatusCode::OK, Json(CommitmentResponse { commitment })).into_response(),
         Err(e) => (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()).into_response(),
     }
 }

crates/tree/src/tests.rs

@@ -199,8 +199,8 @@ fn test_data_ops(algorithm: CryptoAlgorithm) {
     assert!(membership_proof.verify_existence(&account).is_ok());
 
     // Verify data contents
-    assert_eq!(account.signed_data()[0].1, b"test data 1".to_vec());
-    assert_eq!(account.signed_data()[1].1, b"test data 2".to_vec());
+    assert_eq!(account.signed_data()[0].data, b"test data 1".to_vec());
+    assert_eq!(account.signed_data()[1].data, b"test data 2".to_vec());
     assert_eq!(account.signed_data().len(), 2);
 
     // Ensure that setData replaces, not appends
@@ -221,7 +221,7 @@ fn test_data_ops(algorithm: CryptoAlgorithm) {
     };
 
     // Verify data contents - should only have latest value
-    assert_eq!(account.signed_data()[0].1, b"replacement data".to_vec());
+    assert_eq!(account.signed_data()[0].data, b"replacement data".to_vec());
     assert_eq!(account.signed_data().len(), 1);
 
     // Ensure incorrectly signed data leads to error