Skip to content

Commit

Permalink
Case insensitive check for names
Browse files Browse the repository at this point in the history
commit-id:2c440011
  • Loading branch information
Leo committed Apr 15, 2022
1 parent f631759 commit ffb54a0
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions automerge/automerge.go
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ func (m *Automerger) InitTokenlist() error {

func (m *Automerger) storeKnownToken(t *parser.Token) {
m.knownAddrs[knownEntry{t.ChainId, t.Address}] = true
m.knownNames[knownEntry{t.ChainId, t.Name}] = true
m.knownNames[knownEntry{t.ChainId, strings.ToLower(t.Name)}] = true
}

func (m *Automerger) IsBlacklistedToken(t *parser.Token) error {
Expand All @@ -209,7 +209,7 @@ func (m *Automerger) IsKnownToken(t *parser.Token) error {
if _, ok := m.knownAddrs[knownEntry{t.ChainId, t.Address}]; ok {
return fmt.Errorf("token address %s is already used", t.Address)
}
if _, ok := m.knownNames[knownEntry{t.ChainId, t.Name}]; ok {
if _, ok := m.knownNames[knownEntry{t.ChainId, strings.ToLower(t.Name)}]; ok {
return fmt.Errorf("token name %s is already used", t.Name)
}
return nil
Expand Down Expand Up @@ -671,11 +671,11 @@ func (m *Automerger) processTokenlist(ctx context.Context, d *diff.FileDiff, ass
if knownAddrs[knownEntry{t.ChainId, t.Address}] {
return nil, fmt.Errorf("duplicate address within PR")
}
if knownNames[knownEntry{t.ChainId, t.Name}] {
if knownNames[knownEntry{t.ChainId, strings.ToLower(t.Name)}] {
return nil, fmt.Errorf("duplicate name within PR")
}
knownAddrs[knownEntry{t.ChainId, t.Address}] = true
knownNames[knownEntry{t.ChainId, t.Name}] = true
knownNames[knownEntry{t.ChainId, strings.ToLower(t.Name)}] = true

if err := m.IsKnownToken(&t); err != nil {
return nil, fmt.Errorf("duplicate token: %v", err)
Expand Down

0 comments on commit ffb54a0

Please sign in to comment.