Skip to content

fix json generation #522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GalRogozinski merged 4 commits into from
Feb 19, 2025
Merged

fix json generation #522

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a08e05
fix json generation
MatusKysel Feb 18, 2025
aa2f5b5
modify qbft generator
MatusKysel Feb 18, 2025
544f18e
fix generation of types jsons
MatusKysel Feb 19, 2025
b83bb39
fix permission
MatusKysel Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
## IDE
.idea
.DS_Store
.vscode

# binaries
.bin
Expand Down
54 changes: 11 additions & 43 deletions qbft/spectest/generate/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"os"
"path/filepath"
"reflect"
"runtime"
"strings"

"github.com/pkg/errors"
Expand All @@ -19,6 +18,9 @@ import (

//go:generate go run main.go

var testsDir = "tests"
var stateComparisonDir = "state_comparison"

func main() {
clearStateComparisonFolder()
clearTestsFolder()
Expand All @@ -38,13 +40,6 @@ func main() {
log.Fatalf("did not generate all tests\n")
}

// write small json files for each test
// try to create directory if it doesn't exist
_, basedir, _, ok := runtime.Caller(0)
if !ok {
log.Fatalf("no caller info")
}
testsDir := filepath.Join(strings.TrimSuffix(basedir, "main.go"), "tests")
if err := os.MkdirAll(testsDir, 0700); err != nil && !os.IsExist(err) {
panic(err.Error())
}
Expand All @@ -55,7 +50,7 @@ func main() {
}
name = strings.ReplaceAll(name, " ", "_")
name = strings.ReplaceAll(name, "*", "")
name = "tests/" + name
name = filepath.Join(testsDir, name)
writeJson(name, byts)
}

Expand All @@ -64,7 +59,7 @@ func main() {
if err != nil {
panic(err.Error())
}
writeJson("tests", byts)
writeJson(testsDir, byts)

// write state comparison json files
for _, testF := range spectest.AllTests {
Expand All @@ -79,33 +74,21 @@ func main() {
}

func clearStateComparisonFolder() {
_, basedir, _, ok := runtime.Caller(0)
if !ok {
panic("no caller info")
}
dir := filepath.Join(strings.TrimSuffix(basedir, "main.go"), "state_comparison")

if err := os.RemoveAll(dir); err != nil {
if err := os.RemoveAll(stateComparisonDir); err != nil {
panic(err.Error())
}

if err := os.Mkdir(dir, 0700); err != nil {
if err := os.Mkdir(stateComparisonDir, 0700); err != nil {
panic(err.Error())
}
}

func clearTestsFolder() {
_, basedir, _, ok := runtime.Caller(0)
if !ok {
panic("no caller info")
}
dir := filepath.Join(strings.TrimSuffix(basedir, "main.go"), "tests")

if err := os.RemoveAll(dir); err != nil {
if err := os.RemoveAll(testsDir); err != nil {
panic(err.Error())
}

if err := os.Mkdir(dir, 0700); err != nil {
if err := os.Mkdir(testsDir, 0700); err != nil {
panic(err.Error())
}
}
Expand Down Expand Up @@ -136,26 +119,11 @@ func writeJsonStateComparison(name, testType string, post interface{}) {
}

func scDir(testType string) string {
_, basedir, _, ok := runtime.Caller(0)
if !ok {
panic("no caller info")
}
basedir = strings.TrimSuffix(basedir, "main.go")
scDir := comparable2.GetSCDir(basedir, testType)
return scDir
return comparable2.GetSCDir(".", testType)
}

func writeJson(name string, data []byte) {
_, basedir, _, ok := runtime.Caller(0)
if !ok {
panic("no caller info")
}
basedir = strings.TrimSuffix(basedir, "main.go")

// try to create directory if it doesn't exist
_ = os.Mkdir(basedir, os.ModeDir)

file := filepath.Join(basedir, name+".json")
file := name + ".json"
log.Printf("writing spec tests json to: %s\n", file)
if err := os.WriteFile(file, data, 0400); err != nil {
panic(err.Error())
Expand Down
54 changes: 11 additions & 43 deletions ssv/spectest/generate/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"os"
"path/filepath"
"reflect"
"runtime"
"strings"

"github.com/pkg/errors"
Expand All @@ -20,6 +19,9 @@ import (

//go:generate go run main.go

var testsDir = "tests"
var stateComparisonDir = "state_comparison"

func main() {
clearStateComparisonFolder()
clearTestsFolder()
Expand All @@ -38,13 +40,6 @@ func main() {
log.Fatalf("did not generate all tests\n")
}

// write small json files for each test
// try to create directory if it doesn't exist
_, basedir, _, ok := runtime.Caller(0)
if !ok {
log.Fatalf("no caller info")
}
testsDir := filepath.Join(strings.TrimSuffix(basedir, "main.go"), "tests")
if err := os.MkdirAll(testsDir, 0700); err != nil && !os.IsExist(err) {
panic(err.Error())
}
Expand All @@ -55,7 +50,7 @@ func main() {
}
name = strings.ReplaceAll(name, " ", "_")
name = strings.ReplaceAll(name, "*", "")
name = "tests/" + name
name = filepath.Join(testsDir, name)
writeJson(name, byts)
}

Expand All @@ -64,7 +59,7 @@ func main() {
if err != nil {
panic(err.Error())
}
writeJson("tests", byts)
writeJson(testsDir, byts)

// write state comparison json files
for _, testF := range spectest.AllTests {
Expand All @@ -80,17 +75,11 @@ func main() {
}

func clearStateComparisonFolder() {
_, basedir, _, ok := runtime.Caller(0)
if !ok {
panic("no caller info")
}
dir := filepath.Join(strings.TrimSuffix(basedir, "main.go"), "state_comparison")

if err := os.RemoveAll(dir); err != nil {
if err := os.RemoveAll(stateComparisonDir); err != nil {
panic(err.Error())
}

if err := os.Mkdir(dir, 0700); err != nil {
if err := os.Mkdir(stateComparisonDir, 0700); err != nil {
panic(err.Error())
}
}
Expand All @@ -109,17 +98,11 @@ func writeJsonStateComparison(name, testType string, post interface{}) {
}

func clearTestsFolder() {
_, basedir, _, ok := runtime.Caller(0)
if !ok {
panic("no caller info")
}
dir := filepath.Join(strings.TrimSuffix(basedir, "main.go"), "tests")

if err := os.RemoveAll(dir); err != nil {
if err := os.RemoveAll(testsDir); err != nil {
panic(err.Error())
}

if err := os.Mkdir(dir, 0700); err != nil {
if err := os.Mkdir(testsDir, 0700); err != nil {
panic(err.Error())
}
}
Expand Down Expand Up @@ -149,26 +132,11 @@ func writeSingleSCJson(path string, testType string, post interface{}) {
}

func scDir(testType string) string {
_, basedir, _, ok := runtime.Caller(0)
if !ok {
panic("no caller info")
}
basedir = strings.TrimSuffix(basedir, "main.go")
scDir := comparable2.GetSCDir(basedir, testType)
return scDir
return comparable2.GetSCDir(".", testType)
}

func writeJson(name string, data []byte) {
_, basedir, _, ok := runtime.Caller(0)
if !ok {
panic("no caller info")
}
basedir = strings.TrimSuffix(basedir, "main.go")

// try to create directory if it doesn't exist
_ = os.Mkdir(basedir, os.ModeDir)

file := filepath.Join(basedir, name+".json")
file := name + ".json"
log.Printf("writing spec tests json to: %s\n", file)
if err := os.WriteFile(file, data, 0400); err != nil {
panic(err.Error())
Expand Down
54 changes: 11 additions & 43 deletions types/spectest/generate/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"os"
"path/filepath"
"reflect"
"runtime"
"strings"

"github.com/ssvlabs/ssv-spec/types/spectest"
Expand All @@ -16,6 +15,9 @@ import (

//go:generate go run main.go

var testsDir = "tests"
var stateComparisonDir = "state_comparison"

func main() {
clearStateComparisonFolder()
clearTestsFolder()
Expand All @@ -33,13 +35,6 @@ func main() {
log.Fatalf("did not generate all tests\n")
}

// write small json files for each test
// try to create directory if it doesn't exist
_, basedir, _, ok := runtime.Caller(0)
if !ok {
log.Fatalf("no caller info")
}
testsDir := filepath.Join(strings.TrimSuffix(basedir, "main.go"), "tests")
if err := os.MkdirAll(testsDir, 0700); err != nil && !os.IsExist(err) {
panic(err.Error())
}
Expand All @@ -50,7 +45,7 @@ func main() {
}
name = strings.ReplaceAll(name, " ", "_")
name = strings.ReplaceAll(name, "*", "")
name = "tests/" + name
name = filepath.Join(testsDir, name)
writeJson(name, byts)
}

Expand All @@ -59,7 +54,7 @@ func main() {
if err != nil {
panic(err.Error())
}
writeJson("tests", byts)
writeJson(testsDir, byts)

// write state comparison json files
for _, testF := range spectest.AllTests {
Expand All @@ -69,33 +64,21 @@ func main() {
}

func clearStateComparisonFolder() {
_, basedir, _, ok := runtime.Caller(0)
if !ok {
panic("no caller info")
}
dir := filepath.Join(strings.TrimSuffix(basedir, "main.go"), "state_comparison")

if err := os.RemoveAll(dir); err != nil {
if err := os.RemoveAll(stateComparisonDir); err != nil {
panic(err.Error())
}

if err := os.Mkdir(dir, 0700); err != nil {
if err := os.Mkdir(stateComparisonDir, 0700); err != nil {
panic(err.Error())
}
}

func clearTestsFolder() {
_, basedir, _, ok := runtime.Caller(0)
if !ok {
panic("no caller info")
}
dir := filepath.Join(strings.TrimSuffix(basedir, "main.go"), "tests")

if err := os.RemoveAll(dir); err != nil {
if err := os.RemoveAll(testsDir); err != nil {
panic(err.Error())
}

if err := os.Mkdir(dir, 0700); err != nil {
if err := os.Mkdir(testsDir, 0700); err != nil {
panic(err.Error())
}
}
Expand Down Expand Up @@ -126,26 +109,11 @@ func writeJsonStateComparison(name, testType string, post interface{}) {
}

func scDir(testType string) string {
_, basedir, _, ok := runtime.Caller(0)
if !ok {
panic("no caller info")
}
basedir = strings.TrimSuffix(basedir, "main.go")
scDir := comparable2.GetSCDir(basedir, testType)
return scDir
return comparable2.GetSCDir(".", testType)
}

func writeJson(name string, data []byte) {
_, basedir, _, ok := runtime.Caller(0)
if !ok {
panic("no caller info")
}
basedir = strings.TrimSuffix(basedir, "main.go")

// try to create directory if it doesn't exist
_ = os.Mkdir(basedir, os.ModeDir)

file := filepath.Join(basedir, name+".json")
file := name + ".json"
log.Printf("writing spec tests json to: %s\n", file)
if err := os.WriteFile(file, data, 0400); err != nil {
panic(err.Error())
Expand Down