aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCasey Kuhlman <caseykuhlman@watershedlegal.com>2014-04-28 17:37:44 +0800
committerCasey Kuhlman <caseykuhlman@watershedlegal.com>2014-04-28 17:40:05 +0800
commita0f35d324822fc66951f8a33526ff3d15b0de09d (patch)
tree217324fd2903e21cb623e05a839db47a68d55086
parent68e5568804cc99d217e7a3aaca796406e428f221 (diff)
downloaddexon-a0f35d324822fc66951f8a33526ff3d15b0de09d.tar.gz
dexon-a0f35d324822fc66951f8a33526ff3d15b0de09d.tar.zst
dexon-a0f35d324822fc66951f8a33526ff3d15b0de09d.zip
PreProcess moved to Mutan package
-rw-r--r--ethereal/ui/ui_lib.go3
-rw-r--r--utils/compile.go3
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 {