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.

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

Search test data directory path dynamically #2005

Merged
merged 1 commit into from
Aug 2, 2024
Merged
Changes from all commits
Commits
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
28 changes: 25 additions & 3 deletions clients/feeder/feeder.go
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,8 @@
assert.Equal(t, []string{"API_KEY"}, r.Header["X-Throttling-Bypass"])
assert.Equal(t, []string{"Juno/v0.0.1-test Starknet Implementation"}, r.Header["User-Agent"])

wd, err := os.Getwd()
require.NoError(t, err)

base := wd[:strings.LastIndex(wd, "juno")+4]
queryArg := ""
dir := ""
const blockNumberArg = "blockNumber"
Expand Down Expand Up @@ -173,7 +171,11 @@
return
}

path := filepath.Join(base, "clients", "feeder", "testdata", network.String(), dir, fileName[0]+".json")
dataPath, err := findTargetDirectory("clients/feeder/testdata")
if err != nil {
t.Fatalf("failed to find testdata directory: %v", err)

Check warning on line 176 in clients/feeder/feeder.go

View check run for this annotation

Codecov / codecov/patch

clients/feeder/feeder.go#L176

Added line #L176 was not covered by tests
}
path := filepath.Join(dataPath, network.String(), dir, fileName[0]+".json")
read, err := os.ReadFile(path)
if err != nil {
handleNotFound(dir, queryArg, w)
Expand Down Expand Up @@ -447,3 +449,23 @@
}
return traces, nil
}

func findTargetDirectory(targetRelPath string) (string, error) {
root, err := os.Getwd()
if err != nil {
return "", err

Check warning on line 456 in clients/feeder/feeder.go

View check run for this annotation

Codecov / codecov/patch

clients/feeder/feeder.go#L456

Added line #L456 was not covered by tests
}
for {
targetPath := filepath.Join(root, targetRelPath)
if _, err := os.Stat(targetPath); err == nil {
return targetPath, nil
} else if !os.IsNotExist(err) {
return "", err

Check warning on line 463 in clients/feeder/feeder.go

View check run for this annotation

Codecov / codecov/patch

clients/feeder/feeder.go#L463

Added line #L463 was not covered by tests
}
newRoot := filepath.Dir(root)
if newRoot == root {
return "", os.ErrNotExist

Check warning on line 467 in clients/feeder/feeder.go

View check run for this annotation

Codecov / codecov/patch

clients/feeder/feeder.go#L467

Added line #L467 was not covered by tests
}
root = newRoot
}
}
Loading