Merge pull request #34 from compleatang/develop

PreProcess moved to Mutan package
ethereum · Apr 28, 2014 · c0de119 · c0de119
2 parents 68e5568 + a0f35d3
commit c0de119
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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 {