From 03bf902b9280aea91eea087f23a4c7aa1f8638c1 Mon Sep 17 00:00:00 2001 From: zelig Date: Sun, 10 May 2015 13:46:38 +0200 Subject: compiler, cli/js: fix solidity compiler tests failing when a different version of solc installed --- common/compiler/solidity.go | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'common/compiler/solidity.go') diff --git a/common/compiler/solidity.go b/common/compiler/solidity.go index 36d0e96cc..3462436b7 100644 --- a/common/compiler/solidity.go +++ b/common/compiler/solidity.go @@ -88,6 +88,10 @@ func (sol *Solidity) Info() string { return fmt.Sprintf("solc v%s\nSolidity Compiler: %s\n%s", sol.version, sol.solcPath, flair) } +func (sol *Solidity) Version() string { + return sol.version +} + func (sol *Solidity) Compile(source string) (contract *Contract, err error) { if len(source) == 0 { -- cgit v1.2.3 From b79dd188d916da7adbf448dc27b0c59a04e0938d Mon Sep 17 00:00:00 2001 From: Bas van Kervel Date: Tue, 12 May 2015 14:24:11 +0200 Subject: replaced several path.* with filepath.* which is platform independent --- common/compiler/solidity.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'common/compiler/solidity.go') diff --git a/common/compiler/solidity.go b/common/compiler/solidity.go index 3462436b7..6790f9a1d 100644 --- a/common/compiler/solidity.go +++ b/common/compiler/solidity.go @@ -7,7 +7,6 @@ import ( "io/ioutil" "os" "os/exec" - "path" "path/filepath" "regexp" "strings" @@ -130,10 +129,10 @@ func (sol *Solidity) Compile(source string) (contract *Contract, err error) { _, file := filepath.Split(matches[0]) base := strings.Split(file, ".")[0] - codeFile := path.Join(wd, base+".binary") - abiDefinitionFile := path.Join(wd, base+".abi") - userDocFile := path.Join(wd, base+".docuser") - developerDocFile := path.Join(wd, base+".docdev") + codeFile := filepath.Join(wd, base+".binary") + abiDefinitionFile := filepath.Join(wd, base+".abi") + userDocFile := filepath.Join(wd, base+".docuser") + developerDocFile := filepath.Join(wd, base+".docdev") code, err := ioutil.ReadFile(codeFile) if err != nil { -- cgit v1.2.3