move definition of public_tx/choice and public_tx/proof to the public…

…_tx/vote mod

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

@@ -1,19 +1,14 @@
 //! A Catalyst public vote transaction v2 object, structured following this
 //! [spec](https://input-output-hk.github.io/catalyst-libs/architecture/08_concepts/catalyst_voting/v2/#public-vote)
 
-mod choice;
-mod proof;
+mod vote;
 
 use std::ops::{Deref, DerefMut};
 
-pub use choice::Choice;
 use minicbor::{Decode, Encode};
-pub use proof::Proof;
+pub use vote::{Choice, Proof, PropId};
 
-use crate::{gen_tx::GeneralizedTx, uuid::Uuid, Cbor};
-
-/// A public voting proposal id struct.
-pub type PropId = Uuid;
+use crate::{gen_tx::GeneralizedTx, Cbor};
 
 /// A public vote tx struct.
 #[derive(Debug, Clone, PartialEq)]

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

@@ -0,0 +1,47 @@
+//! A public vote tx vote objects.
+
+use minicbor::{Decode, Encode};
+
+use crate::uuid::Uuid;
+
+/// A public voting choice struct.
+#[derive(Debug, Clone, PartialEq)]
+pub struct Choice(pub u64);
+
+/// A public voting proof struct, CBOR `undefined`.
+#[derive(Debug, Clone, PartialEq)]
+pub struct Proof;
+
+/// A public voting proposal id struct.
+pub type PropId = Uuid;
+
+impl Decode<'_, ()> for Choice {
+    fn decode(d: &mut minicbor::Decoder<'_>, (): &mut ()) -> Result<Self, minicbor::decode::Error> {
+        let choice = d.u64()?;
+        Ok(Self(choice))
+    }
+}
+
+impl Encode<()> for Choice {
+    fn encode<W: minicbor::encode::Write>(
+        &self, e: &mut minicbor::Encoder<W>, (): &mut (),
+    ) -> Result<(), minicbor::encode::Error<W::Error>> {
+        self.0.encode(e, &mut ())
+    }
+}
+
+impl Decode<'_, ()> for Proof {
+    fn decode(d: &mut minicbor::Decoder<'_>, (): &mut ()) -> Result<Self, minicbor::decode::Error> {
+        d.undefined()?;
+        Ok(Self)
+    }
+}
+
+impl Encode<()> for Proof {
+    fn encode<W: minicbor::encode::Write>(
+        &self, e: &mut minicbor::Encoder<W>, (): &mut (),
+    ) -> Result<(), minicbor::encode::Error<W::Error>> {
+        e.undefined()?;
+        Ok(())
+    }
+}