feat: operation queue

src/da/mod.rs

@@ -1,6 +1,6 @@
 use crate::{
     error::{DAResult, DeimosResult, GeneralError},
-    utils::Signable,
+    utils::SignedContent,
     zk_snark::{Bls12Proof, VerifyingKey},
 };
 use async_trait::async_trait;
@@ -22,7 +22,7 @@ pub struct EpochJson {
     pub signature: Option<String>,
 }
 
-impl Signable for EpochJson {
+impl SignedContent for EpochJson {
     fn get_signature(&self) -> DeimosResult<Signature> {
         match &self.signature {
             Some(signature) => Signature::from_str(signature)
@@ -31,7 +31,7 @@ impl Signable for EpochJson {
         }
     }
 
-    fn get_content_to_sign(&self) -> DeimosResult<String> {
+    fn get_plaintext(&self) -> DeimosResult<String> {
         let mut copy = self.clone();
         copy.signature = None;
         serde_json::to_string(&copy).map_err(|e| GeneralError::EncodingError(e.to_string()).into())

src/error.rs

@@ -1,3 +1,4 @@
+use ed25519_dalek::SignatureError;
 use indexed_merkle_tree::error::MerkleTreeError;
 use thiserror::Error;
 
@@ -35,8 +36,8 @@ pub enum GeneralError {
     MissingArgumentError(String),
     #[error("invalid public key")]
     InvalidPublicKey,
-    #[error("invalid signature")]
-    InvalidSignature,
+    #[error(transparent)]
+    InvalidSignature(#[from] SignatureError),
     #[error("starting webserver")]
     WebserverError,
     #[error("initializing service: {0}")]

src/node_types/mod.rs

@@ -10,64 +10,3 @@ pub trait NodeType {
     async fn start(self: Arc<Self>) -> DeimosResult<()>;
     // async fn stop(&self) -> Result<(), String>;
 }
-
-#[cfg(test)]
-mod tests {
-    use crate::{utils::verify_signature, webserver::UpdateEntryJson};
-    use base64::{engine::general_purpose, Engine as _};
-
-    fn setup_signature(valid_signature: bool) -> UpdateEntryJson {
-        let signed_message = if valid_signature {
-            "NRtq1sgoxllsPvljXZd5f4DV7570PdA9zWHa4ych2jBCDU1uUYXZvW72BS9O+C68hptk/4Y34sTJj4x92gq9DHsiaWQiOiJDb3NSWE9vU0xHN2E4c0NHeDc4S2h0ZkxFdWl5Tlk3TDRrc0Z0NzhtcDJNPSIsIm9wZXJhdGlvbiI6IkFkZCIsInZhbHVlIjoiMjE3OWM0YmIzMjc0NDQ1NGE0OTlhYTMwZTI0NTJlMTZhODcwMGQ5ODQyYjI5ZThlODcyN2VjMzczNWMwYjdhNiJ9".to_string()
-        } else {
-            "QVmk3wgoxllsPvljXZd5f4DV7570PdA9zWHa4ych2jBCDU1uUYXZvW72BS9O+C68hptk/4Y34sTJj4x92gq9DHsiaWQiOiJDb3NSWE9vU0xHN2E4c0NHeDc4S2h0ZkxFdWl5Tlk3TDRrc0Z0NzhtcDJNPSIsIm9wZXJhdGlvbiI6IkFkZCIsInZhbHVlIjoiMjE3OWM0YmIzMjc0NDQ1NGE0OTlhYTMwZTI0NTJlMTZhODcwMGQ5ODQyYjI5ZThlODcyN2VjMzczNWMwYjdhNiJ9".to_string()
-        };
-        let id_public_key = "CosRXOoSLG7a8sCGx78KhtfLEuiyNY7L4ksFt78mp2M=".to_string();
-
-        UpdateEntryJson {
-            signed_incoming_entry: signed_message,
-            public_key: id_public_key,
-        }
-    }
-
-    #[test]
-    fn test_verify_valid_signature() {
-        let signature_with_key = setup_signature(true);
-
-        let result = verify_signature(
-            &signature_with_key,
-            Some(signature_with_key.public_key.clone()),
-        );
-
-        assert!(result.is_ok());
-    }
-
-    #[test]
-    fn test_verify_invalid_signature() {
-        let signature_with_key = setup_signature(false);
-
-        let result = verify_signature(
-            &signature_with_key,
-            Some(signature_with_key.public_key.clone()),
-        );
-        assert!(result.is_err());
-    }
-
-    #[test]
-    fn test_verify_short_message() {
-        let signature_with_key = setup_signature(true);
-
-        let short_message = general_purpose::STANDARD.encode("this is a short message");
-
-        let signature_with_key = UpdateEntryJson {
-            signed_incoming_entry: short_message,
-            ..signature_with_key
-        };
-
-        let result = verify_signature(
-            &signature_with_key,
-            Some(signature_with_key.public_key.clone()),
-        );
-        assert!(result.is_err());
-    }
-}