-
Notifications
You must be signed in to change notification settings - Fork 449
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
simulators/ethereum/rpc-compat: handle test comments and avoid error …
…message comparison (#984)
- Loading branch information
Showing
5 changed files
with
216 additions
and
111 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "bufio" | ||
| "fmt" | ||
| "io" | ||
| "os" | ||
| "path/filepath" | ||
| "regexp" | ||
| "strings" | ||
|
|
||
| "github.com/ethereum/hive/hivesim" | ||
| "github.com/tidwall/gjson" | ||
| ) | ||
|
|
||
| type rpcTest struct { | ||
| name string | ||
| comment string | ||
| speconly bool | ||
| messages []rpcTestMessage | ||
| } | ||
|
|
||
| type rpcTestMessage struct { | ||
| data string | ||
| // if true, the message is a send (>>), otherwise it's a receive (<<) | ||
| send bool | ||
| } | ||
|
|
||
| func loadTestFile(name string, r io.Reader) (rpcTest, error) { | ||
| var ( | ||
| rdr = bufio.NewReader(r) | ||
| scan = bufio.NewScanner(rdr) | ||
| inHeader = true | ||
| test = rpcTest{name: name} | ||
| ) | ||
| for scan.Scan() { | ||
| line := strings.TrimSpace(scan.Text()) | ||
| switch { | ||
| case len(line) == 0: | ||
| continue | ||
|
|
||
| case strings.HasPrefix(line, "//"): | ||
| if !inHeader { | ||
| continue // ignore comments after requests | ||
| } | ||
| text := strings.TrimPrefix(strings.TrimPrefix(line, "//"), " ") | ||
| test.comment += text + "\n" | ||
| if strings.HasPrefix(text, "speconly:") { | ||
| test.speconly = true | ||
| } | ||
|
|
||
| case strings.HasPrefix(line, ">>") || strings.HasPrefix(line, "<<"): | ||
| inHeader = false | ||
| data := strings.TrimSpace(line[2:]) | ||
| if !gjson.Valid(data) { | ||
| return test, fmt.Errorf("invalid JSON in line %q", line) | ||
| } | ||
| test.messages = append(test.messages, rpcTestMessage{ | ||
| data: data, | ||
| send: strings.HasPrefix(line, ">>"), | ||
| }) | ||
|
|
||
| default: | ||
| return test, fmt.Errorf("invalid test line: %q", line) | ||
| } | ||
| } | ||
| return test, scan.Err() | ||
| } | ||
|
|
||
| // loadTests walks the given directory looking for *.io files to load. | ||
| func loadTests(t *hivesim.T, root string, re *regexp.Regexp) []rpcTest { | ||
| var tests []rpcTest | ||
| filepath.Walk(root, func(path string, info os.FileInfo, err error) error { | ||
| if err != nil { | ||
| t.Logf("unable to walk path: %s", err) | ||
| return err | ||
| } | ||
| if info.IsDir() { | ||
| return nil | ||
| } | ||
| if fname := info.Name(); !strings.HasSuffix(fname, ".io") { | ||
| return nil | ||
| } | ||
| pathname := strings.TrimSuffix(strings.TrimPrefix(path, root+"/"), ".io") | ||
| if !re.MatchString(pathname) { | ||
| fmt.Println("skip", pathname) | ||
| return nil // skip | ||
| } | ||
| fd, err := os.Open(path) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| defer fd.Close() | ||
| test, err := loadTestFile(pathname, fd) | ||
| if err != nil { | ||
| return fmt.Errorf("invalid test %s: %v", info.Name(), err) | ||
| } | ||
| tests = append(tests, test) | ||
| return nil | ||
| }) | ||
| return tests | ||
| } |
Oops, something went wrong.