Skip to content
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

fix: verifier srs flags paths #159

Merged
merged 2 commits into from
Sep 29, 2024
Merged

fix: verifier srs flags paths #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b7c943
fix: verifier srs flags paths
samlaf Sep 28, 2024
5a65e57
style: lint
samlaf Sep 29, 2024
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
4 changes: 4 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ lint:

@golangci-lint run

.PHONY: format
format:
@go fmt ./...

go-gen-mocks:
@echo "generating go mocks..."
@GO111MODULE=on go generate --run "mockgen*" ./...
Expand Down
2 changes: 1 addition & 1 deletion e2e/setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ func TestSuiteConfig(t *testing.T, testCfg *Cfg) server.CLIConfig {
CacheDir: "../resources/SRSTables",
SRSOrder: 268435456,
SRSNumberToLoad: maxBlobLengthBytes / 32,
NumWorker: uint64(runtime.GOMAXPROCS(0)),
NumWorker: uint64(runtime.GOMAXPROCS(0)), // #nosec G115
},
},
MemstoreEnabled: testCfg.UseMemory,
Expand Down
26 changes: 15 additions & 11 deletions verify/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,23 +80,27 @@ func CLIFlags(envPrefix, category string) []cli.Flag {
Name: G1PathFlagName,
Usage: "Directory path to g1.point file.",
EnvVars: withEnvPrefix(envPrefix, "TARGET_KZG_G1_PATH"),
// TODO: should use absolute path wrt root directory to prevent future errors
// in case we move this file around
Value: "../resources/g1.point",
// we use a relative path so that the path works for both the binary and the docker container
// aka we assume the binary is run from root dir, and that the resources/ dir is copied into the working dir of the container
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought binary is run from the workdir, which is /app

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That’s the binary in the container. By binary here I just meant if we make + .//bin/… or go run

Value: "resources/g1.point",
Category: category,
},
&cli.StringFlag{
Name: G2TauFlagName,
Usage: "Directory path to g2.point.powerOf2 file.",
EnvVars: withEnvPrefix(envPrefix, "TARGET_G2_TAU_PATH"),
Value: "../resources/g2.point.powerOf2",
Name: G2TauFlagName,
Usage: "Directory path to g2.point.powerOf2 file.",
EnvVars: withEnvPrefix(envPrefix, "TARGET_G2_TAU_PATH"),
// we use a relative path so that the path works for both the binary and the docker container
// aka we assume the binary is run from root dir, and that the resources/ dir is copied into the working dir of the container
Value: "resources/g2.point.powerOf2",
Category: category,
},
&cli.StringFlag{
Name: CachePathFlagName,
Usage: "Directory path to SRS tables for caching.",
EnvVars: withEnvPrefix(envPrefix, "TARGET_CACHE_PATH"),
Value: "../resources/SRSTables/",
Name: CachePathFlagName,
Usage: "Directory path to SRS tables for caching.",
EnvVars: withEnvPrefix(envPrefix, "TARGET_CACHE_PATH"),
// we use a relative path so that the path works for both the binary and the docker container
// aka we assume the binary is run from root dir, and that the resources/ dir is copied into the working dir of the container
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as above,

Value: "resources/SRSTables/",
Category: category,
},
// TODO: can we use a genericFlag for this, and automatically parse the string into a uint64?
Expand Down
Loading