From 5429dc75bd15e5436221cc08891b6ef3c9d2378e Mon Sep 17 00:00:00 2001 From: Vitaly Bogdanov Date: Mon, 27 May 2019 21:28:17 +0300 Subject: [PATCH] cmd/abigen: allow using `abigen --pkg` flag with standard input (#19207) --- cmd/abigen/main.go | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/cmd/abigen/main.go b/cmd/abigen/main.go index b6ec04ce16..461c294681 100644 --- a/cmd/abigen/main.go +++ b/cmd/abigen/main.go @@ -81,7 +81,7 @@ func main() { bins []string types []string ) - if *solFlag != "" || *vyFlag != "" || (*abiFlag == "-" && *pkgFlag == "") { + if *solFlag != "" || *vyFlag != "" || *abiFlag == "-" { // Generate the list of types to exclude from binding exclude := make(map[string]bool) for _, kind := range strings.Split(*excFlag, ",") { @@ -129,13 +129,8 @@ func main() { } } else { // Otherwise load up the ABI, optional bytecode and type name from the parameters - var abi []byte - var err error - if *abiFlag == "-" { - abi, err = ioutil.ReadAll(os.Stdin) - } else { - abi, err = ioutil.ReadFile(*abiFlag) - } + abi, err := ioutil.ReadFile(*abiFlag) + if err != nil { fmt.Printf("Failed to read input ABI: %v\n", err) os.Exit(-1)