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

This commit is contained in:
Nick Johnson 2016-07-14 21:14:54 +01:00 committed by zelig
parent 4d59db2988
commit 801e57f14f

View file

@ -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)
}