Browse Source

cleaned up qe api (#21)

main
Kevin Jue 2 years ago
committed by GitHub
parent
commit
b3a3aa851b
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 9 additions and 14 deletions
  1. +1
    -3
      field/quadratic_extension.go
  2. +2
    -4
      field/quadratic_extension_test.go
  3. +1
    -1
      poseidon/poseidon_test.go
  4. +1
    -1
      verifier/internal/fri/fri_test.go
  5. +1
    -1
      verifier/internal/gates/gate_test.go
  6. +1
    -2
      verifier/internal/plonk/challenger_test.go
  7. +1
    -1
      verifier/internal/plonk/plonk_test.go
  8. +1
    -1
      verifier/verifier.go

+ 1
- 3
field/quadratic_extension.go

@ -25,9 +25,7 @@ type QuadraticExtensionAPI struct {
ZERO_QE_ALGEBRA QEAlgebra
}
func NewQuadraticExtensionAPI(api frontend.API, fieldAPI FieldAPI, degreeBits uint64) *QuadraticExtensionAPI {
// TODO: Should degreeBits be verified that it fits within the field and that degree is within uint64?
func NewQuadraticExtensionAPI(api frontend.API, fieldAPI FieldAPI) *QuadraticExtensionAPI {
var ZERO_QE = QuadraticExtension{ZERO_F, ZERO_F}
var ZERO_QE_ALGEBRA QEAlgebra

+ 2
- 4
field/quadratic_extension_test.go

@ -20,8 +20,7 @@ type TestQuadraticExtensionMulCircuit struct {
func (c *TestQuadraticExtensionMulCircuit) Define(api frontend.API) error {
fieldAPI := NewFieldAPI(api)
degreeBits := 3
c.qeAPI = NewQuadraticExtensionAPI(api, fieldAPI, uint64(degreeBits))
c.qeAPI = NewQuadraticExtensionAPI(api, fieldAPI)
actualRes := c.qeAPI.MulExtension(c.Operand1, c.Operand2)
@ -54,8 +53,7 @@ type TestQuadraticExtensionDivCircuit struct {
func (c *TestQuadraticExtensionDivCircuit) Define(api frontend.API) error {
fieldAPI := NewFieldAPI(api)
degreeBits := 3
c.qeAPI = NewQuadraticExtensionAPI(api, fieldAPI, uint64(degreeBits))
c.qeAPI = NewQuadraticExtensionAPI(api, fieldAPI)
actualRes := c.qeAPI.DivExtension(c.Operand1, c.Operand2)

+ 1
- 1
poseidon/poseidon_test.go

@ -18,7 +18,7 @@ type TestPoseidonCircuit struct {
func (circuit *TestPoseidonCircuit) Define(api frontend.API) error {
goldilocksApi := field.NewFieldAPI(api)
qeAPI := field.NewQuadraticExtensionAPI(api, goldilocksApi, 3)
qeAPI := field.NewQuadraticExtensionAPI(api, goldilocksApi)
var input PoseidonState
for i := 0; i < 12; i++ {

+ 1
- 1
verifier/internal/fri/fri_test.go

@ -25,7 +25,7 @@ func (circuit *TestFriCircuit) Define(api frontend.API) error {
verifierOnlyCircuitData := utils.DeserializeVerifierOnlyCircuitData(circuit.verifierOnlyCircuitDataFilename)
fieldAPI := field.NewFieldAPI(api)
qeAPI := field.NewQuadraticExtensionAPI(api, fieldAPI, commonCircuitData.DegreeBits)
qeAPI := field.NewQuadraticExtensionAPI(api, fieldAPI)
poseidonChip := poseidon.NewPoseidonChip(api, fieldAPI, qeAPI)
poseidonBN128Chip := poseidon.NewPoseidonBN128Chip(api, fieldAPI)
friChip := fri.NewFriChip(api, fieldAPI, qeAPI, poseidonBN128Chip, &commonCircuitData.FriParams)

+ 1
- 1
verifier/internal/gates/gate_test.go

@ -688,7 +688,7 @@ func (circuit *TestGateCircuit) Define(api frontend.API) error {
numSelectors := commonCircuitData.SelectorsInfo.NumSelectors()
fieldAPI := field.NewFieldAPI(api)
qeAPI := field.NewQuadraticExtensionAPI(api, fieldAPI, commonCircuitData.DegreeBits)
qeAPI := field.NewQuadraticExtensionAPI(api, fieldAPI)
vars := gates.NewEvaluationVars(localConstants[numSelectors:], localWires, publicInputsHash)

+ 1
- 2
verifier/internal/plonk/challenger_test.go

@ -20,8 +20,7 @@ type TestChallengerCircuit struct {
func (circuit *TestChallengerCircuit) Define(api frontend.API) error {
fieldAPI := field.NewFieldAPI(api)
degreeBits := 3
qeAPI := field.NewQuadraticExtensionAPI(api, fieldAPI, uint64(degreeBits))
qeAPI := field.NewQuadraticExtensionAPI(api, fieldAPI)
poseidonChip := poseidon.NewPoseidonChip(api, fieldAPI, qeAPI)
poseidonBN128Chip := poseidon.NewPoseidonBN128Chip(api, fieldAPI)
challengerChip := NewChallengerChip(api, fieldAPI, poseidonChip, poseidonBN128Chip)

+ 1
- 1
verifier/internal/plonk/plonk_test.go

@ -27,7 +27,7 @@ func (circuit *TestPlonkCircuit) Define(api frontend.API) error {
proofChallenges := verifierChip.GetChallenges(proofWithPis, publicInputsHash, commonCircuitData, verifierOnlyCircuitData)
fieldAPI := field.NewFieldAPI(api)
qeAPI := field.NewQuadraticExtensionAPI(api, fieldAPI, commonCircuitData.DegreeBits)
qeAPI := field.NewQuadraticExtensionAPI(api, fieldAPI)
plonkChip := plonk.NewPlonkChip(
api,
qeAPI,

+ 1
- 1
verifier/verifier.go

@ -22,7 +22,7 @@ type VerifierChip struct {
func NewVerifierChip(api frontend.API, commonCircuitData common.CommonCircuitData) *VerifierChip {
fieldAPI := field.NewFieldAPI(api)
qeAPI := field.NewQuadraticExtensionAPI(api, fieldAPI, commonCircuitData.DegreeBits)
qeAPI := field.NewQuadraticExtensionAPI(api, fieldAPI)
poseidonBN128Chip := poseidon.NewPoseidonBN128Chip(api, fieldAPI)
friChip := fri.NewFriChip(api, fieldAPI, qeAPI, poseidonBN128Chip, &commonCircuitData.FriParams)

Loading…
Cancel
Save