diff --git a/benchmark.go b/benchmark.go index 883756e..67efe6e 100644 --- a/benchmark.go +++ b/benchmark.go @@ -24,7 +24,7 @@ import ( ) func runBenchmark(plonky2Circuit string, proofSystem string, profileCircuit bool, dummy bool, saveArtifacts bool) { - commonCircuitData := types.DeserializeCommonCircuitData("testdata/" + plonky2Circuit + "/common_circuit_data.json") + commonCircuitData := types.ReadCommonCircuitData("testdata/" + plonky2Circuit + "/common_circuit_data.json") proofWithPis := variables.DeserializeProofWithPublicInputs(types.ReadProofWithPublicInputs("testdata/" + plonky2Circuit + "/proof_with_public_inputs.json")) verifierOnlyCircuitData := variables.DeserializeVerifierOnlyCircuitData(types.ReadVerifierOnlyCircuitData("testdata/" + plonky2Circuit + "/verifier_only_circuit_data.json")) diff --git a/fri/fri_test.go b/fri/fri_test.go index 19fb51d..6634bdf 100644 --- a/fri/fri_test.go +++ b/fri/fri_test.go @@ -112,7 +112,7 @@ func TestDecodeBlockFriVerification(t *testing.T) { verifierOnlyCircuitDataFilename := "../testdata/decode_block/verifier_only_circuit_data.json" proofWithPis := variables.DeserializeProofWithPublicInputs(types.ReadProofWithPublicInputs(proofWithPIsFilename)) - commonCircuitData := types.DeserializeCommonCircuitData(commonCircuitDataFilename) + commonCircuitData := types.ReadCommonCircuitData(commonCircuitDataFilename) verifierOnlyCircuitData := variables.DeserializeVerifierOnlyCircuitData(types.ReadVerifierOnlyCircuitData(verifierOnlyCircuitDataFilename)) testCase := func() { diff --git a/plonk/gates/gates_test.go b/plonk/gates/gates_test.go index 0f64769..8e793c9 100644 --- a/plonk/gates/gates_test.go +++ b/plonk/gates/gates_test.go @@ -690,7 +690,7 @@ type TestGateCircuit struct { } func (circuit *TestGateCircuit) Define(api frontend.API) error { - commonCircuitData := types.DeserializeCommonCircuitData("../../testdata/decode_block/common_circuit_data.json") + commonCircuitData := types.ReadCommonCircuitData("../../testdata/decode_block/common_circuit_data.json") numSelectors := commonCircuitData.SelectorsInfo.NumSelectors() glApi := gl.New(api) diff --git a/plonk/plonk_test.go b/plonk/plonk_test.go index 5a7b898..5b27c1b 100644 --- a/plonk/plonk_test.go +++ b/plonk/plonk_test.go @@ -44,7 +44,7 @@ func TestPlonkDecodeBlock(t *testing.T) { verifierOnlyCircuitDataFilename := "../testdata/decode_block/verifier_only_circuit_data.json" proofWithPis := variables.DeserializeProofWithPublicInputs(types.ReadProofWithPublicInputs(proofWithPIsFilename)) - commonCircuitData := types.DeserializeCommonCircuitData(commonCircuitDataFilename) + commonCircuitData := types.ReadCommonCircuitData(commonCircuitDataFilename) verifierOnlyCircuitData := variables.DeserializeVerifierOnlyCircuitData(types.ReadVerifierOnlyCircuitData(verifierOnlyCircuitDataFilename)) testCase := func() { diff --git a/types/common_data.go b/types/common_data.go index 3c386f3..9117e89 100644 --- a/types/common_data.go +++ b/types/common_data.go @@ -58,7 +58,7 @@ type CommonCircuitDataRaw struct { NumPartialProducts uint64 `json:"num_partial_products"` } -func DeserializeCommonCircuitData(path string) CommonCircuitData { +func ReadCommonCircuitData(path string) CommonCircuitData { jsonFile, err := os.Open(path) if err != nil { panic(err) diff --git a/types/common_data_test.go b/types/common_data_test.go index 865a569..0215efc 100644 --- a/types/common_data_test.go +++ b/types/common_data_test.go @@ -4,6 +4,6 @@ import ( "testing" ) -func TestDeserializeCommonCircuitData(t *testing.T) { - DeserializeCommonCircuitData("../testdata/decode_block/common_circuit_data.json") +func TestReadCommonCircuitData(t *testing.T) { + ReadCommonCircuitData("../testdata/decode_block/common_circuit_data.json") } diff --git a/verifier/verifier_test.go b/verifier/verifier_test.go index 901dcd5..c41c9e8 100644 --- a/verifier/verifier_test.go +++ b/verifier/verifier_test.go @@ -15,7 +15,7 @@ func TestStepVerifier(t *testing.T) { testCase := func() { plonky2Circuit := "step" - commonCircuitData := types.DeserializeCommonCircuitData("../testdata/" + plonky2Circuit + "/common_circuit_data.json") + commonCircuitData := types.ReadCommonCircuitData("../testdata/" + plonky2Circuit + "/common_circuit_data.json") proofWithPis := variables.DeserializeProofWithPublicInputs(types.ReadProofWithPublicInputs("../testdata/" + plonky2Circuit + "/proof_with_public_inputs.json")) verifierOnlyCircuitData := variables.DeserializeVerifierOnlyCircuitData(types.ReadVerifierOnlyCircuitData("../testdata/" + plonky2Circuit + "/verifier_only_circuit_data.json"))