ethutil -> common

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 {

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)