Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Commit 59f25fb

Browse files
author
Achim Schneider
committed
Revert "use correct deserialization"
This reverts commit 9eacba9.
1 parent 435dab5 commit 59f25fb

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

primitives/arkworks/src/ed_on_bls12_377.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
2020
#![warn(missing_docs)]
2121

22-
use crate::utils::{deserialize_iter_to_vec, serialize_result};
22+
use crate::utils::{deserialize_argument, serialize_iter_to_vec, serialize_result};
2323
use ark_ec::{models::CurveConfig, twisted_edwards, AffineRepr, Group, VariableBaseMSM};
2424
use ark_ed_on_bls12_377::{EdwardsConfig, EdwardsProjective};
2525
use ark_ff::Zero;
@@ -28,10 +28,9 @@ use sp_std::vec::Vec;
2828

2929
/// Compute a multi scalar multiplication on G! through arkworks
3030
pub fn msm(bases: Vec<u8>, scalars: Vec<u8>) -> Vec<u8> {
31-
let bases: Vec<_> =
32-
deserialize_iter_to_vec::<twisted_edwards::Affine<EdwardsConfig>>(&bases).unwrap();
31+
let bases: Vec<_> = serialize_iter_to_vec::<twisted_edwards::Affine<EdwardsConfig>>(bases);
3332
let scalars: Vec<_> =
34-
deserialize_iter_to_vec::<<EdwardsConfig as CurveConfig>::ScalarField>(&scalars).unwrap();
33+
serialize_iter_to_vec::<<EdwardsConfig as CurveConfig>::ScalarField>(scalars).unwrap();
3534

3635
let result = <EdwardsProjective as VariableBaseMSM>::msm(&bases, &scalars).unwrap();
3736

primitives/arkworks/src/ed_on_bls12_381.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
2020
#![warn(missing_docs)]
2121

22-
use crate::utils::{deserialize_iter_to_vec, serialize_result};
22+
use crate::utils::{deserialize_argument, serialize_iter_to_vec, serialize_result};
2323
use ark_ec::{
2424
models::CurveConfig, short_weierstrass::Affine as SWAffine,
2525
twisted_edwards::Affine as TEAffine, AffineRepr, Group, VariableBaseMSM,
@@ -31,9 +31,9 @@ use sp_std::vec::Vec;
3131

3232
/// Compute a multi scalar multiplication on G! through arkworks
3333
pub fn te_msm(bases: Vec<u8>, scalars: Vec<u8>) -> Vec<u8> {
34-
let bases: Vec<_> = deserialize_iter_to_vec::<TEAffine<JubjubConfig>>(&bases).unwrap();
34+
let bases: Vec<_> = serialize_iter_to_vec::<TEAffine<JubjubConfig>>(bases).unwrap();
3535
let scalars: Vec<_> =
36-
deserialize_iter_to_vec::<<JubjubConfig as CurveConfig>::ScalarField>(&scalars).unwrap();
36+
serialize_iter_to_vec::<<JubjubConfig as CurveConfig>::ScalarField>(scalars).unwrap();
3737

3838
let result = <EdwardsProjective as VariableBaseMSM>::msm(&bases, &scalars).unwrap();
3939

@@ -42,11 +42,11 @@ pub fn te_msm(bases: Vec<u8>, scalars: Vec<u8>) -> Vec<u8> {
4242

4343
/// Compute a multi scalar multiplication on G! through arkworks
4444
pub fn sw_msm(bases: Vec<u8>, scalars: Vec<u8>) -> Vec<u8> {
45-
let bases: Vec<_> = deserialize_iter_to_vec::<SWAffine<JubjubConfig>>(&bases).unwrap();
45+
let bases: Vec<_> = serialize_iter_to_vec::<SWAffine<JubjubConfig>>(bases).unwrap();
4646
let scalars: Vec<_> =
47-
deserialize_iter_to_vec::<<JubjubConfig as CurveConfig>::ScalarField>(&scalars).unwrap();
47+
serialize_iter_to_vec::<<JubjubConfig as CurveConfig>::ScalarField>(scalars).unwrap();
4848

49-
let result = <SWProjective as VariableBaseMSM>::msm(&bases, &scalars).unwrap();
49+
let result = <SWProjective as VariableBaseMSM>::msm(&bases, &scalars[..]).unwrap();
5050

5151
serialize_result(result)
5252
}

0 commit comments

Comments
 (0)