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,60 +9,34 @@ 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 {
+	plonkZeta       QuadraticExtension
-	proofWithPis := DeserializeProofWithPublicInputs("./data/fibonacci/proof_with_public_inputs.json")
+	friAlpha        QuadraticExtension
-	commonCircuitData := DeserializeCommonCircuitData("./data/fibonacci/common_circuit_data.json")
+	friBetas        []QuadraticExtension
-	verifierOnlyCircuitData := DeserializeVerifierOnlyCircuitData("./data/fibonacci/verifier_only_circuit_data.json")
+	friPOWResponse  F
+	friQueryIndices []F
+}
 
-	field := NewFieldAPI(api)
+func (circuit *TestFriCircuit) Define(api frontend.API) error {
-	qe := NewQuadraticExtensionAPI(field, commonCircuitData.DegreeBits)
+	proofWithPis := DeserializeProofWithPublicInputs(circuit.proofWithPIsFilename)
-	hash := NewHashAPI(field)
+	commonCircuitData := DeserializeCommonCircuitData(circuit.commonCircuitDataFilename)
-	poseidonChip := poseidon.NewPoseidonChip(api, field)
+	verifierOnlyCircuitData := DeserializeVerifierOnlyCircuitData(circuit.verifierOnlyCircuitDataFilename)
-	friChip := NewFriChip(api, field, qe, hash, poseidonChip, &commonCircuitData.FriParams)
+
+	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)
 
