accounts/abi/bind: pass non-empty directory when calling goimports (#15070)

pull/3644/merge
nkbai 7 years ago committed by Felix Lange
parent fc87bc5f52
commit 5ba9225fe3
  1. 2
      accounts/abi/bind/bind.go
  2. 2
      accounts/abi/bind/bind_test.go

@ -122,7 +122,7 @@ func Bind(types []string, abis []string, bytecodes []string, pkg string, lang La
} }
// For Go bindings pass the code through goimports to clean it up and double check // For Go bindings pass the code through goimports to clean it up and double check
if lang == LangGo { if lang == LangGo {
code, err := imports.Process("", buffer.Bytes(), nil) code, err := imports.Process(".", buffer.Bytes(), nil)
if err != nil { if err != nil {
return "", fmt.Errorf("%v\n%s", err, buffer) return "", fmt.Errorf("%v\n%s", err, buffer)
} }

@ -459,7 +459,7 @@ func TestBindings(t *testing.T) {
} }
// Skip the test if the go-ethereum sources are symlinked (https://github.com/golang/go/issues/14845) // Skip the test if the go-ethereum sources are symlinked (https://github.com/golang/go/issues/14845)
linkTestCode := fmt.Sprintf("package linktest\nfunc CheckSymlinks(){\nfmt.Println(backends.NewSimulatedBackend(nil))\n}") linkTestCode := fmt.Sprintf("package linktest\nfunc CheckSymlinks(){\nfmt.Println(backends.NewSimulatedBackend(nil))\n}")
linkTestDeps, err := imports.Process("", []byte(linkTestCode), nil) linkTestDeps, err := imports.Process(os.TempDir(), []byte(linkTestCode), nil)
if err != nil { if err != nil {
t.Fatalf("failed check for goimports symlink bug: %v", err) t.Fatalf("failed check for goimports symlink bug: %v", err)
} }

Loading…
Cancel
Save