Skip to content

Commit 7bae8d3

Browse files
authored
Fix multi-aliases bug (iotexproject#1341)
1 parent 5a2d4a2 commit 7bae8d3

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

ioctl/cmd/alias/aliasimport.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"io/ioutil"
1313

1414
"github.com/spf13/cobra"
15-
"gopkg.in/yaml.v2"
15+
yaml "gopkg.in/yaml.v2"
1616

1717
"github.com/iotexproject/iotex-core/ioctl/cmd/config"
1818
)
@@ -63,8 +63,9 @@ func aliasImport(cmd *cobra.Command, args []string) (string, error) {
6363
fmt.Println("existed alias " + importedAlias.Name)
6464
continue
6565
}
66-
if aliases[importedAlias.Address] != "" {
66+
for aliases[importedAlias.Address] != "" {
6767
delete(config.ReadConfig.Aliases, aliases[importedAlias.Name])
68+
aliases = GetAliasMap()
6869
}
6970
config.ReadConfig.Aliases[importedAlias.Name] = importedAlias.Address
7071
importedNum++

ioctl/cmd/alias/aliasset.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"io/ioutil"
1212

1313
"github.com/spf13/cobra"
14-
"gopkg.in/yaml.v2"
14+
yaml "gopkg.in/yaml.v2"
1515

1616
"github.com/iotexproject/iotex-core/ioctl/cmd/config"
1717
"github.com/iotexproject/iotex-core/ioctl/validator"
@@ -43,8 +43,9 @@ func set(args []string) (string, error) {
4343
}
4444
addr := args[1]
4545
aliases := GetAliasMap()
46-
if aliases[addr] != "" {
46+
for aliases[addr] != "" {
4747
delete(config.ReadConfig.Aliases, aliases[addr])
48+
aliases = GetAliasMap()
4849
}
4950
config.ReadConfig.Aliases[alias] = addr
5051
out, err := yaml.Marshal(&config.ReadConfig)

0 commit comments

Comments
 (0)