Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 5 additions & 7 deletions pkg/test/util/check_legacy.go
Original file line number Diff line number Diff line change
Expand Up @@ -293,17 +293,21 @@ var defaultOptLevel = []uint{1}
var LEGACY_TESTFILE_EXTENSIONS []LegacyTestConfig = []LegacyTestConfig{
// should all pass
{"accepts", true, true, true, "", allOptLevels},
{"accepts.bz2", true, true, true, "", allOptLevels},
{"auto.accepts", true, true, true, "", allOptLevels},
{"auto.accepts.bz2", true, true, true, "", allOptLevels},
{"expanded.accepts", true, false, false, "", defaultOptLevel},
{"expanded.bls12_377.accepts", true, false, false, "BLS12_377", defaultOptLevel},
{"auto.accepts", true, true, true, "", allOptLevels},
{"bls12_377.accepts", true, true, true, "BLS12_377", allOptLevels},
{"koalabear_16.accepts", true, true, true, "KOALABEAR_16", allOptLevels},
{"gf_8209.accepts", true, true, true, "GF_8209", allOptLevels},
{"bls12_377.accepts.bz2", true, true, true, "BLS12_377", allOptLevels},
{"koalabear_16.accepts.bz2", true, true, true, "KOALABEAR_16", allOptLevels},
// should all fail
{"rejects", false, true, false, "", allOptLevels},
{"rejects.bz2", false, true, false, "", allOptLevels},
{"auto.rejects", false, true, false, "", allOptLevels},
{"auto.rejects.bz2", false, true, false, "", allOptLevels},
{"expanded.rejects", false, false, false, "", defaultOptLevel},
{"expanded.bls12_377.rejects", false, false, false, "BLS12_377", defaultOptLevel},
{"bls12_377.rejects", false, true, false, "BLS12_377", allOptLevels},
Expand All @@ -317,12 +321,8 @@ var LEGACY_TESTFILE_EXTENSIONS []LegacyTestConfig = []LegacyTestConfig{
// supported. Any test having one of these extensions is rejected outright.
// Basically, all test vectors must now specify their field explicitly.
var LEGACY_DEPRECATED_EXTENSIONS []string = []string{
"accepts.bz2",
"auto.accepts.bz2",
"expanded.O1.accepts",
// rejects
"rejects.bz2",
"auto.rejects.bz2",
"expanded.O1.rejects",
}

Expand All @@ -334,8 +334,6 @@ func checkForDeprecatedTests(t *testing.T, test string) {
if _, err := os.Stat(fmt.Sprintf("%s/%s", TestDir, filename)); os.IsNotExist(err) {
continue
}
//
t.Errorf("encountered deprecated test file: %s", filename)
}
}

Expand Down
14 changes: 0 additions & 14 deletions testdata/corset/bench/adder.bls12_377.accepts
Original file line number Diff line number Diff line change
@@ -1,17 +1,3 @@
{ "ST": [], "CT": [], "CT_MAX": [], "BYTE_1": [], "BYTE_2": [], "BYTE_R": [], "ACC_1": [], "ACC_2": [], "ACC_R": [], "ARG_1": [], "ARG_2": [], "RES": [] }
{ "ST": [0], "CT": [0], "CT_MAX": [0], "BYTE_1": [0], "BYTE_2": [0], "BYTE_R": [0], "ACC_1": [0], "ACC_2": [0], "ACC_R": [0], "ARG_1": [0], "ARG_2": [0], "RES": [0] }
{ "ST": [0], "CT": [1], "CT_MAX": [0], "BYTE_1": [0], "BYTE_2": [0], "BYTE_R": [0], "ACC_1": [0], "ACC_2": [0], "ACC_R": [0], "ARG_1": [0], "ARG_2": [0], "RES": [0] }
{ "ST": [0], "CT": [0], "CT_MAX": [7], "BYTE_1": [0], "BYTE_2": [0], "BYTE_R": [0], "ACC_1": [0], "ACC_2": [0], "ACC_R": [0], "ARG_1": [0], "ARG_2": [0], "RES": [0] }
{ "ST": [0], "CT": [0], "CT_MAX": [0], "BYTE_1": [1], "BYTE_2": [0], "BYTE_R": [0], "ACC_1": [1], "ACC_2": [0], "ACC_R": [0], "ARG_1": [0], "ARG_2": [0], "RES": [0] }

;; adding 1 byte using 1 row
{ "ST": [0,1], "CT": [0,0], "CT_MAX": [0,0], "BYTE_1": [0,1], "BYTE_2": [0,2], "BYTE_R": [0,3], "ACC_1": [0,1], "ACC_2": [0,2], "ACC_R": [0,3], "ARG_1": [0,1], "ARG_2": [0,2], "RES": [0,3] }

;; adding 1 byte using 2 rows
{ "ST": [0,1,1], "CT": [0,0,1], "CT_MAX": [0,1,1], "BYTE_1": [0,0,1], "BYTE_2": [0,0,2], "BYTE_R": [0,0,3], "ACC_1": [0,0,1], "ACC_2": [0,0,2], "ACC_R": [0,0,3], "ARG_1": [0,1,1], "ARG_2": [0,2,2], "RES": [0,3,3] }

;; adding 2 bytes (without carry)
{ "ST": [0,1,1], "CT": [0,0,1], "CT_MAX": [0,1,1], "BYTE_1": [0,1,7], "BYTE_2": [0,2,5], "BYTE_R": [0,3,12], "ACC_1": [0,1,263], "ACC_2": [0,2,517], "ACC_R": [0,3,780], "ARG_1": [0,263,263], "ARG_2": [0,517,517], "RES": [0,780,780] }

;; adding 2 bytes (with carry)
{ "ST": [0,1,1,1], "CT": [0,0,1,2], "CT_MAX": [0,2,2,2], "BYTE_1": [0,0,255,7], "BYTE_2": [0,0,2,5], "BYTE_R": [0,1,1,12], "ACC_1": [0,0,255,65287], "ACC_2": [0,0,2,517], "ACC_R": [0,1,257,65804], "ARG_1": [0,65287,65287,65287], "ARG_2": [0,517,517,517], "RES": [0,65804,65804,65804] }
14 changes: 0 additions & 14 deletions testdata/corset/bench/adder.gf_8209.rejects

This file was deleted.

14 changes: 0 additions & 14 deletions testdata/corset/bench/adder.koalabear_16.accepts
Original file line number Diff line number Diff line change
@@ -1,17 +1,3 @@
{ "ST": [], "CT": [], "CT_MAX": [], "BYTE_1": [], "BYTE_2": [], "BYTE_R": [], "ACC_1": [], "ACC_2": [], "ACC_R": [], "ARG_1": [], "ARG_2": [], "RES": [] }
{ "ST": [0], "CT": [0], "CT_MAX": [0], "BYTE_1": [0], "BYTE_2": [0], "BYTE_R": [0], "ACC_1": [0], "ACC_2": [0], "ACC_R": [0], "ARG_1": [0], "ARG_2": [0], "RES": [0] }
{ "ST": [0], "CT": [1], "CT_MAX": [0], "BYTE_1": [0], "BYTE_2": [0], "BYTE_R": [0], "ACC_1": [0], "ACC_2": [0], "ACC_R": [0], "ARG_1": [0], "ARG_2": [0], "RES": [0] }
{ "ST": [0], "CT": [0], "CT_MAX": [7], "BYTE_1": [0], "BYTE_2": [0], "BYTE_R": [0], "ACC_1": [0], "ACC_2": [0], "ACC_R": [0], "ARG_1": [0], "ARG_2": [0], "RES": [0] }
{ "ST": [0], "CT": [0], "CT_MAX": [0], "BYTE_1": [1], "BYTE_2": [0], "BYTE_R": [0], "ACC_1": [1], "ACC_2": [0], "ACC_R": [0], "ARG_1": [0], "ARG_2": [0], "RES": [0] }

;; adding 1 byte using 1 row
{ "ST": [0,1], "CT": [0,0], "CT_MAX": [0,0], "BYTE_1": [0,1], "BYTE_2": [0,2], "BYTE_R": [0,3], "ACC_1": [0,1], "ACC_2": [0,2], "ACC_R": [0,3], "ARG_1": [0,1], "ARG_2": [0,2], "RES": [0,3] }

;; adding 1 byte using 2 rows
{ "ST": [0,1,1], "CT": [0,0,1], "CT_MAX": [0,1,1], "BYTE_1": [0,0,1], "BYTE_2": [0,0,2], "BYTE_R": [0,0,3], "ACC_1": [0,0,1], "ACC_2": [0,0,2], "ACC_R": [0,0,3], "ARG_1": [0,1,1], "ARG_2": [0,2,2], "RES": [0,3,3] }

;; adding 2 bytes (without carry)
{ "ST": [0,1,1], "CT": [0,0,1], "CT_MAX": [0,1,1], "BYTE_1": [0,1,7], "BYTE_2": [0,2,5], "BYTE_R": [0,3,12], "ACC_1": [0,1,263], "ACC_2": [0,2,517], "ACC_R": [0,3,780], "ARG_1": [0,263,263], "ARG_2": [0,517,517], "RES": [0,780,780] }

;; adding 2 bytes (with carry)
{ "ST": [0,1,1,1], "CT": [0,0,1,2], "CT_MAX": [0,2,2,2], "BYTE_1": [0,0,255,7], "BYTE_2": [0,0,2,5], "BYTE_R": [0,1,1,12], "ACC_1": [0,0,255,65287], "ACC_2": [0,0,2,517], "ACC_R": [0,1,257,65804], "ARG_1": [0,65287,65287,65287], "ARG_2": [0,517,517,517], "RES": [0,65804,65804,65804] }
14 changes: 0 additions & 14 deletions testdata/corset/bench/adder.koalabear_16.rejects

This file was deleted.

17 changes: 0 additions & 17 deletions testdata/corset/bench/bit_decomposition.gf_8209.accepts

This file was deleted.

72 changes: 0 additions & 72 deletions testdata/corset/bench/bit_decomposition.gf_8209.rejects

This file was deleted.

17 changes: 0 additions & 17 deletions testdata/corset/bench/bit_decomposition.koalabear_16.accepts

This file was deleted.

Loading
Loading