@@ -10,7 +10,7 @@ import (
1010 "sync"
1111 "sync/atomic"
1212
13- "github.com/hashicorp/golang-lru/simplelru"
13+ "github.com/hashicorp/golang-lru/v2/ simplelru"
1414 "sigs.k8s.io/yaml"
1515
1616 errorsmod "cosmossdk.io/errors"
@@ -81,11 +81,11 @@ var (
8181 // AccAddress.String() is expensive and if unoptimized dominantly showed up in profiles,
8282 // yet has no mechanisms to trivially cache the result given that AccAddress is a []byte type.
8383 accAddrMu sync.Mutex
84- accAddrCache * simplelru.LRU
84+ accAddrCache * simplelru.LRU [ string , string ]
8585 consAddrMu sync.Mutex
86- consAddrCache * simplelru.LRU
86+ consAddrCache * simplelru.LRU [ string , string ]
8787 valAddrMu sync.Mutex
88- valAddrCache * simplelru.LRU
88+ valAddrCache * simplelru.LRU [ string , string ]
8989
9090 isCachingEnabled atomic.Bool
9191)
@@ -101,13 +101,13 @@ func init() {
101101
102102 // in total the cache size is 61k entries. Key is 32 bytes and value is around 50-70 bytes.
103103 // That will make around 92 * 61k * 2 (LRU) bytes ~ 11 MB
104- if accAddrCache , err = simplelru .NewLRU (60000 , nil ); err != nil {
104+ if accAddrCache , err = simplelru .NewLRU [ string , string ] (60000 , nil ); err != nil {
105105 panic (err )
106106 }
107- if consAddrCache , err = simplelru .NewLRU (500 , nil ); err != nil {
107+ if consAddrCache , err = simplelru .NewLRU [ string , string ] (500 , nil ); err != nil {
108108 panic (err )
109109 }
110- if valAddrCache , err = simplelru .NewLRU (500 , nil ); err != nil {
110+ if valAddrCache , err = simplelru .NewLRU [ string , string ] (500 , nil ); err != nil {
111111 panic (err )
112112 }
113113}
@@ -309,7 +309,7 @@ func (aa AccAddress) String() string {
309309
310310 addr , ok := accAddrCache .Get (key )
311311 if ok {
312- return addr .( string )
312+ return addr
313313 }
314314 }
315315 return cacheBech32Addr (GetConfig ().GetBech32AccountAddrPrefix (), aa , accAddrCache , key )
@@ -463,7 +463,7 @@ func (va ValAddress) String() string {
463463
464464 addr , ok := valAddrCache .Get (key )
465465 if ok {
466- return addr .( string )
466+ return addr
467467 }
468468 }
469469 return cacheBech32Addr (GetConfig ().GetBech32ValidatorAddrPrefix (), va , valAddrCache , key )
@@ -623,7 +623,7 @@ func (ca ConsAddress) String() string {
623623
624624 addr , ok := consAddrCache .Get (key )
625625 if ok {
626- return addr .( string )
626+ return addr
627627 }
628628 }
629629 return cacheBech32Addr (GetConfig ().GetBech32ConsensusAddrPrefix (), ca , consAddrCache , key )
@@ -699,7 +699,7 @@ func addressBytesFromHexString(address string) ([]byte, error) {
699699}
700700
701701// cacheBech32Addr is not concurrency safe. Concurrent access to cache causes race condition.
702- func cacheBech32Addr (prefix string , addr []byte , cache * simplelru.LRU , cacheKey string ) string {
702+ func cacheBech32Addr (prefix string , addr []byte , cache * simplelru.LRU [ string , string ] , cacheKey string ) string {
703703 bech32Addr , err := bech32 .ConvertAndEncode (prefix , addr )
704704 if err != nil {
705705 panic (err )
0 commit comments