From b37d175e59cda8c6afd6b4b1d6b7ed921dc59279 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Thu, 8 Dec 2016 14:42:31 +0200 Subject: accounts, internal, mobile: polish accounts API, extend Android tests --- accounts/account_manager.go | 4 ++-- accounts/accounts_test.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'accounts') diff --git a/accounts/account_manager.go b/accounts/account_manager.go index 12ff30bca..6460b6e85 100644 --- a/accounts/account_manager.go +++ b/accounts/account_manager.go @@ -152,8 +152,8 @@ func (am *Manager) Sign(addr common.Address, hash []byte) ([]byte, error) { // SignWithPassphrase signs hash if the private key matching the given address // can be decrypted with the given passphrase. The produced signature is in the // [R || S || V] format where V is 0 or 1. -func (am *Manager) SignWithPassphrase(addr common.Address, passphrase string, hash []byte) (signature []byte, err error) { - _, key, err := am.getDecryptedKey(Account{Address: addr}, passphrase) +func (am *Manager) SignWithPassphrase(a Account, passphrase string, hash []byte) (signature []byte, err error) { + _, key, err := am.getDecryptedKey(a, passphrase) if err != nil { return nil, err } diff --git a/accounts/accounts_test.go b/accounts/accounts_test.go index 2e5f2b44a..51ca6c256 100644 --- a/accounts/accounts_test.go +++ b/accounts/accounts_test.go @@ -95,7 +95,7 @@ func TestSignWithPassphrase(t *testing.T) { t.Fatal("expected account to be locked") } - _, err = am.SignWithPassphrase(acc.Address, pass, testSigData) + _, err = am.SignWithPassphrase(acc, pass, testSigData) if err != nil { t.Fatal(err) } @@ -104,7 +104,7 @@ func TestSignWithPassphrase(t *testing.T) { t.Fatal("expected account to be locked") } - if _, err = am.SignWithPassphrase(acc.Address, "invalid passwd", testSigData); err == nil { + if _, err = am.SignWithPassphrase(acc, "invalid passwd", testSigData); err == nil { t.Fatal("expected SignHash to fail with invalid password") } } -- cgit v1.2.3