diff options
| author | Jeffrey Wilcke <obscuren@users.noreply.github.com> | 2014-04-29 04:00:07 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <obscuren@users.noreply.github.com> | 2014-04-29 04:00:07 +0800 |
| commit | c0de11955b3a15e6122e3ec9b68623515d311962 (patch) | |
| tree | 217324fd2903e21cb623e05a839db47a68d55086 | |
| parent | 68e5568804cc99d217e7a3aaca796406e428f221 (diff) | |
| parent | a0f35d324822fc66951f8a33526ff3d15b0de09d (diff) | |
| download | dexon-c0de11955b3a15e6122e3ec9b68623515d311962.tar.gz dexon-c0de11955b3a15e6122e3ec9b68623515d311962.tar.zst dexon-c0de11955b3a15e6122e3ec9b68623515d311962.zip | |
Merge pull request #34 from compleatang/develop
PreProcess moved to Mutan package
| -rw-r--r-- | ethereal/ui/ui_lib.go | 3 | ||||
| -rw-r--r-- | utils/compile.go | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ethereal/ui/ui_lib.go b/ethereal/ui/ui_lib.go index 309ab7928..a9bde74b0 100644 --- a/ethereal/ui/ui_lib.go +++ b/ethereal/ui/ui_lib.go @@ -6,6 +6,7 @@ import ( "github.com/ethereum/eth-go" "github.com/ethereum/eth-go/ethchain" "github.com/ethereum/eth-go/ethutil" + "github.com/obscuren/mutan" "github.com/ethereum/go-ethereum/utils" "github.com/go-qml/qml" "os" @@ -172,7 +173,7 @@ func DefaultAssetPath() string { func (ui *UiLib) DebugTx(recipient, valueStr, gasStr, gasPriceStr, data string) { state := ui.eth.BlockChain().CurrentBlock.State() - mainInput, _ := ethutil.PreProcess(data) + mainInput, _ := mutan.PreProcess(data) callerScript, err := utils.Compile(mainInput) if err != nil { ethutil.Config.Log.Debugln(err) diff --git a/utils/compile.go b/utils/compile.go index 12e3a60c3..6d75f73d1 100644 --- a/utils/compile.go +++ b/utils/compile.go @@ -2,7 +2,6 @@ package utils import ( "fmt" - "github.com/ethereum/eth-go/ethutil" "github.com/obscuren/mutan" "strings" ) @@ -25,7 +24,7 @@ func Compile(script string) ([]byte, error) { func CompileScript(script string) ([]byte, []byte, error) { // Preprocess - mainInput, initInput := ethutil.PreProcess(script) + mainInput, initInput := mutan.PreProcess(script) // Compile main script mainScript, err := Compile(mainInput) if err != nil { |