Validation tweaks

docknetwork · Aug 24, 2023 · dc8eefb · dc8eefb
1 parent 84481da
commit dc8eefb
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/utils/src/owned_pairs.rs b/utils/src/owned_pairs.rs
@@ -7,7 +7,7 @@ use ark_ec::{AffineRepr, VariableBaseMSM};
 use ark_ff::PrimeField;
 use ark_serialize::*;
 
-use serde::{de::Error, Deserializer, Serializer};
+use serde::{de::Error, Deserialize, Deserializer, Serializer};
 use serde_with::{DeserializeAs, SerializeAs};
 use zeroize::Zeroize;
 
@@ -265,6 +265,21 @@ where
     }
 }
 
+impl<'de, Left, Right> Deserialize<'de> for OwnedPairs<Left, Right>
+where
+    Left: Deserialize<'de>,
+    Right: Deserialize<'de>,
+{
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        let (left, right) = <(Vec<Left>, Vec<Right>)>::deserialize(deserializer)?;
+
+        Self::new(left, right).ok_or(serde::de::Error::custom("Invalid length"))
+    }
+}
+
 impl<'de, LeftAs, RightAs, Left, Right> DeserializeAs<'de, OwnedPairs<LeftAs, RightAs>>
     for OwnedPairs<Left, Right>
 where

diff --git a/utils/src/pairs.rs b/utils/src/pairs.rs
@@ -20,7 +20,6 @@ impl<'left, 'right, Left, Right> Clone for Pairs<'left, 'right, Left, Right> {
     }
 }
 
-#[allow(dead_code)]
 impl<'left, 'right, Left, Right> Pairs<'left, 'right, Left, Right> {
     /// Combines two slices together if they have equal length.
     pub fn new(left: &'left [Left], right: &'right [Right]) -> Option<Self> {
@@ -150,7 +149,6 @@ impl<'left, 'right, G: AffineRepr> Pairs<'left, 'right, G, G::ScalarField> {
 }
 
 /// Extension for `OwnedPairs` for cases when left is an `AffineRepr` implementer, and right is a `ScalarField::BigInt` implementer.
-#[allow(dead_code)]
 impl<G: AffineRepr> Pairs<'_, '_, G, <G::ScalarField as PrimeField>::BigInt> {
     /// `G::Group::msm_bigint(left, right)`
     pub fn msm_bigint(&self) -> G::Group {