-	zeta := QuadraticExtension{
-		NewFieldElementFromString("14887793628029982930"),
-		NewFieldElementFromString("1136137158284059037"),
-	}
 	friChallenges := FriChallenges{
-		FriAlpha: QuadraticExtension{
+		FriAlpha:         circuit.friAlpha,
-			NewFieldElementFromString("14641715242626918707"),
+		FriBetas:         circuit.friBetas,
-			NewFieldElementFromString("10574243340537902930"),
+		FriPowResponse:   circuit.friPOWResponse,
-		},
+		FriQueryIndicies: circuit.friQueryIndices,
-		FriBetas:       []QuadraticExtension{},
-		FriPowResponse: NewFieldElement(82451580476419),
-		FriQueryIndicies: []F{
-			NewFieldElement(6790812084677375942),
-			NewFieldElement(12394212020331474798),
-			NewFieldElement(16457600747000998582),
-			NewFieldElement(1543271328932331916),
-			NewFieldElement(12115726870906958644),
-			NewFieldElement(6775897107605342797),
-			NewFieldElement(15989401564746021030),
-			NewFieldElement(10691676456016926845),
-			NewFieldElement(1632499470630032007),
-			NewFieldElement(1317292355445098328),
-			NewFieldElement(18391440812534384252),
-			NewFieldElement(17321705613231354333),
-			NewFieldElement(6176487551308859603),
-			NewFieldElement(7119835651572002873),
-			NewFieldElement(3903019169623116693),
-			NewFieldElement(4886491111111487546),
-			NewFieldElement(4087641893164620518),
-			NewFieldElement(13801643080324181364),
-			NewFieldElement(16993775312274189321),
-			NewFieldElement(9268202926222765679),
-			NewFieldElement(10683001302406181735),
-			NewFieldElement(13359465725531647963),
-			NewFieldElement(4523327590105620849),
-			NewFieldElement(4883588003760409588),
-			NewFieldElement(187699146998097671),
-			NewFieldElement(14489263557623716717),
-			NewFieldElement(11748359318238148146),
-			NewFieldElement(13636347200053048758),
-		},
 	}
 
 	initialMerkleCaps := []MerkleCap{
@@ -73,7 +47,7 @@ func (circuit *TestFibonacciFriCircuit) Define(api frontend.API) error {
 	}
 
 	friChip.VerifyFriProof(
-		commonCircuitData.GetFriInstance(qe, zeta, commonCircuitData.DegreeBits),
+		commonCircuitData.GetFriInstance(qeAPI, circuit.plonkZeta, commonCircuitData.DegreeBits),
 		proofWithPis.Proof.Openings.ToFriOpenings(),
 		&friChallenges,
 		initialMerkleCaps,
@@ -87,8 +61,52 @@ func TestFibonacciFriProof(t *testing.T) {
 	assert := test.NewAssert(t)
 
 	testCase := func() {
-		circuit := TestFibonacciFriCircuit{}
+		circuit := TestFriCircuit{
-		witness := TestFibonacciFriCircuit{}
+			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"),
+			},
+			friAlpha: QuadraticExtension{
+				NewFieldElementFromString("14641715242626918707"),
+				NewFieldElementFromString("10574243340537902930"),
+			},
+			friBetas:       []QuadraticExtension{},
+			friPOWResponse: NewFieldElement(82451580476419),
+			friQueryIndices: []F{
+				NewFieldElement(6790812084677375942),
+				NewFieldElement(12394212020331474798),
+				NewFieldElement(16457600747000998582),
+				NewFieldElement(1543271328932331916),
+				NewFieldElement(12115726870906958644),
+				NewFieldElement(6775897107605342797),
+				NewFieldElement(15989401564746021030),
+				NewFieldElement(10691676456016926845),
+				NewFieldElement(1632499470630032007),
+				NewFieldElement(1317292355445098328),
+				NewFieldElement(18391440812534384252),
+				NewFieldElement(17321705613231354333),
+				NewFieldElement(6176487551308859603),
+				NewFieldElement(7119835651572002873),
+				NewFieldElement(3903019169623116693),
+				NewFieldElement(4886491111111487546),
+				NewFieldElement(4087641893164620518),
+				NewFieldElement(13801643080324181364),
+				NewFieldElement(16993775312274189321),
+				NewFieldElement(9268202926222765679),
+				NewFieldElement(10683001302406181735),
+				NewFieldElement(13359465725531647963),
+				NewFieldElement(4523327590105620849),
+				NewFieldElement(4883588003760409588),
+				NewFieldElement(187699146998097671),
+				NewFieldElement(14489263557623716717),
+				NewFieldElement(11748359318238148146),
+				NewFieldElement(13636347200053048758),
+			},
+		}
+		witness := TestFriCircuit{}
 		err := test.IsSolved(&circuit, &witness, TEST_CURVE.ScalarField())
 		assert.NoError(err)
 	}
@@ -96,99 +114,69 @@ func TestFibonacciFriProof(t *testing.T) {
 	testCase()
 }
 
-type TestLargeDummyFriCircuit struct{}
+func TestDummyFriProof(t *testing.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{
-		NewFieldElementFromString("17377750363769967882"),
-		NewFieldElementFromString("11921191651424768462"),
-	}
-	friChallenges := FriChallenges{
-		FriAlpha: QuadraticExtension{
-			NewFieldElementFromString("16721004555774385479"),
-			NewFieldElementFromString("10688151135543754663"),
-		},
-		FriBetas: []QuadraticExtension{
-			{
-				NewFieldElementFromString("3312441922957827805"),
-				NewFieldElementFromString("15128092514958289671"),
-			},
-			{
-				NewFieldElementFromString("13630530769060141802"),
-				NewFieldElementFromString("14559883974933163008"),
-			},
-			{
-				NewFieldElementFromString("16146508250083930687"),
-				NewFieldElementFromString("5176346568444408396"),
-			},
-		},
-		FriPowResponse: NewFieldElement(4389),
-		FriQueryIndicies: []F{
-			NewFieldElementFromString("16334967868590615051"),
-			NewFieldElementFromString("2911473540496037915"),
-			NewFieldElementFromString("14887216056886344225"),
-			NewFieldElementFromString("7808811227805914295"),
-			NewFieldElementFromString("2018594961417375749"),
-			NewFieldElementFromString("3733368398777208435"),
-			NewFieldElementFromString("2623035669037055104"),
-			NewFieldElementFromString("299243030573481514"),
-			NewFieldElementFromString("7189789717962704433"),
-			NewFieldElementFromString("14566344026886816268"),
-			NewFieldElementFromString("12555390069003437453"),
-			NewFieldElementFromString("17225508403199418233"),
-			NewFieldElementFromString("5088797913879903292"),
-			NewFieldElementFromString("9715691392773433023"),
-			NewFieldElementFromString("7565836764713256165"),
-			NewFieldElementFromString("1500143546029322929"),
-			NewFieldElementFromString("1245802417104422080"),
-			NewFieldElementFromString("6831959786661245110"),
-			NewFieldElementFromString("17271054758535453780"),
-			NewFieldElementFromString("6225460404576395409"),
-			NewFieldElementFromString("15932661092896277351"),
-			NewFieldElementFromString("12452534049198240575"),
-			NewFieldElementFromString("4225199666055520177"),
-			NewFieldElementFromString("13235091290587791090"),
-			NewFieldElementFromString("2562357622728700774"),
-			NewFieldElementFromString("17676678042980201498"),
-			NewFieldElementFromString("5837067135702409874"),
-			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{}
+		circuit := TestFriCircuit{
-		witness := TestLargeDummyFriCircuit{}
+			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"),
+			},
+			friAlpha: QuadraticExtension{
+				NewFieldElementFromString("16721004555774385479"),
+				NewFieldElementFromString("10688151135543754663"),
+			},
+			friBetas: []QuadraticExtension{
+				{
+					NewFieldElementFromString("3312441922957827805"),
+					NewFieldElementFromString("15128092514958289671"),
+				},
+				{
+					NewFieldElementFromString("13630530769060141802"),
+					NewFieldElementFromString("14559883974933163008"),
+				},
+				{
+					NewFieldElementFromString("16146508250083930687"),
+					NewFieldElementFromString("5176346568444408396"),
+				},
+			},
+			friPOWResponse: NewFieldElement(4389),
+			friQueryIndices: []F{
+				NewFieldElementFromString("16334967868590615051"),
+				NewFieldElementFromString("2911473540496037915"),
+				NewFieldElementFromString("14887216056886344225"),
+				NewFieldElementFromString("7808811227805914295"),
+				NewFieldElementFromString("2018594961417375749"),
+				NewFieldElementFromString("3733368398777208435"),
+				NewFieldElementFromString("2623035669037055104"),
+				NewFieldElementFromString("299243030573481514"),
+				NewFieldElementFromString("7189789717962704433"),
+				NewFieldElementFromString("14566344026886816268"),
+				NewFieldElementFromString("12555390069003437453"),
+				NewFieldElementFromString("17225508403199418233"),
+				NewFieldElementFromString("5088797913879903292"),
+				NewFieldElementFromString("9715691392773433023"),
+				NewFieldElementFromString("7565836764713256165"),
+				NewFieldElementFromString("1500143546029322929"),
+				NewFieldElementFromString("1245802417104422080"),
+				NewFieldElementFromString("6831959786661245110"),
+				NewFieldElementFromString("17271054758535453780"),
+				NewFieldElementFromString("6225460404576395409"),
+				NewFieldElementFromString("15932661092896277351"),
+				NewFieldElementFromString("12452534049198240575"),
+				NewFieldElementFromString("4225199666055520177"),
+				NewFieldElementFromString("13235091290587791090"),
+				NewFieldElementFromString("2562357622728700774"),
+				NewFieldElementFromString("17676678042980201498"),
+				NewFieldElementFromString("5837067135702409874"),
+				NewFieldElementFromString("11238419549114325157"),
+			},
+		}
+		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")
+	proofWithPis := DeserializeProofWithPublicInputs(circuit.proofWithPIsFilename)
-	commonCircuitData := DeserializeCommonCircuitData("./data/fibonacci/common_circuit_data.json")
+	commonCircuitData := DeserializeCommonCircuitData(circuit.commonCircuitDataFilename)
 
 	field := NewFieldAPI(api)
 	qe := NewQuadraticExtensionAPI(field, commonCircuitData.DegreeBits)
 
-	// Challenge associated with the data from "/.data/fibonacci/*"
 	proofChallenges := ProofChallenges{
-		PlonkBetas: []F{
+		PlonkBetas:  circuit.plonkBetas,
-			NewFieldElementFromString("4678728155650926271"),
+		PlonkGammas: circuit.plonkGammas,
-			NewFieldElementFromString("13611962404289024887"),
+		PlonkAlphas: circuit.plonkAlphas,
-		},
+		PlonkZeta:   circuit.plonkZeta,
-		PlonkGammas: []F{
-			NewFieldElementFromString("13237663823305715949"),
-			NewFieldElementFromString("15389314098328235145"),
-		},
-		PlonkAlphas: []F{
-			NewFieldElementFromString("14505919539124304197"),
-			NewFieldElementFromString("1695455639263736117"),
-		},
-		PlonkZeta: QuadraticExtension{
-			NewFieldElementFromString("14887793628029982930"),
-			NewFieldElementFromString("1136137158284059037"),
-		},
 	}
 
 	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)