Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fix bech32 cache to get bech32 from proper cache #219

Merged
merged 3 commits into from
Jun 1, 2021
Merged

fix: fix bech32 cache to get bech32 from proper cache #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
34efad4
fix: fix bech32 cache to execute type casting if only values exists
Jun 1, 2021
2ac24d2
test: add unit tests
Jun 1, 2021
8ecf862
fix: fix bech32 cache to get bech32 from proper cache
Jun 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions types/address.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,15 +122,19 @@ func SetBech32Cache(size int64) {
func (cache *Bech32Cache) GetAddr(bech32Addr string) ([]byte, bool) {
if cache.bech32ToAddrCache != nil {
rawAddr, ok := cache.bech32ToAddrCache.Get(bech32Addr)
return rawAddr.([]byte), ok
if ok {
return rawAddr.([]byte), ok
}
}
return nil, false
}

func (cache *Bech32Cache) GetBech32(rawAddr []byte) (string, bool) {
if cache.bech32ToAddrCache != nil {
bech32Addr, ok := cache.bech32ToAddrCache.Get(rawAddr)
return bech32Addr.(string), ok
if cache.addrToBech32Cache != nil {
bech32Addr, ok := cache.addrToBech32Cache.Get(string(rawAddr))
if ok {
return bech32Addr.(string), ok
}
}
return "", false
}
Expand Down
32 changes: 32 additions & 0 deletions types/address_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,3 +520,35 @@ func (s *addressTestSuite) TestGetFromBech32() {
s.Require().Error(err)
s.Require().Equal("invalid Bech32 prefix; expected x, got cosmos", err.Error())
}

func (s *addressTestSuite) TestBech32Cache() {
pubBz := make([]byte, ed25519.PubKeySize)
pub := &ed25519.PubKey{Key: pubBz}

s.T().Log("access bech32ToAddrCache before access addrToBech32Cache")
{
rand.Read(pub.Key)
addr := types.AccAddress(pub.Address())
bech32Addr := addr.String()
types.SetBech32Cache(types.DefaultBech32CacheSize)

rawAddr, err := types.AccAddressFromBech32(bech32Addr)
s.Require().Nil(err)
require.Equal(s.T(), addr, rawAddr)

require.Equal(s.T(), bech32Addr, addr.String())
}
s.T().Log("access addrToBech32Cache before access bech32ToAddrCache")
{
rand.Read(pub.Key)
addr := types.AccAddress(pub.Address())
bech32Addr := addr.String()
types.SetBech32Cache(types.DefaultBech32CacheSize)

require.Equal(s.T(), bech32Addr, addr.String())

rawAddr, err := types.AccAddressFromBech32(bech32Addr)
s.Require().Nil(err)
require.Equal(s.T(), addr, rawAddr)
}
}