move Uuid impl to seprate mod

Author: Mr-Leshiy

rust/vote-tx-v2/src/gen_tx/builder.rs

@@ -3,10 +3,9 @@
 use anyhow::ensure;
 
 use super::{
-    cose_protected_header, EncodedCbor, EventKey, EventMap, GeneralizedTx, TxBody, Uuid, Vote,
-    VoterData,
+    cose_protected_header, EncodedCbor, EventKey, EventMap, GeneralizedTx, TxBody, Vote, VoterData,
 };
-use crate::Cbor;
+use crate::{uuid::Uuid, Cbor};
 
 /// `GeneralizedTx` builder struct
 #[allow(clippy::module_name_repetitions)]

rust/vote-tx-v2/src/gen_tx/mod.rs

@@ -32,18 +32,11 @@ where
     signature: coset::CoseSign,
 }
 
-/// A UUID struct, CBOR tag 37.
-#[derive(Debug, Clone, PartialEq)]
-pub struct Uuid(pub Vec<u8>);
-
 /// An encoded CBOR struct, CBOR tag 24.
 #[derive(Debug, Clone, PartialEq)]
 pub struct EncodedCbor<T>(T)
 where T: for<'a> Cbor<'a>;
 
-/// UUID CBOR tag <https://www.iana.org/assignments/cbor-tags/cbor-tags.xhtml/>.
-const UUID_TAG: u64 = 37;
-
 /// encoded-cbor CBOR tag <https://www.iana.org/assignments/cbor-tags/cbor-tags.xhtml/>.
 const ENCODED_CBOR_TAG: u64 = 24;
 
@@ -116,30 +109,6 @@ where
     }
 }
 
-impl Decode<'_, ()> for Uuid {
-    fn decode(d: &mut Decoder<'_>, (): &mut ()) -> Result<Self, minicbor::decode::Error> {
-        let tag = d.tag()?;
-        if UUID_TAG != tag.as_u64() {
-            return Err(minicbor::decode::Error::message(format!(
-                "tag value must be: {UUID_TAG}, provided: {}",
-                tag.as_u64(),
-            )));
-        }
-        let choice = d.bytes()?.to_vec();
-        Ok(Self(choice))
-    }
-}
-
-impl Encode<()> for Uuid {
-    fn encode<W: minicbor::encode::Write>(
-        &self, e: &mut minicbor::Encoder<W>, (): &mut (),
-    ) -> Result<(), minicbor::encode::Error<W::Error>> {
-        e.tag(Tag::new(UUID_TAG))?;
-        e.bytes(&self.0)?;
-        Ok(())
-    }
-}
-
 impl<T> Decode<'_, ()> for EncodedCbor<T>
 where T: for<'a> Cbor<'a>
 {
@@ -200,6 +169,7 @@ mod tests {
     use test_strategy::proptest;
 
     use super::*;
+    use crate::uuid::Uuid;
 
     type ChoiceT = Vec<u8>;
     type ProofT = Vec<u8>;

rust/vote-tx-v2/src/gen_tx/tx_body.rs

@@ -2,8 +2,8 @@
 
 use minicbor::{Decode, Decoder, Encode, Encoder};
 
-use super::{EncodedCbor, EventMap, Uuid, Vote};
-use crate::Cbor;
+use super::{EncodedCbor, EventMap, Vote};
+use crate::{uuid::Uuid, Cbor};
 
 /// `TxBody` array struct length
 const TX_BODY_LEN: u64 = 4;

rust/vote-tx-v2/src/lib.rs

@@ -8,6 +8,7 @@ use minicbor::{Decode, Decoder, Encode, Encoder};
 
 pub mod gen_tx;
 pub mod public_tx;
+pub mod uuid;
 
 /// Cbor encodable and decodable type trait.
 pub trait Cbor<'a> {

rust/vote-tx-v2/src/public_tx/prop_id.rs

@@ -2,7 +2,7 @@
 
 use minicbor::{Decode, Encode};
 
-use crate::gen_tx::Uuid;
+use crate::uuid::Uuid;
 
 /// A public voting proposal id struct.
 pub struct PropId(Uuid);

rust/vote-tx-v2/src/uuid.rs

@@ -0,0 +1,34 @@
+//! A CBOR encoded/decoded UUID struct.
+
+use minicbor::{data::Tag, Decode, Decoder, Encode};
+
+/// UUID CBOR tag <https://www.iana.org/assignments/cbor-tags/cbor-tags.xhtml/>.
+const UUID_TAG: u64 = 37;
+
+/// A UUID struct, CBOR tag 37.
+#[derive(Debug, Clone, PartialEq)]
+pub struct Uuid(pub Vec<u8>);
+
+impl Decode<'_, ()> for Uuid {
+    fn decode(d: &mut Decoder<'_>, (): &mut ()) -> Result<Self, minicbor::decode::Error> {
+        let tag = d.tag()?;
+        if UUID_TAG != tag.as_u64() {
+            return Err(minicbor::decode::Error::message(format!(
+                "tag value must be: {UUID_TAG}, provided: {}",
+                tag.as_u64(),
+            )));
+        }
+        let choice = d.bytes()?.to_vec();
+        Ok(Self(choice))
+    }
+}
+
+impl Encode<()> for Uuid {
+    fn encode<W: minicbor::encode::Write>(
+        &self, e: &mut minicbor::Encoder<W>, (): &mut (),
+    ) -> Result<(), minicbor::encode::Error<W::Error>> {
+        e.tag(Tag::new(UUID_TAG))?;
+        e.bytes(&self.0)?;
+        Ok(())
+    }
+}