Tidy new curves (#26)

Author: davxy

curves/pallas/Cargo.toml

@@ -32,4 +32,8 @@ std = [
   "ark-serialize/std",
   "ark-std/std",
 ]
-parallel = [ "ark-ec/parallel", "ark-ff/parallel", "ark-std/parallel" ]
+parallel = [
+  "ark-ec/parallel",
+  "ark-ff/parallel",
+  "ark-std/parallel"
+]

curves/pallas/LICENSE-APACHE

@@ -1,16 +1,12 @@
-use ark_ff::MontFp;
 use ark_models_ext::{
     models::CurveConfig,
     short_weierstrass::{self, SWCurveConfig},
 };
-use ark_pallas::PallasConfig as ArkConfig;
+use ark_pallas::{PallasConfig as ArkConfig, G_GENERATOR_X, G_GENERATOR_Y};
 use ark_std::marker::PhantomData;
 
-/// G_GENERATOR_X = -1
-pub const G_GENERATOR_X: <ArkConfig as CurveConfig>::BaseField = MontFp!("-1");
-
-/// G_GENERATOR_Y = 2
-pub const G_GENERATOR_Y: <ArkConfig as CurveConfig>::BaseField = MontFp!("2");
+#[cfg(test)]
+mod tests;
 
 pub type Affine<H> = short_weierstrass::Affine<PallasConfig<H>>;
 pub type Projective<H> = short_weierstrass::Projective<PallasConfig<H>>;
@@ -21,16 +17,13 @@ pub struct PallasConfig<H: CurveHooks>(PhantomData<fn() -> H>);
 /// Hooks for *Pallas*.
 pub trait CurveHooks: 'static + Sized {
     /// Short Weierstrass multi scalar multiplication.
-    fn pallas_msm(
+    fn msm(
         bases: &[Affine<Self>],
         scalars: &[<PallasConfig<Self> as CurveConfig>::ScalarField],
-    ) -> Result<Projective<Self>, ()>;
+    ) -> Projective<Self>;
 
     /// Short Weierstrass projective multiplication.
-    fn pallas_mul_projective(
-        base: &Projective<Self>,
-        scalar: &[u64],
-    ) -> Result<Projective<Self>, ()>;
+    fn mul_projective(base: &Projective<Self>, scalar: &[u64]) -> Projective<Self>;
 }
 
 impl<H: CurveHooks> CurveConfig for PallasConfig<H> {
@@ -47,19 +40,18 @@ impl<H: CurveHooks> SWCurveConfig for PallasConfig<H> {
 
     const GENERATOR: Affine<H> = Affine::<H>::new_unchecked(G_GENERATOR_X, G_GENERATOR_Y);
 
-    /// Multi scalar multiplication jumping into the user-defined `pallas_msm` hook.
-    ///
-    /// On any internal error returns `Err(0)`.
+    /// Multi scalar multiplication jumping into the user-defined `msm` hook.
     #[inline(always)]
     fn msm(bases: &[Affine<H>], scalars: &[Self::ScalarField]) -> Result<Projective<H>, usize> {
-        H::pallas_msm(bases, scalars).map_err(|_| 0)
+        if bases.len() != scalars.len() {
+            return Err(bases.len().min(scalars.len()));
+        }
+        Ok(H::msm(bases, scalars))
     }
 
-    /// Projective multiplication jumping into the user-defined `pallas_mul_projective` hook.
-    ///
-    /// On any internal error returns `Projective::zero()`.
+    /// Projective multiplication jumping into the user-defined `mul_projective` hook.
     #[inline(always)]
     fn mul_projective(base: &Projective<H>, scalar: &[u64]) -> Projective<H> {
-        H::pallas_mul_projective(base, scalar).unwrap_or_default()
+        H::mul_projective(base, scalar)
     }
 }

curves/pallas/LICENSE-MIT

@@ -1,11 +1,8 @@
-#[cfg(test)]
-mod tests;
-
 use crate::CurveHooks;
 
 use ark_algebra_test_templates::*;
-use ark_pallas::PallasConfig as ArkConfig;
 use ark_models_ext::CurveConfig;
+use ark_pallas::PallasConfig as ArkConfig;
 
 pub struct TestHooks;
 
@@ -14,19 +11,13 @@ type Affine = crate::Affine<TestHooks>;
 type Projective = crate::Projective<TestHooks>;
 
 impl CurveHooks for TestHooks {
-    fn pallas_msm(
-        bases: &[Affine],
-        scalars: &[<Config as CurveConfig>::ScalarField],
-    ) -> Result<Projective, ()> {
+    fn msm(bases: &[Affine], scalars: &[<Config as CurveConfig>::ScalarField]) -> Projective {
         test_utils::msm_sw_generic::<Config, ArkConfig>(bases, scalars)
     }
 
-    fn pallas_mul_projective(
-        base: &Projective,
-        scalar: &[u64],
-    ) -> Result<Projective, ()> {
+    fn mul_projective(base: &Projective, scalar: &[u64]) -> Projective {
         test_utils::mul_projective_sw_generic::<Config, ArkConfig>(base, scalar)
     }
 }
 
-test_group!(sw; SWProjective; sw);
+test_group!(sw; Projective; sw);

curves/pallas/src/curves/mod.rs

@@ -14,15 +14,6 @@
 //! * Valuation(r - 1, 2) = 32
 
 #![cfg_attr(not(feature = "std"), no_std)]
-#![deny(
-    warnings,
-    unused,
-    future_incompatible,
-    nonstandard_style,
-    rust_2018_idioms,
-    unsafe_code
-)]
-#![allow(clippy::result_unit_err)]
 
 pub mod curves;
 

curves/pallas/src/curves/tests.rs

@@ -32,4 +32,8 @@ std = [
   "ark-serialize/std",
   "ark-std/std",
 ]
-parallel = [ "ark-ec/parallel", "ark-ff/parallel", "ark-std/parallel" ]
+parallel = [
+  "ark-ec/parallel",
+  "ark-ff/parallel",
+  "ark-std/parallel"
+]