use correct deserialization

nathanwhit · Mar 19, 2023 · 9eacba9 · 9eacba9
1 parent b0df1e1
commit 9eacba9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/primitives/arkworks/src/ed_on_bls12_377.rs b/primitives/arkworks/src/ed_on_bls12_377.rs
@@ -19,7 +19,7 @@
 
 #![warn(missing_docs)]
 
-use crate::utils::{deserialize_argument, serialize_iter_to_vec, serialize_result};
+use crate::utils::{deserialize_iter_to_vec, serialize_result};
 use ark_ec::{models::CurveConfig, twisted_edwards, AffineRepr, Group, VariableBaseMSM};
 use ark_ed_on_bls12_377::{EdwardsConfig, EdwardsProjective};
 use ark_ff::Zero;
@@ -28,9 +28,10 @@ use sp_std::vec::Vec;
 
 /// Compute a multi scalar multiplication on G! through arkworks
 pub fn msm(bases: Vec<u8>, scalars: Vec<u8>) -> Vec<u8> {
-	let bases: Vec<_> = serialize_iter_to_vec::<twisted_edwards::Affine<EdwardsConfig>>(bases);
+	let bases: Vec<_> =
+		deserialize_iter_to_vec::<twisted_edwards::Affine<EdwardsConfig>>(&bases).unwrap();
 	let scalars: Vec<_> =
-		serialize_iter_to_vec::<<EdwardsConfig as CurveConfig>::ScalarField>(scalars).unwrap();
+		deserialize_iter_to_vec::<<EdwardsConfig as CurveConfig>::ScalarField>(&scalars).unwrap();
 
 	let result = <EdwardsProjective as VariableBaseMSM>::msm(&bases, &scalars).unwrap();
 

diff --git a/primitives/arkworks/src/ed_on_bls12_381.rs b/primitives/arkworks/src/ed_on_bls12_381.rs
@@ -19,7 +19,7 @@
 
 #![warn(missing_docs)]
 
-use crate::utils::{deserialize_argument, serialize_iter_to_vec, serialize_result};
+use crate::utils::{deserialize_iter_to_vec, serialize_result};
 use ark_ec::{
 	models::CurveConfig, short_weierstrass::Affine as SWAffine,
 	twisted_edwards::Affine as TEAffine, AffineRepr, Group, VariableBaseMSM,
@@ -31,9 +31,9 @@ use sp_std::vec::Vec;
 
 /// Compute a multi scalar multiplication on G! through arkworks
 pub fn te_msm(bases: Vec<u8>, scalars: Vec<u8>) -> Vec<u8> {
-	let bases: Vec<_> = serialize_iter_to_vec::<TEAffine<JubjubConfig>>(bases).unwrap();
+	let bases: Vec<_> = deserialize_iter_to_vec::<TEAffine<JubjubConfig>>(&bases).unwrap();
 	let scalars: Vec<_> =
-		serialize_iter_to_vec::<<JubjubConfig as CurveConfig>::ScalarField>(scalars).unwrap();
+		deserialize_iter_to_vec::<<JubjubConfig as CurveConfig>::ScalarField>(&scalars).unwrap();
 
 	let result = <EdwardsProjective as VariableBaseMSM>::msm(&bases, &scalars).unwrap();
 
@@ -42,11 +42,11 @@ pub fn te_msm(bases: Vec<u8>, scalars: Vec<u8>) -> Vec<u8> {
 
 /// Compute a multi scalar multiplication on G! through arkworks
 pub fn sw_msm(bases: Vec<u8>, scalars: Vec<u8>) -> Vec<u8> {
-	let bases: Vec<_> = serialize_iter_to_vec::<SWAffine<JubjubConfig>>(bases).unwrap();
+	let bases: Vec<_> = deserialize_iter_to_vec::<SWAffine<JubjubConfig>>(&bases).unwrap();
 	let scalars: Vec<_> =
-		serialize_iter_to_vec::<<JubjubConfig as CurveConfig>::ScalarField>(scalars).unwrap();
+		deserialize_iter_to_vec::<<JubjubConfig as CurveConfig>::ScalarField>(&scalars).unwrap();
 
-	let result = <SWProjective as VariableBaseMSM>::msm(&bases, &scalars[..]).unwrap();
+	let result = <SWProjective as VariableBaseMSM>::msm(&bases, &scalars).unwrap();
 
 	serialize_result(result)
 }