Skip to content

G
Geth-Modification
Commit f95811e6 authored by Philip Schlump's avatar Philip Schlump Committed by Felix Lange
Browse files
Options

cmd/abigen: support for --type flag with piped data (#17648)

parent 5ed3960b
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 3 deletions
cmd/abigen/main.go
View file @ f95811e6
...@@ -75,7 +75,7 @@ func main() { ...@@ -75,7 +75,7 @@ func main() {
bins []string bins []string
types []string types []string
) )
if *solFlag != "" || *abiFlag == "-" { if *solFlag != "" || (*abiFlag == "-" && *pkgFlag == "") {
// Generate the list of types to exclude from binding // Generate the list of types to exclude from binding
exclude := make(map[string]bool) exclude := make(map[string]bool)
for _, kind := range strings.Split(*excFlag, ",") { for _, kind := range strings.Split(*excFlag, ",") {
...@@ -111,7 +111,13 @@ func main() { ...@@ -111,7 +111,13 @@ func main() {
} }
} else { } else {
// Otherwise load up the ABI, optional bytecode and type name from the parameters // Otherwise load up the ABI, optional bytecode and type name from the parameters
abi, err := ioutil.ReadFile(*abiFlag) var abi []byte
var err error
if *abiFlag == "-" {
abi, err = ioutil.ReadAll(os.Stdin)
} else {
abi, err = ioutil.ReadFile(*abiFlag)
}
if err != nil { if err != nil {
fmt.Printf("Failed to read input ABI: %v\n", err) fmt.Printf("Failed to read input ABI: %v\n", err)
os.Exit(-1) os.Exit(-1)
...@@ -155,6 +161,5 @@ func contractsFromStdin() (map[string]*compiler.Contract, error) { ...@@ -155,6 +161,5 @@ func contractsFromStdin() (map[string]*compiler.Contract, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
return compiler.ParseCombinedJSON(bytes, "", "", "", "") return compiler.ParseCombinedJSON(bytes, "", "", "", "")
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment