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 /console | |
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 'console')
-rw-r--r-- | console/console_test.go | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/console/console_test.go b/console/console_test.go index 7738d0c44..fd3459139 100644 --- a/console/console_test.go +++ b/console/console_test.go @@ -23,12 +23,10 @@ import ( "io/ioutil" "math/big" "os" - "path/filepath" "strings" "testing" "time" - "github.com/ethereum/go-ethereum/accounts" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/eth" @@ -92,18 +90,16 @@ func newTester(t *testing.T, confOverride func(*eth.Config)) *tester { if err != nil { t.Fatalf("failed to create temporary keystore: %v", err) } - accman := accounts.NewPlaintextManager(filepath.Join(workspace, "keystore")) // Create a networkless protocol stack and start an Ethereum service within - stack, err := node.New(&node.Config{DataDir: workspace, Name: testInstance, NoDiscovery: true}) + stack, err := node.New(&node.Config{DataDir: workspace, UseLightweightKDF: true, Name: testInstance, NoDiscovery: true}) if err != nil { t.Fatalf("failed to create node: %v", err) } ethConf := ð.Config{ - ChainConfig: &core.ChainConfig{HomesteadBlock: new(big.Int)}, - Etherbase: common.HexToAddress(testAddress), - AccountManager: accman, - PowTest: true, + ChainConfig: &core.ChainConfig{HomesteadBlock: new(big.Int)}, + Etherbase: common.HexToAddress(testAddress), + PowTest: true, } if confOverride != nil { confOverride(ethConf) |