diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-17 20:09:22 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-17 20:09:22 +0800 |
| commit | ff55c6f5badda7ef11c38ef5d94b71420b14817c (patch) | |
| tree | 02c5fa61766a61224e8c33deed0c772b7e49e12b /cmd/mist/ui_lib.go | |
| parent | b0ebccb31e944e7cb7fabbbecf279a5507e513ab (diff) | |
| parent | 9663493ba0d493ec62153e725b5d30340f2aa525 (diff) | |
| download | dexon-ff55c6f5badda7ef11c38ef5d94b71420b14817c.tar dexon-ff55c6f5badda7ef11c38ef5d94b71420b14817c.tar.gz dexon-ff55c6f5badda7ef11c38ef5d94b71420b14817c.tar.bz2 dexon-ff55c6f5badda7ef11c38ef5d94b71420b14817c.tar.lz dexon-ff55c6f5badda7ef11c38ef5d94b71420b14817c.tar.xz dexon-ff55c6f5badda7ef11c38ef5d94b71420b14817c.tar.zst dexon-ff55c6f5badda7ef11c38ef5d94b71420b14817c.zip | |
Merge branch 'develop' into conversion
Conflicts:
common/types.go
Diffstat (limited to 'cmd/mist/ui_lib.go')
| -rw-r--r-- | cmd/mist/ui_lib.go | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/cmd/mist/ui_lib.go b/cmd/mist/ui_lib.go index b33b81267..90237d4cb 100644 --- a/cmd/mist/ui_lib.go +++ b/cmd/mist/ui_lib.go @@ -25,9 +25,9 @@ import ( "io/ioutil" "path" + "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/event/filter" "github.com/ethereum/go-ethereum/javascript" "github.com/ethereum/go-ethereum/xeth" @@ -137,15 +137,6 @@ func (self *UiLib) Transact(params map[string]interface{}) (string, error) { ) } -func (self *UiLib) Compile(code string) (string, error) { - bcode, err := common.Compile(code, false) - if err != nil { - return err.Error(), err - } - - return common.Bytes2Hex(bcode), err -} - func (self *UiLib) Call(params map[string]interface{}) (string, error) { object := mapToTxParams(params) |