tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #34 from compleatang/develop

Browse Source 
PreProcess moved to Mutan package
This commit is contained in:
Jeffrey Wilcke 2014-04-28 22:00:07 +02:00
commit c0de11955b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ethereal/ui/ui_lib.go
View File

@ -6,6 +6,7 @@ import (
"github.com/ethereum/eth-go" "github.com/ethereum/eth-go"
"github.com/ethereum/eth-go/ethchain" "github.com/ethereum/eth-go/ethchain"
"github.com/ethereum/eth-go/ethutil" "github.com/ethereum/eth-go/ethutil"
"github.com/obscuren/mutan"
"github.com/ethereum/go-ethereum/utils" "github.com/ethereum/go-ethereum/utils"
"github.com/go-qml/qml" "github.com/go-qml/qml"
"os" "os"
@ -172,7 +173,7 @@ func DefaultAssetPath() string {
func (ui *UiLib) DebugTx(recipient, valueStr, gasStr, gasPriceStr, data string) { func (ui *UiLib) DebugTx(recipient, valueStr, gasStr, gasPriceStr, data string) {
state := ui.eth.BlockChain().CurrentBlock.State() state := ui.eth.BlockChain().CurrentBlock.State()
mainInput, _ := ethutil.PreProcess(data) mainInput, _ := mutan.PreProcess(data)
callerScript, err := utils.Compile(mainInput) callerScript, err := utils.Compile(mainInput)
if err != nil { if err != nil {
ethutil.Config.Log.Debugln(err) ethutil.Config.Log.Debugln(err)

3
utils/compile.go
View File

@ -2,7 +2,6 @@ package utils
import ( import (
"fmt" "fmt"
"github.com/ethereum/eth-go/ethutil"
"github.com/obscuren/mutan" "github.com/obscuren/mutan"
"strings" "strings"
) )
@ -25,7 +24,7 @@ func Compile(script string) ([]byte, error) {
func CompileScript(script string) ([]byte, []byte, error) { func CompileScript(script string) ([]byte, []byte, error) {
// Preprocess // Preprocess
mainInput, initInput := ethutil.PreProcess(script) mainInput, initInput := mutan.PreProcess(script)
// Compile main script // Compile main script
mainScript, err := Compile(mainInput) mainScript, err := Compile(mainInput)
if err != nil { if err != nil {