address comment 2

Author: dustinxie

api/api.go

@@ -461,13 +461,12 @@ func (api *Server) ReadContract(ctx context.Context, in *iotexapi.ReadContractRe
 	if err := sc.LoadProto(in.Execution); err != nil {
 		return nil, status.Error(codes.InvalidArgument, err.Error())
 	}
-	if d, ok := api.readCache.Get(sc.Contract() + string(sc.Data())); ok {
+	key := hash.Hash160b(append([]byte(sc.Contract()), sc.Data()...))
+	if d, ok := api.readCache.Get(key); ok {
 		res := iotexapi.ReadContractResponse{}
-		if err := proto.Unmarshal(d, &res); err != nil {
-			log.L().Error("failed to unmarshal cached read", zap.Error(err))
-			return nil, status.Error(codes.Internal, err.Error())
+		if err := proto.Unmarshal(d, &res); err == nil {
+			return &res, nil
 		}
-		return &res, nil
 	}
 
 	if in.CallerAddress == action.EmptyAddress {
@@ -506,7 +505,7 @@ func (api *Server) ReadContract(ctx context.Context, in *iotexapi.ReadContractRe
 		Receipt: receipt.ConvertToReceiptPb(),
 	}
 	if d, err := proto.Marshal(&res); err == nil {
-		api.readCache.Put(sc.Contract()+string(sc.Data()), d)
+		api.readCache.Put(key, d)
 	}
 	return &res, nil
 }
@@ -996,7 +995,7 @@ func (api *Server) readState(ctx context.Context, p protocol.Protocol, height st
 		Method: methodName,
 		Args:   arguments,
 	}
-	if d, ok := api.readCache.Get(key.String()); ok {
+	if d, ok := api.readCache.Get(key.Hash()); ok {
 		var h uint64
 		if height != "" {
 			h, _ = strconv.ParseUint(height, 0, 64)
@@ -1031,7 +1030,7 @@ func (api *Server) readState(ctx context.Context, p protocol.Protocol, height st
 			// old data, wrap to history state reader
 			d, h, err := p.ReadState(ctx, factory.NewHistoryStateReader(api.sf, rp.GetEpochHeight(inputEpochNum)), methodName, arguments...)
 			if err == nil {
-				api.readCache.Put(key.String(), d)
+				api.readCache.Put(key.Hash(), d)
 			}
 			return d, h, err
 		}
@@ -1040,7 +1039,7 @@ func (api *Server) readState(ctx context.Context, p protocol.Protocol, height st
 	// TODO: need to distinguish user error and system error
 	d, h, err := p.ReadState(ctx, api.sf, methodName, arguments...)
 	if err == nil {
-		api.readCache.Put(key.String(), d)
+		api.readCache.Put(key.Hash(), d)
 	}
 	return d, h, err
 }

api/read_cache.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"sync"
 
+	"github.com/iotexproject/go-pkgs/hash"
 	"go.uber.org/zap"
 
 	"github.com/iotexproject/iotex-core/blockchain/block"
@@ -23,25 +24,25 @@ type (
 	ReadCache struct {
 		total, hit int
 		lock       sync.RWMutex
-		bins       map[string][]byte
+		bins       map[hash.Hash160][]byte
 	}
 )
 
-// String returns the key as a string
-func (k *ReadKey) String() string {
+// Hash returns the hash of key's json string
+func (k *ReadKey) Hash() hash.Hash160 {
 	b, _ := json.Marshal(k)
-	return string(b)
+	return hash.Hash160b(b)
 }
 
 // NewReadCache returns a new read cache
 func NewReadCache() *ReadCache {
 	return &ReadCache{
-		bins: make(map[string][]byte),
+		bins: make(map[hash.Hash160][]byte),
 	}
 }
 
 // Get reads according to key
-func (rc *ReadCache) Get(key string) ([]byte, bool) {
+func (rc *ReadCache) Get(key hash.Hash160) ([]byte, bool) {
 	rc.lock.RLock()
 	defer rc.lock.RUnlock()
 
@@ -58,7 +59,7 @@ func (rc *ReadCache) Get(key string) ([]byte, bool) {
 }
 
 // Put writes according to key
-func (rc *ReadCache) Put(key string, value []byte) {
+func (rc *ReadCache) Put(key hash.Hash160, value []byte) {
 	rc.lock.Lock()
 	rc.bins[key] = value
 	rc.lock.Unlock()
@@ -68,7 +69,7 @@ func (rc *ReadCache) Put(key string, value []byte) {
 func (rc *ReadCache) Clear() {
 	rc.lock.Lock()
 	rc.bins = nil
-	rc.bins = make(map[string][]byte)
+	rc.bins = make(map[hash.Hash160][]byte)
 	rc.lock.Unlock()
 }
 

api/read_cache_test.go

@@ -3,21 +3,22 @@ package api
 import (
 	"testing"
 
+	"github.com/iotexproject/go-pkgs/hash"
 	"github.com/stretchr/testify/require"
 )
 
 func TestReadKey(t *testing.T) {
 	r := require.New(t)
 
-	var keys []string
+	var keys []hash.Hash160
 	for _, v := range []ReadKey{
 		{"staking", "10", []byte("activeBuckets"), [][]byte{[]byte{0, 1}, []byte{2, 3, 4, 5, 6, 7, 8}}},
 		{"staking", "10", []byte("activeBuckets"), [][]byte{[]byte{0, 1, 2}, []byte{3, 4, 5, 6, 7, 8}}},
 		{"staking", "10", []byte("activeBuckets"), [][]byte{[]byte{0, 1, 2, 3}, []byte{4, 5, 6, 7, 8}}},
 		{"staking", "10", []byte("activeBuckets"), [][]byte{[]byte{0, 1, 2, 3, 4, 5}, []byte{6, 7, 8}}},
 		{"staking", "10", []byte("activeBuckets"), [][]byte{[]byte{0, 1, 2, 3, 4, 5, 6, 7}, []byte{8}}},
 	} {
-		keys = append(keys, v.String())
+		keys = append(keys, v.Hash())
 	}
 
 	// all keys are different
@@ -34,13 +35,13 @@ func TestReadCache(t *testing.T) {
 
 	c := NewReadCache()
 	rcTests := []struct {
-		k string
+		k hash.Hash160
 		v []byte
 	}{
-		{"1", []byte{1}},
-		{"2", []byte{2}},
-		{"3", []byte{1}},
-		{"4", []byte{2}},
+		{hash.Hash160b([]byte{1}), []byte{1}},
+		{hash.Hash160b([]byte{2}), []byte{2}},
+		{hash.Hash160b([]byte{3}), []byte{1}},
+		{hash.Hash160b([]byte{4}), []byte{2}},
 	}
 	for _, v := range rcTests {
 		d, ok := c.Get(v.k)