diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2016-06-30 17:57:50 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-30 17:57:50 +0800 |
| commit | 1e50f5dd281d28b8db1c65b9e80e53080b86e369 (patch) | |
| tree | 30a0832e6f514fe06fe9308043eaa20d2ba44b13 /cmd/geth | |
| parent | f127799d795eaf2d6f99780c058361cd561492f1 (diff) | |
| parent | 3a97280ae889bb6852ba16e70750a37b2ed08473 (diff) | |
| download | dexon-1e50f5dd281d28b8db1c65b9e80e53080b86e369.tar dexon-1e50f5dd281d28b8db1c65b9e80e53080b86e369.tar.gz dexon-1e50f5dd281d28b8db1c65b9e80e53080b86e369.tar.bz2 dexon-1e50f5dd281d28b8db1c65b9e80e53080b86e369.tar.lz dexon-1e50f5dd281d28b8db1c65b9e80e53080b86e369.tar.xz dexon-1e50f5dd281d28b8db1c65b9e80e53080b86e369.tar.zst dexon-1e50f5dd281d28b8db1c65b9e80e53080b86e369.zip | |
Merge pull request #2159 from zsfelfoldi/light-backend
eth: separate common and full node-specific API and backend service
Diffstat (limited to 'cmd/geth')
| -rw-r--r-- | cmd/geth/main.go | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go index c372430f1..623f8ac81 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -29,6 +29,7 @@ import ( "time" "github.com/ethereum/ethash" + "github.com/ethereum/go-ethereum/accounts" "github.com/ethereum/go-ethereum/cmd/utils" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/console" @@ -313,11 +314,10 @@ func startNode(ctx *cli.Context, stack *node.Node) { utils.StartNode(stack) // Unlock any account specifically requested - var ethereum *eth.Ethereum - if err := stack.Service(ðereum); err != nil { + var accman *accounts.Manager + if err := stack.Service(&accman); err != nil { utils.Fatalf("ethereum service not running: %v", err) } - accman := ethereum.AccountManager() passwords := utils.MakePasswordList(ctx) accounts := strings.Split(ctx.GlobalString(utils.UnlockedAccountFlag.Name), ",") @@ -328,6 +328,10 @@ func startNode(ctx *cli.Context, stack *node.Node) { } // Start auxiliary services if enabled if ctx.GlobalBool(utils.MiningEnabledFlag.Name) { + var ethereum *eth.FullNodeService + if err := stack.Service(ðereum); err != nil { + utils.Fatalf("ethereum service not running: %v", err) + } if err := ethereum.StartMining(ctx.GlobalInt(utils.MinerThreadsFlag.Name), ctx.GlobalString(utils.MiningGPUFlag.Name)); err != nil { utils.Fatalf("Failed to start mining: %v", err) } |