diff options
| author | Felix Lange <fjl@twurst.com> | 2016-08-16 00:38:32 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2016-08-17 23:39:03 +0800 |
| commit | 312263c7d9457fe7c24aac8e42a4cf2efc6ccd8e (patch) | |
| tree | e10f9cc260af1ce13cb67b02bbce9c17c3b09de2 /cmd/geth/consolecmd.go | |
| parent | d6625ac34dad741f5659ca1dad3b0179603d37f0 (diff) | |
| download | dexon-312263c7d9457fe7c24aac8e42a4cf2efc6ccd8e.tar dexon-312263c7d9457fe7c24aac8e42a4cf2efc6ccd8e.tar.gz dexon-312263c7d9457fe7c24aac8e42a4cf2efc6ccd8e.tar.bz2 dexon-312263c7d9457fe7c24aac8e42a4cf2efc6ccd8e.tar.lz dexon-312263c7d9457fe7c24aac8e42a4cf2efc6ccd8e.tar.xz dexon-312263c7d9457fe7c24aac8e42a4cf2efc6ccd8e.tar.zst dexon-312263c7d9457fe7c24aac8e42a4cf2efc6ccd8e.zip | |
cmd/utils, node: create account manager in package node
The account manager was previously created by packge cmd/utils as part
of flag processing and then passed down into eth.Ethereum through its
config struct. Since we are starting to create nodes which do not have
eth.Ethereum as a registered service, the code was rearranged to
register the account manager as its own service. Making it a service is
ugly though and it doesn't really fix the root cause: creating nodes
without eth.Ethereum requires duplicating lots of code.
This commit splits utils.MakeSystemNode into three functions, making
creation of other node/service configurations easier. It also moves the
account manager into Node so it can be used by those configurations
without requiring package eth.
Diffstat (limited to 'cmd/geth/consolecmd.go')
| -rw-r--r-- | cmd/geth/consolecmd.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/geth/consolecmd.go b/cmd/geth/consolecmd.go index 8d53809ce..92d6f7f86 100644 --- a/cmd/geth/consolecmd.go +++ b/cmd/geth/consolecmd.go @@ -65,7 +65,7 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso // same time. func localConsole(ctx *cli.Context) error { // Create and start the node based on the CLI flags - node := utils.MakeSystemNode(clientIdentifier, verString, relConfig, makeDefaultExtra(), ctx) + node := makeFullNode(ctx) startNode(ctx, node) defer node.Stop() @@ -149,7 +149,7 @@ func dialRPC(endpoint string) (*rpc.Client, error) { // everything down. func ephemeralConsole(ctx *cli.Context) error { // Create and start the node based on the CLI flags - node := utils.MakeSystemNode(clientIdentifier, verString, relConfig, makeDefaultExtra(), ctx) + node := makeFullNode(ctx) startNode(ctx, node) defer node.Stop() |