aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/geth
diff options
context:
space:
mode:
authorFelix Lange <fjl@twurst.com>2016-03-03 08:09:16 +0800
committerFelix Lange <fjl@twurst.com>2016-04-12 21:58:01 +0800
commit46e8940b19fee9bc21767a1341c382fd9c9d572a (patch)
tree384b700810910857cd40e099aba0d5a525eec066 /cmd/geth
parent2dc20963e789c85bcc9170e15c0483e51ca42bfc (diff)
downloadgo-tangerine-46e8940b19fee9bc21767a1341c382fd9c9d572a.tar.gz
go-tangerine-46e8940b19fee9bc21767a1341c382fd9c9d572a.tar.zst
go-tangerine-46e8940b19fee9bc21767a1341c382fd9c9d572a.zip
accounts: streamline API
- Manager.Accounts no longer returns an error. - Manager methods take Account instead of common.Address. - All uses of Account with unkeyed fields are converted.
Diffstat (limited to 'cmd/geth')
-rw-r--r--cmd/geth/accountcmd.go11
-rw-r--r--cmd/geth/js.go4
-rw-r--r--cmd/geth/js_test.go13
3 files changed, 7 insertions, 21 deletions
diff --git a/cmd/geth/accountcmd.go b/cmd/geth/accountcmd.go
index ec6de886f..b4c37cb86 100644
--- a/cmd/geth/accountcmd.go
+++ b/cmd/geth/accountcmd.go
@@ -23,7 +23,6 @@ import (
"github.com/codegangsta/cli"
"github.com/ethereum/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/cmd/utils"
- "github.com/ethereum/go-ethereum/common"
)
var (
@@ -166,17 +165,13 @@ nodes.
func accountList(ctx *cli.Context) {
accman := utils.MakeAccountManager(ctx)
- accts, err := accman.Accounts()
- if err != nil {
- utils.Fatalf("Could not list accounts: %v", err)
- }
- for i, acct := range accts {
+ for i, acct := range accman.Accounts() {
fmt.Printf("Account #%d: %x\n", i, acct)
}
}
// tries unlocking the specified account a few times.
-func unlockAccount(ctx *cli.Context, accman *accounts.Manager, address string, i int, passwords []string) (common.Address, string) {
+func unlockAccount(ctx *cli.Context, accman *accounts.Manager, address string, i int, passwords []string) (accounts.Account, string) {
account, err := utils.MakeAddress(accman, address)
if err != nil {
utils.Fatalf("Could not list accounts: %v", err)
@@ -190,7 +185,7 @@ func unlockAccount(ctx *cli.Context, accman *accounts.Manager, address string, i
}
// All trials expended to unlock account, bail out
utils.Fatalf("Failed to unlock account: %s", address)
- return common.Address{}, ""
+ return accounts.Account{}, ""
}
// getPassPhrase retrieves the passwor associated with an account, either fetched
diff --git a/cmd/geth/js.go b/cmd/geth/js.go
index 5178465d1..d5518f94b 100644
--- a/cmd/geth/js.go
+++ b/cmd/geth/js.go
@@ -27,6 +27,7 @@ import (
"strings"
"github.com/codegangsta/cli"
+ "github.com/ethereum/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/cmd/utils"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/registrar"
@@ -281,7 +282,8 @@ func (self *jsre) UnlockAccount(addr []byte) bool {
if err := self.stack.Service(&ethereum); err != nil {
return false
}
- if err := ethereum.AccountManager().Unlock(common.BytesToAddress(addr), pass); err != nil {
+ a := accounts.Account{Address: common.BytesToAddress(addr)}
+ if err := ethereum.AccountManager().Unlock(a, pass); err != nil {
return false
} else {
fmt.Println("Account is now unlocked for this session.")
diff --git a/cmd/geth/js_test.go b/cmd/geth/js_test.go
index 77e40bb9a..baf572359 100644
--- a/cmd/geth/js_test.go
+++ b/cmd/geth/js_test.go
@@ -61,17 +61,6 @@ type testjethre struct {
client *httpclient.HTTPClient
}
-func (self *testjethre) UnlockAccount(acc []byte) bool {
- var ethereum *eth.Ethereum
- self.stack.Service(&ethereum)
-
- err := ethereum.AccountManager().Unlock(common.BytesToAddress(acc), "")
- if err != nil {
- panic("unable to unlock")
- }
- return true
-}
-
// Temporary disabled while natspec hasn't been migrated
//func (self *testjethre) ConfirmTransaction(tx string) bool {
// var ethereum *eth.Ethereum
@@ -122,7 +111,7 @@ func testREPL(t *testing.T, config func(*eth.Config)) (string, *testjethre, *nod
if err != nil {
t.Fatal(err)
}
- if err := accman.Unlock(a.Address, ""); err != nil {
+ if err := accman.Unlock(a, ""); err != nil {
t.Fatal(err)
}
// Start the node and assemble the REPL tester