diff options
| author | zelig <viktor.tron@gmail.com> | 2015-09-10 20:12:41 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2015-09-12 16:52:52 +0800 |
| commit | 17b729759b308a44ebe339fd373a190d0aaf1672 (patch) | |
| tree | 403f5e0c24a9554081910f773b64a9851a0a47cb /common/compiler/solidity_test.go | |
| parent | 55ed8d108d72d12543ecdc6d8c9d9978392dabf0 (diff) | |
| download | dexon-17b729759b308a44ebe339fd373a190d0aaf1672.tar dexon-17b729759b308a44ebe339fd373a190d0aaf1672.tar.gz dexon-17b729759b308a44ebe339fd373a190d0aaf1672.tar.bz2 dexon-17b729759b308a44ebe339fd373a190d0aaf1672.tar.lz dexon-17b729759b308a44ebe339fd373a190d0aaf1672.tar.xz dexon-17b729759b308a44ebe339fd373a190d0aaf1672.tar.zst dexon-17b729759b308a44ebe339fd373a190d0aaf1672.zip | |
Solidity Compiler - solc new API
* adapt to new compiler versioning
* use compiler version as language version
* implement new solc API for versions >= 0.1.[2-9][0-9]* fixes #1770
* add optimize=1 to options
* backward compatibility (for now) for <= 0.1.1, and old versions (0.[2-9][0-9]*.[0-9]+)
* introduce compilerOptions to ContractInfo
* clean up flair, include full version string to version line and ContractInfo
Diffstat (limited to 'common/compiler/solidity_test.go')
| -rw-r--r-- | common/compiler/solidity_test.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/common/compiler/solidity_test.go b/common/compiler/solidity_test.go index 3303bc15a..905a5957c 100644 --- a/common/compiler/solidity_test.go +++ b/common/compiler/solidity_test.go @@ -26,7 +26,7 @@ import ( "github.com/ethereum/go-ethereum/common" ) -const solcVersion = "0.9.23" +const solcVersion = "0.1.1" var ( source = ` @@ -37,16 +37,16 @@ contract test { } } ` - code = "0x605880600c6000396000f3006000357c010000000000000000000000000000000000000000000000000000000090048063c6888fa114602e57005b603d6004803590602001506047565b8060005260206000f35b60006007820290506053565b91905056" - 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.23","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":{}}}` + code = "0x6060604052606d8060116000396000f30060606040526000357c010000000000000000000000000000000000000000000000000000000090048063c6888fa1146037576035565b005b6046600480359060200150605c565b6040518082815260200191505060405180910390f35b60006007820290506068565b91905056" + 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.1.1","compilerVersion":"0.1.1","compilerOptions":"--binary file --json-abi file --natspec-user file --natspec-dev file --add-std 1","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("0xea782f674eb898e477c20e8a7cf11c2c28b09fa68b5278732104f7a101aed255") + infohash = common.HexToHash("0x9f3803735e7f16120c5a140ab3f02121fd3533a9655c69b33a10e78752cc49b0") ) func TestCompiler(t *testing.T) { sol, err := New("") if err != nil { - t.Skip("solc not found: skip") + t.Skip("solc not found: skip: %v", err) } else if sol.Version() != solcVersion { t.Skip("WARNING: skipping due to a newer version of solc found (%v, expect %v)", sol.Version(), solcVersion) } @@ -111,4 +111,4 @@ func TestSaveInfo(t *testing.T) { if cinfohash != infohash { t.Errorf("content hash for info is incorrect. expected %v, got %v", infohash.Hex(), cinfohash.Hex()) } -}
\ No newline at end of file +} |