fix issues
This commit is contained in:
parent
24f8b1ceb9
commit
bcade1a76c
4 changed files with 15 additions and 4 deletions
|
@ -36,7 +36,7 @@ fn main() {
|
|||
|
||||
let prog = artifacts.prog().collect();
|
||||
|
||||
let circuit_primary = NovaComputation(Computation::without_witness(prog));
|
||||
let circuit_primary = NovaComputation::try_from(Computation::without_witness(prog)).unwrap();
|
||||
let circuit_secondary = TrivialTestCircuit::default();
|
||||
|
||||
type C1 = NovaComputation<PallasField>;
|
||||
|
|
|
@ -7,7 +7,6 @@
|
|||
#[cfg(feature = "bellman_extensions")]
|
||||
use bellman_ce::pairing::{ff::ScalarEngine, Engine};
|
||||
|
||||
use nova_snark::traits::Group;
|
||||
use num_bigint::BigUint;
|
||||
use num_traits::{CheckedDiv, One, Zero};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
@ -17,11 +16,15 @@ use std::fmt::{Debug, Display};
|
|||
use std::hash::Hash;
|
||||
use std::ops::{Add, Div, Mul, Sub};
|
||||
|
||||
#[cfg(feature = "bellperson_extensions")]
|
||||
use nova_snark::traits::Group;
|
||||
|
||||
pub trait Pow<RHS> {
|
||||
type Output;
|
||||
fn pow(self, _: RHS) -> Self::Output;
|
||||
}
|
||||
|
||||
#[cfg(feature = "bellperson_extensions")]
|
||||
pub trait Cycle {
|
||||
type Other: Field + BellpersonFieldExtensions + Cycle<Other = Self>;
|
||||
type Point: Group<Base = <<Self::Other as Cycle>::Point as Group>::Scalar>;
|
||||
|
|
|
@ -2,8 +2,12 @@ use ark_pallas::Fr as PallasBaseField;
|
|||
#[cfg(feature = "bellperson_extensions")]
|
||||
use pasta_curves::Fq;
|
||||
|
||||
use crate::{Cycle, G2Type, VestaField};
|
||||
#[cfg(feature = "bellperson_extensions")]
|
||||
use crate::{Cycle, VestaField};
|
||||
|
||||
use crate::G2Type;
|
||||
|
||||
#[cfg(feature = "bellperson_extensions")]
|
||||
impl Cycle for FieldPrime {
|
||||
type Other = VestaField;
|
||||
type Point = pasta_curves::pallas::Point;
|
||||
|
|
|
@ -2,8 +2,12 @@ use ark_vesta::Fr as VestaBaseField;
|
|||
#[cfg(feature = "bellperson_extensions")]
|
||||
use pasta_curves::Fp;
|
||||
|
||||
use crate::{Cycle, G2Type, PallasField};
|
||||
#[cfg(feature = "bellperson_extensions")]
|
||||
use crate::{Cycle, PallasField};
|
||||
|
||||
use crate::G2Type;
|
||||
|
||||
#[cfg(feature = "bellperson_extensions")]
|
||||
impl Cycle for FieldPrime {
|
||||
type Other = PallasField;
|
||||
type Point = pasta_curves::vesta::Point;
|
||||
|
|
Loading…
Reference in a new issue