refactored fri and plonk test

plonky2_verifier/fri.go

@@ -37,6 +37,7 @@ func NewFriChip(
 		api:          api,
 		fieldAPI:     fieldAPI,
 		qeAPI:        qeAPI,
+		hashAPI:      hashAPI,
 		poseidonChip: poseidonChip,
 		friParams:    friParams,
 	}

plonky2_verifier/fri_test.go

@@ -9,31 +9,73 @@ import (
 	"github.com/consensys/gnark/test"
 )
 
-type TestFibonacciFriCircuit struct{}
+type TestFriCircuit struct {
+	proofWithPIsFilename            string `gnark:"-"`
+	commonCircuitDataFilename       string `gnark:"-"`
+	verifierOnlyCircuitDataFilename string `gnark:"-"`
 
-func (circuit *TestFibonacciFriCircuit) Define(api frontend.API) error {
-	proofWithPis := DeserializeProofWithPublicInputs("./data/fibonacci/proof_with_public_inputs.json")
-	commonCircuitData := DeserializeCommonCircuitData("./data/fibonacci/common_circuit_data.json")
-	verifierOnlyCircuitData := DeserializeVerifierOnlyCircuitData("./data/fibonacci/verifier_only_circuit_data.json")
+	plonkZeta       QuadraticExtension
+	friAlpha        QuadraticExtension
+	friBetas        []QuadraticExtension
+	friPOWResponse  F
+	friQueryIndices []F
+}
 
-	field := NewFieldAPI(api)
-	qe := NewQuadraticExtensionAPI(field, commonCircuitData.DegreeBits)
-	hash := NewHashAPI(field)
-	poseidonChip := poseidon.NewPoseidonChip(api, field)
-	friChip := NewFriChip(api, field, qe, hash, poseidonChip, &commonCircuitData.FriParams)
+func (circuit *TestFriCircuit) Define(api frontend.API) error {
+	proofWithPis := DeserializeProofWithPublicInputs(circuit.proofWithPIsFilename)
+	commonCircuitData := DeserializeCommonCircuitData(circuit.commonCircuitDataFilename)
+	verifierOnlyCircuitData := DeserializeVerifierOnlyCircuitData(circuit.verifierOnlyCircuitDataFilename)
 
-	zeta := QuadraticExtension{
+	fieldAPI := NewFieldAPI(api)
+	qeAPI := NewQuadraticExtensionAPI(fieldAPI, commonCircuitData.DegreeBits)
+	hashAPI := NewHashAPI(fieldAPI)
+	poseidonChip := poseidon.NewPoseidonChip(api, fieldAPI)
+	friChip := NewFriChip(api, fieldAPI, qeAPI, hashAPI, poseidonChip, &commonCircuitData.FriParams)
+
+	friChallenges := FriChallenges{
+		FriAlpha:         circuit.friAlpha,
+		FriBetas:         circuit.friBetas,
+		FriPowResponse:   circuit.friPOWResponse,
+		FriQueryIndicies: circuit.friQueryIndices,
+	}
+
+	initialMerkleCaps := []MerkleCap{
+		verifierOnlyCircuitData.ConstantSigmasCap,
+		proofWithPis.Proof.WiresCap,
+		proofWithPis.Proof.PlonkZsPartialProductsCap,
+		proofWithPis.Proof.QuotientPolysCap,
+	}
+
+	friChip.VerifyFriProof(
+		commonCircuitData.GetFriInstance(qeAPI, circuit.plonkZeta, commonCircuitData.DegreeBits),
+		proofWithPis.Proof.Openings.ToFriOpenings(),
+		&friChallenges,
+		initialMerkleCaps,
+		&proofWithPis.Proof.OpeningProof,
+	)
+
+	return nil
+}
+
+func TestFibonacciFriProof(t *testing.T) {
+	assert := test.NewAssert(t)
+
+	testCase := func() {
+		circuit := TestFriCircuit{
+			proofWithPIsFilename:            "./data/fibonacci/proof_with_public_inputs.json",
+			commonCircuitDataFilename:       "./data/fibonacci/common_circuit_data.json",
+			verifierOnlyCircuitDataFilename: "./data/fibonacci/verifier_only_circuit_data.json",
+			plonkZeta: QuadraticExtension{
 				NewFieldElementFromString("14887793628029982930"),
 				NewFieldElementFromString("1136137158284059037"),
-	}
-	friChallenges := FriChallenges{
-		FriAlpha: QuadraticExtension{
+			},
+			friAlpha: QuadraticExtension{
 				NewFieldElementFromString("14641715242626918707"),
 				NewFieldElementFromString("10574243340537902930"),
 			},
-		FriBetas:       []QuadraticExtension{},
-		FriPowResponse: NewFieldElement(82451580476419),
-		FriQueryIndicies: []F{
+			friBetas:       []QuadraticExtension{},
+			friPOWResponse: NewFieldElement(82451580476419),
+			friQueryIndices: []F{
 				NewFieldElement(6790812084677375942),
 				NewFieldElement(12394212020331474798),
 				NewFieldElement(16457600747000998582),
@@ -64,31 +106,7 @@ func (circuit *TestFibonacciFriCircuit) Define(api frontend.API) error {
 				NewFieldElement(13636347200053048758),
 			},
 		}
-
-	initialMerkleCaps := []MerkleCap{
-		verifierOnlyCircuitData.ConstantSigmasCap,
-		proofWithPis.Proof.WiresCap,
-		proofWithPis.Proof.PlonkZsPartialProductsCap,
-		proofWithPis.Proof.QuotientPolysCap,
-	}
-
-	friChip.VerifyFriProof(
-		commonCircuitData.GetFriInstance(qe, zeta, commonCircuitData.DegreeBits),
-		proofWithPis.Proof.Openings.ToFriOpenings(),
-		&friChallenges,
-		initialMerkleCaps,
-		&proofWithPis.Proof.OpeningProof,
-	)
-
-	return nil
-}
-
-func TestFibonacciFriProof(t *testing.T) {
-	assert := test.NewAssert(t)
-
-	testCase := func() {
-		circuit := TestFibonacciFriCircuit{}
-		witness := TestFibonacciFriCircuit{}
+		witness := TestFriCircuit{}
 		err := test.IsSolved(&circuit, &witness, TEST_CURVE.ScalarField())
 		assert.NoError(err)
 	}
@@ -96,29 +114,23 @@ func TestFibonacciFriProof(t *testing.T) {
 	testCase()
 }
 
-type TestLargeDummyFriCircuit struct{}
+func TestDummyFriProof(t *testing.T) {
+	assert := test.NewAssert(t)
 
-func (circuit *TestLargeDummyFriCircuit) Define(api frontend.API) error {
-	proofWithPis := DeserializeProofWithPublicInputs("./data/dummy_2^14_gates/proof_with_public_inputs.json")
-	commonCircuitData := DeserializeCommonCircuitData("./data/dummy_2^14_gates/common_circuit_data.json")
-	verifierOnlyCircuitData := DeserializeVerifierOnlyCircuitData("./data/dummy_2^14_gates/verifier_only_circuit_data.json")
-
-	field := NewFieldAPI(api)
-	qe := NewQuadraticExtensionAPI(field, commonCircuitData.DegreeBits)
-	hash := NewHashAPI(field)
-	poseidonChip := poseidon.NewPoseidonChip(api, field)
-	friChip := NewFriChip(api, field, qe, hash, poseidonChip, &commonCircuitData.FriParams)
-
-	zeta := QuadraticExtension{
+	testCase := func() {
+		circuit := TestFriCircuit{
+			proofWithPIsFilename:            "./data/dummy_2^14_gates/proof_with_public_inputs.json",
+			commonCircuitDataFilename:       "./data/dummy_2^14_gates/common_circuit_data.json",
+			verifierOnlyCircuitDataFilename: "./data/dummy_2^14_gates/verifier_only_circuit_data.json",
+			plonkZeta: QuadraticExtension{
 				NewFieldElementFromString("17377750363769967882"),
 				NewFieldElementFromString("11921191651424768462"),
-	}
-	friChallenges := FriChallenges{
-		FriAlpha: QuadraticExtension{
+			},
+			friAlpha: QuadraticExtension{
 				NewFieldElementFromString("16721004555774385479"),
 				NewFieldElementFromString("10688151135543754663"),
 			},
-		FriBetas: []QuadraticExtension{
+			friBetas: []QuadraticExtension{
 				{
 					NewFieldElementFromString("3312441922957827805"),
 					NewFieldElementFromString("15128092514958289671"),
@@ -132,8 +144,8 @@ func (circuit *TestLargeDummyFriCircuit) Define(api frontend.API) error {
 					NewFieldElementFromString("5176346568444408396"),
 				},
 			},
-		FriPowResponse: NewFieldElement(4389),
-		FriQueryIndicies: []F{
+			friPOWResponse: NewFieldElement(4389),
+			friQueryIndices: []F{
 				NewFieldElementFromString("16334967868590615051"),
 				NewFieldElementFromString("2911473540496037915"),
 				NewFieldElementFromString("14887216056886344225"),
@@ -164,31 +176,7 @@ func (circuit *TestLargeDummyFriCircuit) Define(api frontend.API) error {
 				NewFieldElementFromString("11238419549114325157"),
 			},
 		}
-
-	initialMerkleCaps := []MerkleCap{
-		verifierOnlyCircuitData.ConstantSigmasCap,
-		proofWithPis.Proof.WiresCap,
-		proofWithPis.Proof.PlonkZsPartialProductsCap,
-		proofWithPis.Proof.QuotientPolysCap,
-	}
-
-	friChip.VerifyFriProof(
-		commonCircuitData.GetFriInstance(qe, zeta, commonCircuitData.DegreeBits),
-		proofWithPis.Proof.Openings.ToFriOpenings(),
-		&friChallenges,
-		initialMerkleCaps,
-		&proofWithPis.Proof.OpeningProof,
-	)
-
-	return nil
-}
-
-func TestLargeDummyFriProof(t *testing.T) {
-	assert := test.NewAssert(t)
-
-	testCase := func() {
-		circuit := TestLargeDummyFriCircuit{}
-		witness := TestLargeDummyFriCircuit{}
+		witness := TestFriCircuit{}
 		err := test.IsSolved(&circuit, &witness, TEST_CURVE.ScalarField())
 		assert.NoError(err)
 	}

plonky2_verifier/plonk_test.go

@@ -8,33 +8,28 @@ import (
 	"github.com/consensys/gnark/test"
 )
 
-type TestPlonkCircuit struct{}
+type TestPlonkCircuit struct {
+	proofWithPIsFilename      string `gnark:"-"`
+	commonCircuitDataFilename string `gnark:"-"`
+
+	plonkBetas  []F
+	plonkGammas []F
+	plonkAlphas []F
+	plonkZeta   QuadraticExtension
+}
 
 func (circuit *TestPlonkCircuit) Define(api frontend.API) error {
-	proofWithPis := DeserializeProofWithPublicInputs("./data/fibonacci/proof_with_public_inputs.json")
-	commonCircuitData := DeserializeCommonCircuitData("./data/fibonacci/common_circuit_data.json")
+	proofWithPis := DeserializeProofWithPublicInputs(circuit.proofWithPIsFilename)
+	commonCircuitData := DeserializeCommonCircuitData(circuit.commonCircuitDataFilename)
 
 	field := NewFieldAPI(api)
 	qe := NewQuadraticExtensionAPI(field, commonCircuitData.DegreeBits)
 
-	// Challenge associated with the data from "/.data/fibonacci/*"
 	proofChallenges := ProofChallenges{
-		PlonkBetas: []F{
-			NewFieldElementFromString("4678728155650926271"),
-			NewFieldElementFromString("13611962404289024887"),
-		},
-		PlonkGammas: []F{
-			NewFieldElementFromString("13237663823305715949"),
-			NewFieldElementFromString("15389314098328235145"),
-		},
-		PlonkAlphas: []F{
-			NewFieldElementFromString("14505919539124304197"),
-			NewFieldElementFromString("1695455639263736117"),
-		},
-		PlonkZeta: QuadraticExtension{
-			NewFieldElementFromString("14887793628029982930"),
-			NewFieldElementFromString("1136137158284059037"),
-		},
+		PlonkBetas:  circuit.plonkBetas,
+		PlonkGammas: circuit.plonkGammas,
+		PlonkAlphas: circuit.plonkAlphas,
+		PlonkZeta:   circuit.plonkZeta,
 	}
 
 	plonkChip := NewPlonkChip(api, qe, commonCircuitData)
@@ -43,11 +38,64 @@ func (circuit *TestPlonkCircuit) Define(api frontend.API) error {
 	return nil
 }
 
-func TestPlonkWitness(t *testing.T) {
+func TestPlonkFibonacci(t *testing.T) {
 	assert := test.NewAssert(t)
 
 	testCase := func() {
-		circuit := TestPlonkCircuit{}
+		circuit := TestPlonkCircuit{
+			proofWithPIsFilename:      "./data/fibonacci/proof_with_public_inputs.json",
+			commonCircuitDataFilename: "./data/fibonacci/common_circuit_data.json",
+
+			plonkBetas: []F{
+				NewFieldElementFromString("4678728155650926271"),
+				NewFieldElementFromString("13611962404289024887"),
+			},
+			plonkGammas: []F{
+				NewFieldElementFromString("13237663823305715949"),
+				NewFieldElementFromString("15389314098328235145"),
+			},
+			plonkAlphas: []F{
+				NewFieldElementFromString("14505919539124304197"),
+				NewFieldElementFromString("1695455639263736117"),
+			},
+			plonkZeta: QuadraticExtension{
+				NewFieldElementFromString("14887793628029982930"),
+				NewFieldElementFromString("1136137158284059037"),
+			},
+		}
+		witness := TestPlonkCircuit{}
+		err := test.IsSolved(&circuit, &witness, TEST_CURVE.ScalarField())
+		assert.NoError(err)
+	}
+
+	testCase()
+}
+
+func TestPlonkDummy(t *testing.T) {
+	assert := test.NewAssert(t)
+
+	testCase := func() {
+		circuit := TestPlonkCircuit{
+			proofWithPIsFilename:      "./data/dummy_2^14_gates/proof_with_public_inputs.json",
+			commonCircuitDataFilename: "./data/dummy_2^14_gates/common_circuit_data.json",
+
+			plonkBetas: []F{
+				NewFieldElementFromString("11216469004148781751"),
+				NewFieldElementFromString("6201977337075152249"),
+			},
+			plonkGammas: []F{
+				NewFieldElementFromString("8369751006669847974"),
+				NewFieldElementFromString("3610024170884289835"),
+			},
+			plonkAlphas: []F{
+				NewFieldElementFromString("970160439138448145"),
+				NewFieldElementFromString("2402201283787401921"),
+			},
+			plonkZeta: QuadraticExtension{
+				NewFieldElementFromString("17377750363769967882"),
+				NewFieldElementFromString("11921191651424768462"),
+			},
+		}
 		witness := TestPlonkCircuit{}
 		err := test.IsSolved(&circuit, &witness, TEST_CURVE.ScalarField())
 		assert.NoError(err)