Move identity::signatures to json_signatures module

src/activitypub/actors/attachments.rs

@@ -11,7 +11,10 @@ use crate::identity::{
     claims::create_identity_claim,
     did::Did,
     minisign::verify_minisign_identity_proof,
-    signatures::{PROOF_TYPE_ID_EIP191, PROOF_TYPE_ID_MINISIGN},
+};
+use crate::json_signatures::proofs::{
+    PROOF_TYPE_ID_EIP191,
+    PROOF_TYPE_ID_MINISIGN,
 };
 use crate::models::profiles::types::{
     ExtraField,

src/activitypub/authentication.rs

@@ -10,14 +10,17 @@ use crate::http_signatures::verify::{
     verify_http_signature,
     HttpSignatureVerificationError as HttpSignatureError,
 };
-use crate::identity::{did::Did, signatures::ProofType};
+use crate::identity::did::Did;
-use crate::json_signatures::verify::{
+use crate::json_signatures::{
-    get_json_signature,
+    proofs::ProofType,
-    verify_ed25519_json_signature,
+    verify::{
-    verify_eip191_json_signature,
+        get_json_signature,
-    verify_rsa_json_signature,
+        verify_ed25519_json_signature,
-    JsonSignatureVerificationError as JsonSignatureError,
+        verify_eip191_json_signature,
-    JsonSigner,
+        verify_rsa_json_signature,
+        JsonSignatureVerificationError as JsonSignatureError,
+        JsonSigner,
+    },
 };
 use crate::models::{
     profiles::queries::get_profile_by_remote_actor_id,

src/identity/mod.rs

@@ -3,4 +3,3 @@ pub mod did;
 pub mod did_key;
 pub mod did_pkh;
 pub mod minisign;
-pub mod signatures;

src/json_signatures/create.rs

@@ -15,11 +15,11 @@ use mitra_utils::{
 use crate::identity::{
     did_key::DidKey,
     did_pkh::DidPkh,
-    signatures::{
+};
-        PROOF_TYPE_JCS_ED25519,
+use super::proofs::{
-        PROOF_TYPE_JCS_EIP191,
+    PROOF_TYPE_JCS_ED25519,
-        PROOF_TYPE_JCS_RSA,
+    PROOF_TYPE_JCS_EIP191,
-    },
+    PROOF_TYPE_JCS_RSA,
 };
 
 pub(super) const PROOF_KEY: &str = "proof";

src/json_signatures/mod.rs

@@ -1,2 +1,3 @@
 pub mod create;
+pub mod proofs;
 pub mod verify;

src/json_signatures/verify.rs

@@ -19,13 +19,13 @@ use crate::identity::{
     did_key::DidKey,
     did_pkh::DidPkh,
     minisign::verify_ed25519_signature,
-    signatures::ProofType,
 };
 use super::create::{
     IntegrityProof,
     PROOF_KEY,
     PROOF_PURPOSE,
 };
+use super::proofs::ProofType;
 
 #[derive(Debug, PartialEq)]
 pub enum JsonSigner {