aboutsummaryrefslogtreecommitdiffstats
path: root/console
diff options
context:
space:
mode:
authorFelix Lange <fjl@twurst.com>2016-08-18 02:59:59 +0800
committerGitHub <noreply@github.com>2016-08-18 02:59:59 +0800
commit475521dd747070372f84c2b0ac202e14216dc0e0 (patch)
treee97fb7892b21c503a7661578df0ff5a1f6d8e29c /console
parent3369783e0a3e0c06388cf59fddfd799811381a2b (diff)
parent3c09c5f12d21258865677cf565bb9d53a8098d3a (diff)
downloaddexon-475521dd747070372f84c2b0ac202e14216dc0e0.tar
dexon-475521dd747070372f84c2b0ac202e14216dc0e0.tar.gz
dexon-475521dd747070372f84c2b0ac202e14216dc0e0.tar.bz2
dexon-475521dd747070372f84c2b0ac202e14216dc0e0.tar.lz
dexon-475521dd747070372f84c2b0ac202e14216dc0e0.tar.xz
dexon-475521dd747070372f84c2b0ac202e14216dc0e0.tar.zst
dexon-475521dd747070372f84c2b0ac202e14216dc0e0.zip
Merge pull request #2909 from fjl/account-manager-cleanup
all: clean up tech debt left behind by the API split
Diffstat (limited to 'console')
-rw-r--r--console/console_test.go12
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 := &eth.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)