M src/constraints.rs → src/constraints.rs

@@ -23,10 +23,10 @@ alloc::{AllocVar, AllocationMode},
   fields::fp::FpVar,
   prelude::{Boolean, EqGadget, FieldVar},
 };
+<<<<<<< HEAD
 use ark_relations::r1cs::{ConstraintSynthesizer, ConstraintSystemRef, Namespace, SynthesisError};
-use ark_sponge::{
-  constraints::CryptographicSpongeVar,
-  poseidon::{constraints::PoseidonSpongeVar, PoseidonParameters},
+=======
+use ark_relations::{
 };
 use rand::{CryptoRng, Rng};
 

M src/r1csproof.rs → src/r1csproof.rs

@@ -11,7 +11,10 @@
 use super::commitments::MultiCommitGens;
 use super::dense_mlpoly::{DensePolynomial, EqPolynomial, PolyCommitmentGens};
 use super::errors::ProofVerifyError;
-
+use super::group::{
+  CompressGroupElement, DecompressGroupElement, GroupElement, VartimeMultiscalarMul,
+};
+use super::nizk::{EqualityProof, KnowledgeProof, ProductProof};
 use super::r1csinstance::R1CSInstance;
 
 use super::scalar::Scalar;

M src/sparse_mlpoly.rs → src/sparse_mlpoly.rs

@@ -1650,7 +1650,11 @@ }
 
 #[cfg(test)]
 mod tests {
+<<<<<<< HEAD
   use crate::parameters::poseidon_params;
+=======
+  use crate::{parameters::poseidon_params};
+>>>>>>> implement spartan verifier as a circuit and verify it with groth16
 
   use super::*;
   use ark_std::UniformRand;