aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzelig <viktor.tron@gmail.com>2015-03-16 23:48:54 +0800
committerzelig <viktor.tron@gmail.com>2015-03-16 23:48:54 +0800
commitb4060da9eb717f43346f24822f5b25c3385a8519 (patch)
treefcc4e2a94c5b3238796b20ac27257d6a7478fc69
parent5e7702fd050ed5520a03cc2cfc8b1f45a70f35fb (diff)
downloadgo-tangerine-b4060da9eb717f43346f24822f5b25c3385a8519.tar.gz
go-tangerine-b4060da9eb717f43346f24822f5b25c3385a8519.tar.zst
go-tangerine-b4060da9eb717f43346f24822f5b25c3385a8519.zip
ethutil -> common
-rw-r--r--jsre/jsre.go4
-rw-r--r--jsre/jsre_test.go6
2 files changed, 5 insertions, 5 deletions
diff --git a/jsre/jsre.go b/jsre/jsre.go
index 7ae5be742..31ea955e6 100644
--- a/jsre/jsre.go
+++ b/jsre/jsre.go
@@ -5,7 +5,7 @@ import (
"github.com/obscuren/otto"
"io/ioutil"
- "github.com/ethereum/go-ethereum/ethutil"
+ "github.com/ethereum/go-ethereum/common"
)
/*
@@ -37,7 +37,7 @@ func New(assetPath string) *JSRE {
// Exec(file) loads and runs the contents of a file
// if a relative path is given, the jsre's assetPath is used
func (self *JSRE) Exec(file string) error {
- return self.exec(ethutil.AbsolutePath(self.assetPath, file))
+ return self.exec(common.AbsolutePath(self.assetPath, file))
}
func (self *JSRE) exec(path string) error {
diff --git a/jsre/jsre_test.go b/jsre/jsre_test.go
index e4decf2f4..f01854b51 100644
--- a/jsre/jsre_test.go
+++ b/jsre/jsre_test.go
@@ -4,7 +4,7 @@ import (
"github.com/obscuren/otto"
"testing"
- "github.com/ethereum/go-ethereum/ethutil"
+ "github.com/ethereum/go-ethereum/common"
)
type testNativeObjectBinding struct {
@@ -26,7 +26,7 @@ func (no *testNativeObjectBinding) TestMethod(call otto.FunctionCall) otto.Value
func TestExec(t *testing.T) {
jsre := New("/tmp")
- ethutil.WriteFile("/tmp/test.js", []byte(`msg = "testMsg"`))
+ common.WriteFile("/tmp/test.js", []byte(`msg = "testMsg"`))
err := jsre.Exec("test.js")
if err != nil {
t.Errorf("expected no error, got %v", err)
@@ -64,7 +64,7 @@ func TestBind(t *testing.T) {
func TestLoadScript(t *testing.T) {
jsre := New("/tmp")
- ethutil.WriteFile("/tmp/test.js", []byte(`msg = "testMsg"`))
+ common.WriteFile("/tmp/test.js", []byte(`msg = "testMsg"`))
_, err := jsre.Run(`loadScript("test.js")`)
if err != nil {
t.Errorf("expected no error, got %v", err)