From 0858fae12fce4f84ecebdccb30800f133afdbea3 Mon Sep 17 00:00:00 2001 From: Maran Date: Mon, 16 Mar 2015 16:53:17 +0100 Subject: [PATCH] Remove Compile() from Mist It's currently preventing mist from being build and taking down Travis with it. --- cmd/mist/bindings.go | 8 ++------ cmd/mist/ui_lib.go | 11 +---------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/cmd/mist/bindings.go b/cmd/mist/bindings.go index 1371c752c2..9c475faf4d 100644 --- a/cmd/mist/bindings.go +++ b/cmd/mist/bindings.go @@ -26,8 +26,8 @@ import ( "strconv" "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/state" ) @@ -39,11 +39,7 @@ type plugin struct { func (gui *Gui) Transact(from, recipient, value, gas, gasPrice, d string) (string, error) { var data string if len(recipient) == 0 { - code, err := common.Compile(d, false) - if err != nil { - return "", err - } - data = common.Bytes2Hex(code) + data = d } else { data = common.Bytes2Hex(utils.FormatTransactionData(d)) } diff --git a/cmd/mist/ui_lib.go b/cmd/mist/ui_lib.go index b33b812670..90237d4cb8 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)