diff options
author | Péter Szilágyi <peterke@gmail.com> | 2017-02-13 21:03:16 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-13 21:03:16 +0800 |
commit | f8f428cc18c5f70814d7b3937128781bac14bffd (patch) | |
tree | d93d285d2ec22bd8ed646695c3db116c69fa3329 /cmd/gethrpctest/main.go | |
parent | e23e86921b55cb1ee2fca6b6fb9ed91f5532f9fd (diff) | |
parent | e99c788155ddd754c73d2c81b6051dcbd42e6575 (diff) | |
download | go-tangerine-f8f428cc18c5f70814d7b3937128781bac14bffd.tar go-tangerine-f8f428cc18c5f70814d7b3937128781bac14bffd.tar.gz go-tangerine-f8f428cc18c5f70814d7b3937128781bac14bffd.tar.bz2 go-tangerine-f8f428cc18c5f70814d7b3937128781bac14bffd.tar.lz go-tangerine-f8f428cc18c5f70814d7b3937128781bac14bffd.tar.xz go-tangerine-f8f428cc18c5f70814d7b3937128781bac14bffd.tar.zst go-tangerine-f8f428cc18c5f70814d7b3937128781bac14bffd.zip |
Merge pull request #3592 from karalabe/hw-wallets
accounts: initial support for Ledger hardware wallets
Diffstat (limited to 'cmd/gethrpctest/main.go')
-rw-r--r-- | cmd/gethrpctest/main.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cmd/gethrpctest/main.go b/cmd/gethrpctest/main.go index 850bf8eb2..9e80ad05d 100644 --- a/cmd/gethrpctest/main.go +++ b/cmd/gethrpctest/main.go @@ -23,6 +23,7 @@ import ( "os" "os/signal" + "github.com/ethereum/go-ethereum/accounts/keystore" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/eth" "github.com/ethereum/go-ethereum/ethdb" @@ -99,17 +100,18 @@ func MakeSystemNode(privkey string, test *tests.BlockTest) (*node.Node, error) { return nil, err } // Create the keystore and inject an unlocked account if requested - accman := stack.AccountManager() + ks := stack.AccountManager().Backends(keystore.KeyStoreType)[0].(*keystore.KeyStore) + if len(privkey) > 0 { key, err := crypto.HexToECDSA(privkey) if err != nil { return nil, err } - a, err := accman.ImportECDSA(key, "") + a, err := ks.ImportECDSA(key, "") if err != nil { return nil, err } - if err := accman.Unlock(a, ""); err != nil { + if err := ks.Unlock(a, ""); err != nil { return nil, err } } |