aboutsummaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorzelig <viktor.tron@gmail.com>2015-05-10 19:46:38 +0800
committerzelig <viktor.tron@gmail.com>2015-05-12 18:36:54 +0800
commit03bf902b9280aea91eea087f23a4c7aa1f8638c1 (patch)
treea2ef69557d3d2d5627b2082d376e361ead01b475 /common
parent76215ca9f3c22b97d81b492026691a692cc2ce1a (diff)
downloaddexon-03bf902b9280aea91eea087f23a4c7aa1f8638c1.tar
dexon-03bf902b9280aea91eea087f23a4c7aa1f8638c1.tar.gz
dexon-03bf902b9280aea91eea087f23a4c7aa1f8638c1.tar.bz2
dexon-03bf902b9280aea91eea087f23a4c7aa1f8638c1.tar.lz
dexon-03bf902b9280aea91eea087f23a4c7aa1f8638c1.tar.xz
dexon-03bf902b9280aea91eea087f23a4c7aa1f8638c1.tar.zst
dexon-03bf902b9280aea91eea087f23a4c7aa1f8638c1.zip
compiler, cli/js: fix solidity compiler tests failing when a different version of solc installed
Diffstat (limited to 'common')
-rw-r--r--common/compiler/solidity.go4
-rw-r--r--common/compiler/solidity_test.go8
2 files changed, 9 insertions, 3 deletions
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 {
diff --git a/common/compiler/solidity_test.go b/common/compiler/solidity_test.go
index 8fdcb6a99..7fdc405a6 100644
--- a/common/compiler/solidity_test.go
+++ b/common/compiler/solidity_test.go
@@ -9,6 +9,8 @@ import (
"github.com/ethereum/go-ethereum/common"
)
+const solcVersion = "0.9.17"
+
var (
source = `
contract test {
@@ -19,9 +21,9 @@ contract test {
}
`
code = "605280600c6000396000f3006000357c010000000000000000000000000000000000000000000000000000000090048063c6888fa114602e57005b60376004356041565b8060005260206000f35b6000600782029050604d565b91905056"
- info = `{"source":"\ncontract test {\n /// @notice Will multiply ` + "`a`" + ` by 7.\n function multiply(uint a) returns(uint d) {\n return a * 7;\n }\n}\n","language":"Solidity","languageVersion":"0","compilerVersion":"0.9.13","abiDefinition":[{"constant":false,"inputs":[{"name":"a","type":"uint256"}],"name":"multiply","outputs":[{"name":"d","type":"uint256"}],"type":"function"}],"userDoc":{"methods":{"multiply(uint256)":{"notice":"Will multiply ` + "`a`" + ` by 7."}}},"developerDoc":{"methods":{}}}`
+ info = `{"source":"\ncontract test {\n /// @notice Will multiply ` + "`a`" + ` by 7.\n function multiply(uint a) returns(uint d) {\n return a * 7;\n }\n}\n","language":"Solidity","languageVersion":"0","compilerVersion":"0.9.17","abiDefinition":[{"constant":false,"inputs":[{"name":"a","type":"uint256"}],"name":"multiply","outputs":[{"name":"d","type":"uint256"}],"type":"function"}],"userDoc":{"methods":{"multiply(uint256)":{"notice":"Will multiply ` + "`a`" + ` by 7."}}},"developerDoc":{"methods":{}}}`
- infohash = common.HexToHash("0xfdb031637e8a1c1891143f8d129ebc7f7c4e4b41ecad8c85abe1756190f74204")
+ infohash = common.HexToHash("0x834075768a68e500e459b9c3213750c84de3df47156500cb01bb664d3f88c60a")
)
func TestCompiler(t *testing.T) {
@@ -41,7 +43,7 @@ func TestCompiler(t *testing.T) {
func TestCompileError(t *testing.T) {
sol, err := New("")
- if err != nil {
+ if err != nil || sol.version != solcVersion {
t.Skip("no solc installed")
}
contract, err := sol.Compile(source[2:])