diff options
| author | zelig <viktor.tron@gmail.com> | 2015-03-16 23:50:29 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2015-03-16 23:50:29 +0800 |
| commit | b3e133dd159749a625c4b0245af293607ba12c8c (patch) | |
| tree | 9ba8e8c4afe9168f5bc83219d402efb00387d616 /jsre/jsre.go | |
| parent | 8139d444f8d8163251d1c96ef8034d186825ce32 (diff) | |
| parent | 73af0302bed5076260ac935e452064aee423934d (diff) | |
| download | dexon-b3e133dd159749a625c4b0245af293607ba12c8c.tar dexon-b3e133dd159749a625c4b0245af293607ba12c8c.tar.gz dexon-b3e133dd159749a625c4b0245af293607ba12c8c.tar.bz2 dexon-b3e133dd159749a625c4b0245af293607ba12c8c.tar.lz dexon-b3e133dd159749a625c4b0245af293607ba12c8c.tar.xz dexon-b3e133dd159749a625c4b0245af293607ba12c8c.tar.zst dexon-b3e133dd159749a625c4b0245af293607ba12c8c.zip | |
Merge branch 'frontier/js' into frontier/nodeadmin.js
Diffstat (limited to 'jsre/jsre.go')
| -rw-r--r-- | jsre/jsre.go | 4 |
1 files changed, 2 insertions, 2 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 { |