diff options
| -rw-r--r-- | .github/CONTRIBUTING.md | 2 | ||||
| -rw-r--r-- | common/compiler/solidity.go | 1 | ||||
| -rw-r--r-- | eth/api.go | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 829bf5d43..87801c29f 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -8,7 +8,7 @@ and help. ## Contributing If you'd like to contribute to go-ethereum please fork, fix, commit and -send a pull request. Commits who do not comply with the coding standards +send a pull request. Commits which do not comply with the coding standards are ignored (use gofmt!). If you send pull requests make absolute sure that you commit on the `develop` branch and that you do not merge to master. Commits that are directly based on master are simply ignored. diff --git a/common/compiler/solidity.go b/common/compiler/solidity.go index ddf7a1ac9..6a5bfecd8 100644 --- a/common/compiler/solidity.go +++ b/common/compiler/solidity.go @@ -149,7 +149,6 @@ func (sol *Solidity) Compile(source string) (map[string]*Contract, error) { compilerOptions := strings.Join(params, " ") cmd := exec.Command(sol.solcPath, params...) - cmd.Dir = wd cmd.Stdin = strings.NewReader(source) cmd.Stderr = stderr diff --git a/eth/api.go b/eth/api.go index d048904f3..f5f942c27 100644 --- a/eth/api.go +++ b/eth/api.go @@ -113,7 +113,7 @@ func (s *PublicEthereumAPI) GasPrice() *big.Int { // GetCompilers returns the collection of available smart contract compilers func (s *PublicEthereumAPI) GetCompilers() ([]string, error) { solc, err := s.e.Solc() - if err != nil && solc != nil { + if err == nil && solc != nil { return []string{"Solidity"}, nil } |