cmd/utils: Allow --bzzaccount to specify an account ID or an address

Arachnid · zelig · commit 801e57f14fce · 2016-07-27T12:18:26.000+02:00
diff --git 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)
 		}
