diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-16 23:31:08 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-16 23:31:16 +0800 |
| commit | 22893b7ac925c49168c119f293ea8befc3aff5cc (patch) | |
| tree | 4c02c0d06cdf41729ec742775f2987fb7137bcc8 /cmd/mist | |
| parent | 3cf51d5479ab91cee100c4ca04d9db3a848ff8d2 (diff) | |
| download | dexon-22893b7ac925c49168c119f293ea8befc3aff5cc.tar dexon-22893b7ac925c49168c119f293ea8befc3aff5cc.tar.gz dexon-22893b7ac925c49168c119f293ea8befc3aff5cc.tar.bz2 dexon-22893b7ac925c49168c119f293ea8befc3aff5cc.tar.lz dexon-22893b7ac925c49168c119f293ea8befc3aff5cc.tar.xz dexon-22893b7ac925c49168c119f293ea8befc3aff5cc.tar.zst dexon-22893b7ac925c49168c119f293ea8befc3aff5cc.zip | |
removed compile
Diffstat (limited to 'cmd/mist')
| -rw-r--r-- | cmd/mist/bindings.go | 15 | ||||
| -rw-r--r-- | cmd/mist/ui_lib.go | 11 |
2 files changed, 4 insertions, 22 deletions
diff --git a/cmd/mist/bindings.go b/cmd/mist/bindings.go index 1371c752c..5d08e7dd7 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" ) @@ -37,18 +37,9 @@ 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) - } else { - data = common.Bytes2Hex(utils.FormatTransactionData(d)) - } + d = common.Bytes2Hex(utils.FormatTransactionData(d)) - return gui.xeth.Transact(from, recipient, value, gas, gasPrice, data) + return gui.xeth.Transact(from, recipient, value, gas, gasPrice, d) } func (self *Gui) AddPlugin(pluginPath string) { 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) |