diff options
| author | obscuren <geffobscura@gmail.com> | 2014-10-27 18:50:38 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-10-27 18:50:38 +0800 |
| commit | b095bd32371f02d204a4d0fbde75dc58baa7430d (patch) | |
| tree | 2711b376e03855a096fe8d14f08c83c655192f1b | |
| parent | 1d3f43f060e9ebb312fc3b17fc0fe43c8f95cd82 (diff) | |
| download | dexon-b095bd32371f02d204a4d0fbde75dc58baa7430d.tar dexon-b095bd32371f02d204a4d0fbde75dc58baa7430d.tar.gz dexon-b095bd32371f02d204a4d0fbde75dc58baa7430d.tar.bz2 dexon-b095bd32371f02d204a4d0fbde75dc58baa7430d.tar.lz dexon-b095bd32371f02d204a4d0fbde75dc58baa7430d.tar.xz dexon-b095bd32371f02d204a4d0fbde75dc58baa7430d.tar.zst dexon-b095bd32371f02d204a4d0fbde75dc58baa7430d.zip | |
events should be set prior to calling mainloop
| -rw-r--r-- | cmd/mist/flags.go | 2 | ||||
| -rw-r--r-- | javascript/javascript_runtime.go | 8 | ||||
| -rw-r--r-- | utils/cmd.go | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/cmd/mist/flags.go b/cmd/mist/flags.go index 5283c332b..3aa2e21c8 100644 --- a/cmd/mist/flags.go +++ b/cmd/mist/flags.go @@ -67,7 +67,7 @@ func defaultAssetPath() string { // assume a debug build and use the source directory as // asset directory. pwd, _ := os.Getwd() - if pwd == path.Join(os.Getenv("GOPATH"), "src", "github.com", "ethereum", "go-ethereum", "mist") { + if pwd == path.Join(os.Getenv("GOPATH"), "src", "github.com", "ethereum", "go-ethereum", "cmd", "mist") { assetPath = path.Join(pwd, "assets") } else { switch runtime.GOOS { diff --git a/javascript/javascript_runtime.go b/javascript/javascript_runtime.go index b0d7c81b5..704635d97 100644 --- a/javascript/javascript_runtime.go +++ b/javascript/javascript_runtime.go @@ -41,7 +41,7 @@ func (jsre *JSRE) LoadExtFile(path string) { } func (jsre *JSRE) LoadIntFile(file string) { - assetPath := path.Join(os.Getenv("GOPATH"), "src", "github.com", "ethereum", "go-ethereum", "mist", "assets", "ext") + assetPath := path.Join(os.Getenv("GOPATH"), "src", "github.com", "ethereum", "go-ethereum", "cmd", "mist", "assets", "ext") jsre.LoadExtFile(path.Join(assetPath, file)) } @@ -62,13 +62,13 @@ func NewJSRE(ethereum *eth.Ethereum) *JSRE { re.LoadIntFile("string.js") re.LoadIntFile("big.js") - // We have to make sure that, whoever calls this, calls "Stop" - go re.mainLoop() - // Subscribe to events mux := ethereum.EventMux() re.events = mux.Subscribe(ethchain.NewBlockEvent{}) + // We have to make sure that, whoever calls this, calls "Stop" + go re.mainLoop() + re.Bind("eth", &JSEthereum{re.pipe, re.Vm, ethereum}) re.initStdFuncs() diff --git a/utils/cmd.go b/utils/cmd.go index 76faa5dac..c46e1f00d 100644 --- a/utils/cmd.go +++ b/utils/cmd.go @@ -192,7 +192,7 @@ func DefaultAssetPath() string { // assume a debug build and use the source directory as // asset directory. pwd, _ := os.Getwd() - if pwd == path.Join(os.Getenv("GOPATH"), "src", "github.com", "ethereum", "go-ethereum", "mist") { + if pwd == path.Join(os.Getenv("GOPATH"), "src", "github.com", "ethereum", "go-ethereum", "cmd", "mist") { assetPath = path.Join(pwd, "assets") } else { switch runtime.GOOS { |