wip

Author: Mr-Leshiy

rust/catalyst-voting/src/txs/v1/decoding.rs

@@ -143,51 +143,9 @@ impl Tx {
 
 #[cfg(test)]
 mod tests {
-    use proptest::prelude::{any, any_with, Arbitrary, BoxedStrategy, Strategy};
     use test_strategy::proptest;
 
     use super::*;
-    use crate::SecretKey;
-
-    impl Arbitrary for Tx {
-        type Parameters = ();
-        type Strategy = BoxedStrategy<Self>;
-
-        fn arbitrary_with((): Self::Parameters) -> Self::Strategy {
-            any::<([u8; 32], u8, Vote, SecretKey)>()
-                .prop_map(|(vote_plan_id, proposal_index, vote, s)| {
-                    Tx {
-                        vote_plan_id,
-                        proposal_index,
-                        vote,
-                        public_key: s.public_key(),
-                    }
-                })
-                .boxed()
-        }
-    }
-
-    impl Arbitrary for Vote {
-        type Parameters = ();
-        type Strategy = BoxedStrategy<Self>;
-
-        fn arbitrary_with((): Self::Parameters) -> Self::Strategy {
-            any::<bool>()
-                .prop_flat_map(|b| {
-                    if b {
-                        any::<u8>().prop_map(Vote::Public).boxed()
-                    } else {
-                        any::<(u8, u8)>()
-                            .prop_flat_map(|(s1, s2)| {
-                                any_with::<(EncryptedVote, VoterProof)>((s1.into(), s2.into()))
-                                    .prop_map(|(v, p)| Vote::Private(v, p))
-                            })
-                            .boxed()
-                    }
-                })
-                .boxed()
-        }
-    }
 
     #[proptest]
     #[allow(clippy::indexing_slicing)]

rust/catalyst-voting/src/txs/v1/mod.rs

@@ -30,3 +30,51 @@ pub enum Vote {
     /// Private (encrypted) voting choice
     Private(EncryptedVote, VoterProof),
 }
+
+#[cfg(test)]
+mod tests {
+    use proptest::prelude::{any, any_with, Arbitrary, BoxedStrategy, Strategy};
+
+    use super::*;
+    use crate::SecretKey;
+
+    impl Arbitrary for Tx {
+        type Parameters = ();
+        type Strategy = BoxedStrategy<Self>;
+
+        fn arbitrary_with((): Self::Parameters) -> Self::Strategy {
+            any::<([u8; 32], u8, Vote, SecretKey)>()
+                .prop_map(|(vote_plan_id, proposal_index, vote, s)| {
+                    Tx {
+                        vote_plan_id,
+                        proposal_index,
+                        vote,
+                        public_key: s.public_key(),
+                    }
+                })
+                .boxed()
+        }
+    }
+
+    impl Arbitrary for Vote {
+        type Parameters = ();
+        type Strategy = BoxedStrategy<Self>;
+
+        fn arbitrary_with((): Self::Parameters) -> Self::Strategy {
+            any::<bool>()
+                .prop_flat_map(|b| {
+                    if b {
+                        any::<u8>().prop_map(Vote::Public).boxed()
+                    } else {
+                        any::<(u8, u8)>()
+                            .prop_flat_map(|(s1, s2)| {
+                                any_with::<(EncryptedVote, VoterProof)>((s1.into(), s2.into()))
+                                    .prop_map(|(v, p)| Vote::Private(v, p))
+                            })
+                            .boxed()
+                    }
+                })
+                .boxed()
+        }
+    }
+}