diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-07-04 18:40:23 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-07-04 18:40:23 +0800 |
| commit | 9bb575be7db85f967771018a915fbc4e80345ee2 (patch) | |
| tree | e9af69218da8c63cea625131432d257f5dc56a9b /crypto/crypto.go | |
| parent | 6f69b4d61f1278ea2d9351667512a1202403eaff (diff) | |
| parent | 1959346793bdee469f68841843dd383cf801aba1 (diff) | |
| download | go-tangerine-9bb575be7db85f967771018a915fbc4e80345ee2.tar go-tangerine-9bb575be7db85f967771018a915fbc4e80345ee2.tar.gz go-tangerine-9bb575be7db85f967771018a915fbc4e80345ee2.tar.bz2 go-tangerine-9bb575be7db85f967771018a915fbc4e80345ee2.tar.lz go-tangerine-9bb575be7db85f967771018a915fbc4e80345ee2.tar.xz go-tangerine-9bb575be7db85f967771018a915fbc4e80345ee2.tar.zst go-tangerine-9bb575be7db85f967771018a915fbc4e80345ee2.zip | |
Merge pull request #1283 from ethersphere/frontier/accounts
Account management improvements
Diffstat (limited to 'crypto/crypto.go')
| -rw-r--r-- | crypto/crypto.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/crypto.go b/crypto/crypto.go index 153bbbc5d..deef67415 100644 --- a/crypto/crypto.go +++ b/crypto/crypto.go @@ -209,7 +209,7 @@ func ImportBlockTestKey(privKeyBytes []byte) error { } // creates a Key and stores that in the given KeyStore by decrypting a presale key JSON -func ImportPreSaleKey(keyStore KeyStore2, keyJSON []byte, password string) (*Key, error) { +func ImportPreSaleKey(keyStore KeyStore, keyJSON []byte, password string) (*Key, error) { key, err := decryptPreSaleKey(keyJSON, password) if err != nil { return nil, err |