Test plonk backend serialization

.gitignore

@@ -4,3 +4,7 @@
 
 # These are backup files generated by rustfmt
 **/*.rs.bk
+
+# nargo (integration tests)
+tests/test_programs/*/target
+tests/test_programs/*/proofs

Cargo.toml

@@ -6,7 +6,8 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-acvm = { git = "https://github.com/noir-lang/acvm" }
+# acvm = { git = "https://github.com/noir-lang/acvm" }
+acvm = "0.5"
 
 ark-ff = "0.4.0"
 ark-bls12-381 = "0.4.0"
@@ -19,6 +20,7 @@ cfg-if = "1"
 hex = "0.4"
 hex-literal = "0.3.4"
 thiserror = "1.0"
+rand = "0.8"
 
 [profile.test]
 opt-level = 3
@@ -30,5 +32,6 @@ debug-assertions = true
 [features]
 default = ["bn254", "groth16"]
 groth16 = []
+plonk = []
 bn254 = ["acvm/bn254"]
 bls12_381 = ["acvm/bls12_381"]

Makefile

@@ -9,14 +9,18 @@ build-go:
 # Temporary solution for testing the only tests we have. We should test recurively.
 test-go: 
 	$ cd ${FFI_LIB_PATH}; \
-		go test -run '' gnark_backend_ffi/structs
+		go test -run '' gnark_backend_ffi/backend/groth16; \
+		go test -run '' gnark_backend_ffi/backend/plonk
 
 build: build-go
 	$ RUSTFLAGS="-L${FFI_LIB_PATH}" cargo build
 
 test: build-go
-	$ RUSTFLAGS="-L${FFI_LIB_PATH}" cargo test
+	$ RUSTFLAGS="-L${FFI_LIB_PATH}" cargo test ${TEST} -- --nocapture
 
 clippy:
 	$ cargo clippy --all-targets -- -D warnings
 
+nargo:
+	$ cargo install --force --locked --git https://github.com/lambdaclass/noir --branch fork nargo
+

build.rs

@@ -1,8 +1,22 @@
-#[allow(clippy::all)]
+fn build_go_backend() {
+    std::process::Command::new("make")
+        .arg("-C")
+        .arg(
+            std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"))
+                .to_str()
+                .unwrap(),
+        )
+        .arg("build-go")
+        .spawn()
+        .unwrap();
+}
+
 fn main() {
+    build_go_backend();
+
     let path = "gnark_backend_ffi";
     let lib = "gnark_backend";
 
-    println!("cargo:rustc-link-search=native={}", path);
-    println!("cargo:rustc-link-lib=static={}", lib);
+    println!("cargo:rustc-link-search=native={path}");
+    println!("cargo:rustc-link-lib=static={lib}");
 }

gnark_backend_ffi/structs/add_term.go → gnark_backend_ffi/backend/add_term.go

@@ -1,4 +1,4 @@
-package structs
+package backend
 
 import (
 	"encoding/json"

gnark_backend_ffi/structs/add_term_test.go → gnark_backend_ffi/backend/add_term_test.go

@@ -1,4 +1,4 @@
-package structs
+package backend
 
 import (
 	"encoding/json"

gnark_backend_ffi/backend/groth16/helpers.go

@@ -0,0 +1,36 @@
+package groth16
+
+import (
+	"encoding/json"
+	"log"
+)
+
+func UncheckedDeserializeRawGate(rawGate string) RawGate {
+	var r RawGate
+	err := json.Unmarshal([]byte(rawGate), &r)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	return r
+}
+
+func UncheckedDeserializeRawGates(rawGates string) []RawGate {
+	var r []RawGate
+	err := json.Unmarshal([]byte(rawGates), &r)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	return r
+}
+
+func UncheckedDeserializeRawR1CS(rawR1CS string) RawR1CS {
+	var r RawR1CS
+	err := json.Unmarshal([]byte(rawR1CS), &r)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	return r
+}

gnark_backend_ffi/structs/raw_gate.go → gnark_backend_ffi/backend/groth16/raw_gate.go

@@ -1,15 +1,16 @@
-package structs
+package groth16
 
 import (
 	"encoding/json"
+	"gnark_backend_ffi/backend"
 	"log"
 
 	fr_bn254 "github.com/consensys/gnark-crypto/ecc/bn254/fr"
 )
 
 type RawGate struct {
-	MulTerms     []MulTerm
-	AddTerms     []AddTerm
+	MulTerms     []backend.MulTerm
+	AddTerms     []backend.AddTerm
 	ConstantTerm fr_bn254.Element
 }
 
@@ -21,8 +22,8 @@ func (g *RawGate) UnmarshalJSON(data []byte) error {
 		return err
 	}
 
-	var mulTerms []MulTerm
-	var addTerms []AddTerm
+	var mulTerms []backend.MulTerm
+	var addTerms []backend.AddTerm
 	var constantTerm fr_bn254.Element
 
 	// Deserialize mul terms.
@@ -61,7 +62,7 @@ func (g *RawGate) UnmarshalJSON(data []byte) error {
 
 	// Deserialize constant term.
 	if encodedConstantTerm, ok := rawGateMap["constant_term"].(string); ok {
-		constantTerm = DeserializeFelt(encodedConstantTerm)
+		constantTerm = backend.DeserializeFelt(encodedConstantTerm)
 	} else {
 		log.Fatal("Error: coefficient is not a felt.")
 		return &json.UnmarshalTypeError{}

gnark_backend_ffi/structs/raw_gate_test.go → gnark_backend_ffi/backend/groth16/raw_gate_test.go

@@ -1,8 +1,9 @@
-package structs
+package groth16
 
 import (
 	"encoding/json"
 	"fmt"
+	"gnark_backend_ffi/backend"
 	"log"
 	"math/rand"
 	"testing"
@@ -13,13 +14,13 @@ import (
 // TODO: Test error cases.
 
 func TestRawGateTermUnmarshalJSON(t *testing.T) {
-	encodedCoefficient, _ := SampleEncodedFelt()
+	encodedCoefficient, _ := backend.SampleEncodedFelt()
 	multiplicand := rand.Uint32()
 	multiplier := rand.Uint32()
 	sum := rand.Uint32()
 	mulTerms := fmt.Sprintf(`[{"coefficient":"%s","multiplicand":%d,"multiplier":%d},{"coefficient":"%s","multiplicand":%d,"multiplier":%d}]`, encodedCoefficient, multiplicand, multiplier, encodedCoefficient, multiplicand, multiplier)
 	addTerms := fmt.Sprintf(`[{"coefficient":"%s","sum":%d},{"coefficient":"%s","sum":%d}]`, encodedCoefficient, sum, encodedCoefficient, sum)
-	encodedConstantTerm, nonEncodedConstantTerm := SampleEncodedFelt()
+	encodedConstantTerm, nonEncodedConstantTerm := backend.SampleEncodedFelt()
 	rawGate := fmt.Sprintf(`{"mul_terms":%s,"add_terms":%s,"constant_term":"%s"}`, mulTerms, addTerms, encodedConstantTerm)
 
 	var r RawGate
@@ -29,19 +30,19 @@ func TestRawGateTermUnmarshalJSON(t *testing.T) {
 	}
 
 	assert.NoError(t, err)
-	assert.Equal(t, UncheckedDeserializeMulTerms(mulTerms), r.MulTerms)
-	assert.Equal(t, UncheckedDeserializeAddTerms(addTerms), r.AddTerms)
+	assert.Equal(t, backend.UncheckedDeserializeMulTerms(mulTerms), r.MulTerms)
+	assert.Equal(t, backend.UncheckedDeserializeAddTerms(addTerms), r.AddTerms)
 	assert.Equal(t, nonEncodedConstantTerm, r.ConstantTerm)
 }
 
 func TestRawGatesTermUnmarshalJSON(t *testing.T) {
-	encodedCoefficient, _ := SampleEncodedFelt()
+	encodedCoefficient, _ := backend.SampleEncodedFelt()
 	multiplicand := rand.Uint32()
 	multiplier := rand.Uint32()
 	sum := rand.Uint32()
 	mulTerms := fmt.Sprintf(`[{"coefficient":"%s","multiplicand":%d,"multiplier":%d},{"coefficient":"%s","multiplicand":%d,"multiplier":%d}]`, encodedCoefficient, multiplicand, multiplier, encodedCoefficient, multiplicand, multiplier)
 	addTerms := fmt.Sprintf(`[{"coefficient":"%s","sum":%d},{"coefficient":"%s","sum":%d}]`, encodedCoefficient, sum, encodedCoefficient, sum)
-	encodedConstantTerm, nonEncodedConstantTerm := SampleEncodedFelt()
+	encodedConstantTerm, nonEncodedConstantTerm := backend.SampleEncodedFelt()
 	rawGate := fmt.Sprintf(`{"mul_terms":%s,"add_terms":%s,"constant_term":"%s"}`, mulTerms, addTerms, encodedConstantTerm)
 	rawGates := fmt.Sprintf(`[%s,%s]`, rawGate, rawGate)
 
@@ -53,8 +54,8 @@ func TestRawGatesTermUnmarshalJSON(t *testing.T) {
 
 	assert.NoError(t, err)
 	for _, rawGate := range r {
-		assert.Equal(t, UncheckedDeserializeMulTerms(mulTerms), rawGate.MulTerms)
-		assert.Equal(t, UncheckedDeserializeAddTerms(addTerms), rawGate.AddTerms)
+		assert.Equal(t, backend.UncheckedDeserializeMulTerms(mulTerms), rawGate.MulTerms)
+		assert.Equal(t, backend.UncheckedDeserializeAddTerms(addTerms), rawGate.AddTerms)
 		assert.Equal(t, nonEncodedConstantTerm, rawGate.ConstantTerm)
 	}
 }

gnark_backend_ffi/structs/raw_r1cs.go → gnark_backend_ffi/backend/groth16/raw_r1cs.go

@@ -1,16 +1,16 @@
-package structs
+package groth16
 
 import (
 	"encoding/json"
-	"fmt"
+	"gnark_backend_ffi/backend"
 	"log"
 
 	fr_bn254 "github.com/consensys/gnark-crypto/ecc/bn254/fr"
 )
 
 type RawR1CS struct {
 	Gates          []RawGate
-	PublicInputs   Witnesses
+	PublicInputs   backend.Witnesses
 	Values         fr_bn254.Vector
 	NumVariables   uint64
 	NumConstraints uint64
@@ -25,7 +25,7 @@ func (r *RawR1CS) UnmarshalJSON(data []byte) error {
 	}
 
 	var gates []RawGate
-	var publicInputs Witnesses
+	var publicInputs backend.Witnesses
 	var values fr_bn254.Vector
 	var numVariables uint64
 	var numConstraints uint64
@@ -65,7 +65,7 @@ func (r *RawR1CS) UnmarshalJSON(data []byte) error {
 
 	// Deserialize values.
 	if encodedValues, ok := rawR1CSMap["values"].(string); ok {
-		values = DeserializeFelts(encodedValues)
+		values = backend.DeserializeFelts(encodedValues)
 	} else {
 		log.Fatal("Error: couldn't deserialize values.")
 		return &json.UnmarshalTypeError{}
@@ -80,7 +80,6 @@ func (r *RawR1CS) UnmarshalJSON(data []byte) error {
 	}
 
 	// Deserialize num_constraints.
-	fmt.Println("", rawR1CSMap["num_constraints"])
 	if numConstraintsValue, ok := rawR1CSMap["num_constraints"].(float64); ok {
 		numConstraints = uint64(numConstraintsValue)
 	} else {

gnark_backend_ffi/structs/raw_r1cs_test.go → gnark_backend_ffi/backend/groth16/raw_r1cs_test.go

@@ -1,8 +1,9 @@
-package structs
+package groth16
 
 import (
 	"encoding/json"
 	"fmt"
+	"gnark_backend_ffi/backend"
 	"math/rand"
 	"testing"
 
@@ -12,17 +13,17 @@ import (
 // TODO: Test error cases.
 
 func TestRawR1CSTermUnmarshalJSON(t *testing.T) {
-	encodedCoefficient, _ := SampleEncodedFelt()
+	encodedCoefficient, _ := backend.SampleEncodedFelt()
 	multiplicand := rand.Uint32()
 	multiplier := rand.Uint32()
 	sum := rand.Uint32()
 	mulTerms := fmt.Sprintf(`[{"coefficient":"%s","multiplicand":%d,"multiplier":%d},{"coefficient":"%s","multiplicand":%d,"multiplier":%d}]`, encodedCoefficient, multiplicand, multiplier, encodedCoefficient, multiplicand, multiplier)
 	addTerms := fmt.Sprintf(`[{"coefficient":"%s","sum":%d},{"coefficient":"%s","sum":%d}]`, encodedCoefficient, sum, encodedCoefficient, sum)
-	encodedConstantTerm, _ := SampleEncodedFelt()
+	encodedConstantTerm, _ := backend.SampleEncodedFelt()
 	rawGate := fmt.Sprintf(`{"mul_terms":%s,"add_terms":%s,"constant_term":"%s"}`, mulTerms, addTerms, encodedConstantTerm)
 	rawGates := fmt.Sprintf(`[%s,%s]`, rawGate, rawGate)
 	publicInputs := fmt.Sprintf("[%d,%d,%d]", multiplicand, multiplier, sum)
-	encodedValues, nonEncodedValues := SampleEncodedFelts()
+	encodedValues, nonEncodedValues := backend.SampleEncodedFelts()
 	numVariables := uint64(10)
 	numConstraints := uint64(10)
 	rawR1CS := fmt.Sprintf(`{"gates":%s,"public_inputs":%s,"values":"%s","num_variables":%d,"num_constraints":%d}`, rawGates, publicInputs, encodedValues, numVariables, numConstraints)
@@ -32,7 +33,7 @@ func TestRawR1CSTermUnmarshalJSON(t *testing.T) {
 
 	assert.NoError(t, err)
 	assert.Equal(t, UncheckedDeserializeRawGates(rawGates), r.Gates)
-	assert.Equal(t, Witnesses{multiplicand, multiplier, sum}, r.PublicInputs)
+	assert.Equal(t, backend.Witnesses{multiplicand, multiplier, sum}, r.PublicInputs)
 	assert.Equal(t, nonEncodedValues, r.Values)
 	assert.Equal(t, numConstraints, r.NumConstraints)
 	assert.Equal(t, numVariables, r.NumVariables)