chore: rename field

Author: apskhem

rust/catalyst-signed-doc-macro/src/field.rs

@@ -0,0 +1,27 @@
+//! Structs for JSON fields.
+
+/// "required" field definition
+#[derive(serde::Deserialize)]
+#[serde(rename_all = "lowercase")]
+#[allow(clippy::missing_docs_in_private_items)]
+pub(crate) enum IsRequired {
+    Yes,
+    Excluded,
+    Optional,
+}
+
+/// Document's metadata fields definition
+#[derive(serde::Deserialize)]
+#[allow(clippy::missing_docs_in_private_items)]
+pub(crate) struct MetadataNode {
+    #[serde(rename = "ref")]
+    pub(crate) content_type: ContentType,
+}
+
+/// `signed_doc.json` "ref" field JSON object
+#[derive(serde::Deserialize)]
+#[allow(clippy::missing_docs_in_private_items)]
+pub(crate) struct ContentType {
+    pub(crate) required: IsRequired,
+    pub(crate) value: Vec<String>,
+}

rust/catalyst-signed-doc-macro/src/lib.rs

@@ -3,6 +3,7 @@
 
 mod error;
 mod rules;
+mod field;
 mod signed_doc_spec;
 mod types_consts;
 

rust/catalyst-signed-doc-macro/src/rules/content_type.rs

@@ -2,14 +2,14 @@
 use proc_macro2::TokenStream;
 use quote::quote;
 
-use crate::signed_doc_spec::{self, field::IsRequired};
+use crate::field;
 
 /// Generating `RefRule` instantiation
-pub(crate) fn ref_rule(ref_spec: &signed_doc_spec::field::ContentType) -> anyhow::Result<TokenStream> {
+pub(crate) fn ref_rule(ref_spec: &field::ContentType) -> anyhow::Result<TokenStream> {
     let optional = match ref_spec.required {
-        IsRequired::Yes => true,
-        IsRequired::Optional => false,
-        IsRequired::Excluded => {
+        field::IsRequired::Yes => true,
+        field::IsRequired::Optional => false,
+        field::IsRequired::Excluded => {
             return Ok(quote! {
                 crate::validator::rules::RefRule::NotSpecified
             });

rust/catalyst-signed-doc-macro/src/signed_doc_spec.rs

@@ -6,6 +6,8 @@ use anyhow::Context;
 use proc_macro2::Ident;
 use quote::format_ident;
 
+use crate::field;
+
 /// Catalyst Signed Document spec representation struct
 #[derive(serde::Deserialize)]
 pub(crate) struct CatalystSignedDocSpec {
@@ -58,34 +60,6 @@ impl CatalystSignedDocSpec {
     }
 }
 
-pub(crate) mod field {
-    /// "required" field definition
-    #[derive(serde::Deserialize)]
-    #[serde(rename_all = "lowercase")]
-    #[allow(clippy::missing_docs_in_private_items)]
-    pub(crate) enum IsRequired {
-        Yes,
-        Excluded,
-        Optional,
-    }
-
-    /// Document's metadata fields definition
-    #[derive(serde::Deserialize)]
-    #[allow(clippy::missing_docs_in_private_items)]
-    pub(crate) struct MetadataNode {
-        #[serde(rename = "ref")]
-        pub(crate) content_type: ContentType,
-    }
-
-    /// `signed_doc.json` "ref" field JSON object
-    #[derive(serde::Deserialize)]
-    #[allow(clippy::missing_docs_in_private_items)]
-    pub(crate) struct ContentType {
-        pub(crate) required: IsRequired,
-        pub(crate) value: Vec<String>,
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;