diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-12 07:26:40 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-12 07:26:40 +0800 |
| commit | 7ee5cb0a81f9ccc0efec2a5bf830c7566f3289ad (patch) | |
| tree | be71b38f179f61b1941771a0ecaa2555105acc24 /cmd/ethereum/js.go | |
| parent | 70f6f2af07b3f3a4d848190525e50f3327acb2c7 (diff) | |
| parent | 9fb52c517beda2422920eb5b265a0f714d59c39a (diff) | |
| download | dexon-7ee5cb0a81f9ccc0efec2a5bf830c7566f3289ad.tar dexon-7ee5cb0a81f9ccc0efec2a5bf830c7566f3289ad.tar.gz dexon-7ee5cb0a81f9ccc0efec2a5bf830c7566f3289ad.tar.bz2 dexon-7ee5cb0a81f9ccc0efec2a5bf830c7566f3289ad.tar.lz dexon-7ee5cb0a81f9ccc0efec2a5bf830c7566f3289ad.tar.xz dexon-7ee5cb0a81f9ccc0efec2a5bf830c7566f3289ad.tar.zst dexon-7ee5cb0a81f9ccc0efec2a5bf830c7566f3289ad.zip | |
Merge branch 'develop' into rpcfrontier
Diffstat (limited to 'cmd/ethereum/js.go')
| -rw-r--r-- | cmd/ethereum/js.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cmd/ethereum/js.go b/cmd/ethereum/js.go index 5432fb9b1..3b98b588e 100644 --- a/cmd/ethereum/js.go +++ b/cmd/ethereum/js.go @@ -249,12 +249,14 @@ func (self *jsre) dump(call otto.FunctionCall) otto.Value { } func (self *jsre) stopMining(call otto.FunctionCall) otto.Value { - self.xeth.Miner().Stop() + self.ethereum.StopMining() return otto.TrueValue() } func (self *jsre) startMining(call otto.FunctionCall) otto.Value { - self.xeth.Miner().Start() + if err := self.ethereum.StartMining(); err != nil { + return otto.FalseValue() + } return otto.TrueValue() } |