-
Notifications
You must be signed in to change notification settings - Fork 145
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2261 from cheng762/feature/bump-version-to-1.5.1
merge eth
- Loading branch information
Showing
89 changed files
with
2,182 additions
and
731 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
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,58 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "strings" | ||
| ) | ||
|
|
||
| type nameFilter struct { | ||
| fulls map[string]bool // path/to/contract.sol:Type | ||
| files map[string]bool // path/to/contract.sol:* | ||
| types map[string]bool // *:Type | ||
| } | ||
|
|
||
| func newNameFilter(patterns ...string) (*nameFilter, error) { | ||
| f := &nameFilter{ | ||
| fulls: make(map[string]bool), | ||
| files: make(map[string]bool), | ||
| types: make(map[string]bool), | ||
| } | ||
| for _, pattern := range patterns { | ||
| if err := f.add(pattern); err != nil { | ||
| return nil, err | ||
| } | ||
| } | ||
| return f, nil | ||
| } | ||
|
|
||
| func (f *nameFilter) add(pattern string) error { | ||
| ft := strings.Split(pattern, ":") | ||
| if len(ft) != 2 { | ||
| // filenames and types must not include ':' symbol | ||
| return fmt.Errorf("invalid pattern: %s", pattern) | ||
| } | ||
|
|
||
| file, typ := ft[0], ft[1] | ||
| if file == "*" { | ||
| f.types[typ] = true | ||
| return nil | ||
| } else if typ == "*" { | ||
| f.files[file] = true | ||
| return nil | ||
| } | ||
| f.fulls[pattern] = true | ||
| return nil | ||
| } | ||
|
|
||
| func (f *nameFilter) Matches(name string) bool { | ||
| ft := strings.Split(name, ":") | ||
| if len(ft) != 2 { | ||
| // If contract names are always of the fully-qualified form | ||
| // <filePath>:<type>, then this case will never happen. | ||
| return false | ||
| } | ||
|
|
||
| file, typ := ft[0], ft[1] | ||
| // full paths > file paths > types | ||
| return f.fulls[name] || f.files[file] || f.types[typ] | ||
| } |
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,38 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| func TestNameFilter(t *testing.T) { | ||
| _, err := newNameFilter("Foo") | ||
| require.Error(t, err) | ||
| _, err = newNameFilter("too/many:colons:Foo") | ||
| require.Error(t, err) | ||
|
|
||
| f, err := newNameFilter("a/path:A", "*:B", "c/path:*") | ||
| require.NoError(t, err) | ||
|
|
||
| for _, tt := range []struct { | ||
| name string | ||
| match bool | ||
| }{ | ||
| {"a/path:A", true}, | ||
| {"unknown/path:A", false}, | ||
| {"a/path:X", false}, | ||
| {"unknown/path:X", false}, | ||
| {"any/path:B", true}, | ||
| {"c/path:X", true}, | ||
| {"c/path:foo:B", false}, | ||
| } { | ||
| match := f.Matches(tt.name) | ||
| if tt.match { | ||
| assert.True(t, match, "expected match") | ||
| } else { | ||
| assert.False(t, match, "expected no match") | ||
| } | ||
| } | ||
| } |
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
Oops, something went wrong.