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 | |
| 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')
| -rw-r--r-- | cmd/ethereum/js.go | 6 | ||||
| -rw-r--r-- | cmd/ethereum/main.go | 13 |
2 files changed, 7 insertions, 12 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() } diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go index 73c67bdc9..8b01457e6 100644 --- a/cmd/ethereum/main.go +++ b/cmd/ethereum/main.go @@ -30,7 +30,6 @@ import ( "time" "github.com/codegangsta/cli" - "github.com/ethereum/go-ethereum/accounts" "github.com/ethereum/go-ethereum/cmd/utils" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/eth" @@ -158,10 +157,7 @@ func run(ctx *cli.Context) { fmt.Printf("Welcome to the FRONTIER\n") utils.HandleInterrupt() eth, err := utils.GetEthereum(ClientIdentifier, Version, ctx) - if err == accounts.ErrNoKeys { - utils.Fatalf(`No accounts configured. -Please run 'ethereum account new' to create a new account.`) - } else if err != nil { + if err != nil { utils.Fatalf("%v", err) } @@ -172,10 +168,7 @@ Please run 'ethereum account new' to create a new account.`) func runjs(ctx *cli.Context) { eth, err := utils.GetEthereum(ClientIdentifier, Version, ctx) - if err == accounts.ErrNoKeys { - utils.Fatalf(`No accounts configured. -Please run 'ethereum account new' to create a new account.`) - } else if err != nil { + if err != nil { utils.Fatalf("%v", err) } @@ -214,7 +207,7 @@ func startEth(ctx *cli.Context, eth *eth.Ethereum) { utils.StartRPC(eth, ctx) } if ctx.GlobalBool(utils.MiningEnabledFlag.Name) { - eth.Miner().Start() + eth.StartMining() } } |