diff options
| author | Taylor Gerring <taylor.gerring@gmail.com> | 2014-12-22 01:42:32 +0800 |
|---|---|---|
| committer | Taylor Gerring <taylor.gerring@gmail.com> | 2014-12-22 01:42:32 +0800 |
| commit | 1360f027d9e365242466ca346b2b56f421729d91 (patch) | |
| tree | a30ff7292e87583781b682b47d851d0f6e1925fc /ethutil/script_unix.go | |
| parent | b3629c6f62bd3774eb8858819a8ee07dfb775b73 (diff) | |
| parent | 795b14330ad4399ef292835eac452d258dcd7464 (diff) | |
| download | dexon-1360f027d9e365242466ca346b2b56f421729d91.tar dexon-1360f027d9e365242466ca346b2b56f421729d91.tar.gz dexon-1360f027d9e365242466ca346b2b56f421729d91.tar.bz2 dexon-1360f027d9e365242466ca346b2b56f421729d91.tar.lz dexon-1360f027d9e365242466ca346b2b56f421729d91.tar.xz dexon-1360f027d9e365242466ca346b2b56f421729d91.tar.zst dexon-1360f027d9e365242466ca346b2b56f421729d91.zip | |
Merge pull request #216 from ethereum/develop
Update tests branch from develop
Diffstat (limited to 'ethutil/script_unix.go')
| -rw-r--r-- | ethutil/script_unix.go | 42 |
1 files changed, 6 insertions, 36 deletions
diff --git a/ethutil/script_unix.go b/ethutil/script_unix.go index 6827d4e2f..9250dda57 100644 --- a/ethutil/script_unix.go +++ b/ethutil/script_unix.go @@ -2,47 +2,17 @@ package ethutil -import ( - "fmt" - "strings" - - "github.com/ethereum/serpent-go" - "github.com/obscuren/mutan" - "github.com/obscuren/mutan/backends" -) +import "github.com/ethereum/serpent-go" // General compile function func Compile(script string, silent bool) (ret []byte, err error) { if len(script) > 2 { - line := strings.Split(script, "\n")[0] - - if len(line) > 1 && line[0:2] == "#!" { - switch line { - case "#!serpent": - byteCode, err := serpent.Compile(script) - if err != nil { - return nil, err - } - - return byteCode, nil - } - } else { - - compiler := mutan.NewCompiler(backend.NewEthereumBackend()) - compiler.Silent = silent - byteCode, errors := compiler.Compile(strings.NewReader(script)) - if len(errors) > 0 { - var errs string - for _, er := range errors { - if er != nil { - errs += er.Error() - } - } - return nil, fmt.Errorf("%v", errs) - } - - return byteCode, nil + byteCode, err := serpent.Compile(script) + if err != nil { + return nil, err } + + return byteCode, nil } return nil, nil |