From 801e57f14fce740d00347321cd2eb07b872aa998 Mon Sep 17 00:00:00 2001 From: Nick Johnson Date: Thu, 14 Jul 2016 21:14:54 +0100 Subject: [PATCH] cmd/utils: Allow --bzzaccount to specify an account ID or an address --- cmd/utils/flags.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index b3f691988a..d28f4ad204 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -811,13 +811,13 @@ func MakeSystemNode(name, version string, relconf release.Config, extra []byte, // bzz. Swarm var bzzconfig *bzzapi.Config - hexaddr := ctx.GlobalString(SwarmAccountAddrFlag.Name) - if hexaddr != "" { - swarmaccount := common.HexToAddress(hexaddr) - if !accman.HasAddress(swarmaccount) { - Fatalf("swarm account '%v' does not exist: %v", hexaddr, err) + accountid := ctx.GlobalString(SwarmAccountAddrFlag.Name) + if accountid != "" { + swarmaccount, err := MakeAddress(accman, accountid) + if err != nil { + Fatalf("swarm account '%v' does not exist: %v'", accountid, err) } - prvkey, err := accman.GetUnlocked(swarmaccount) + prvkey, err := accman.GetUnlocked(swarmaccount.Address) if err != nil { Fatalf("unable to unlock swarm account: %v", err) }