refactor: AttestedMsg struct should be within quartz-cw and imported (#60)

Author: dangush

apps/mtcs/enclave/src/mtcs_server.rs

@@ -18,6 +18,7 @@ use mtcs::{
     obligation::SimpleObligation, prelude::DefaultMtcs, setoff::SimpleSetoff, Mtcs,
 };
 use quartz_enclave::attestor::Attestor;
+use quartz_cw::msg::execute::attested::RawAttested;
 use serde::{Deserialize, Serialize};
 use tonic::{Request, Response, Result as TonicResult, Status};
 
@@ -111,12 +112,12 @@ where
 
         let msg = SubmitSetoffsMsg { setoffs_enc };
 
-        let quote = self
+        let attestation = self
             .attestor
             .quote(msg.clone())
             .map_err(|e| Status::internal(e.to_string()))?;
 
-        let attested_msg = AttestedMsg { msg, quote };
+        let attested_msg = RawAttested { msg, attestation };
         let message = serde_json::to_string(&attested_msg).unwrap();
         Ok(Response::new(RunClearingResponse { message }))
     }

apps/transfers/enclave/src/transfers_server.rs

@@ -9,7 +9,10 @@ pub type RawCipherText = HexBinary;
 
 use ecies::{decrypt, encrypt};
 use k256::ecdsa::{SigningKey, VerifyingKey};
-use quartz_cw::{msg::execute::attested::HasUserData, state::UserData};
+use quartz_cw::{
+    msg::execute::attested::{HasUserData, RawAttested},
+    state::UserData,
+};
 use quartz_enclave::attestor::Attestor;
 use serde::{Deserialize, Serialize};
 use sha2::{Digest, Sha256};
@@ -52,13 +55,6 @@ impl HasUserData for RunTransfersResponseMessage {
     }
 }
 
-// TODO: this should probably just be an import from quartz
-#[derive(Clone, Debug, Serialize, Deserialize)]
-struct AttestedMsg<M> {
-    msg: M,
-    quote: Vec<u8>,
-}
-
 impl<A> TransfersService<A>
 where
     A: Attestor,
@@ -182,12 +178,12 @@ where
         };
 
         // Attest to message
-        let quote = self
+        let attestation = self
             .attestor
             .quote(msg.clone())
             .map_err(|e| Status::internal(e.to_string()))?;
 
-        let attested_msg = AttestedMsg { msg, quote };
+        let attested_msg = RawAttested { msg, attestation };
         let message =
             serde_json::to_string(&attested_msg).map_err(|e| Status::internal(e.to_string()))?;
 

cosmwasm/packages/quartz-cw/src/msg/execute/attested.rs

@@ -9,8 +9,8 @@ use crate::{
 
 #[derive(Clone, Debug, PartialEq)]
 pub struct Attested<M, A> {
-    msg: M,
-    attestation: A,
+    pub msg: M,
+    pub attestation: A,
 }
 
 impl<M, A> Attested<M, A> {