CR's fixes

config/config.go

@@ -39,8 +39,12 @@ type Config struct {
 	MetricPartitioningPrefillPeriodDays    int
 	RedisEndpointURL                       string
 	RedisPassword                          string
-	CacheTTL                               time.Duration
-	ChainID                                string
+	// TTL for cached evm requests
+	CacheTTL time.Duration
+	// CachePrefix is used as prefix for any key in the cache, key has such structure:
+	// query:<cache_prefix>:<method_name>:<keccak256(body)>
+	// Possible values are testnet, mainnet, etc...
+	CachePrefix string
 }
 
 const (
@@ -216,6 +220,6 @@ func ReadConfig() Config {
 		RedisEndpointURL:                       os.Getenv(REDIS_ENDPOINT_URL_ENVIRONMENT_KEY),
 		RedisPassword:                          os.Getenv(REDIS_PASSWORD_ENVIRONMENT_KEY),
 		CacheTTL:                               time.Duration(EnvOrDefaultInt(CACHE_TTL_ENVIRONMENT_KEY, DEFAULT_CACHE_TTL_SECONDS)) * time.Second,
-		ChainID:                                os.Getenv(CHAIN_ID_ENVIRONMENT_KEY),
+		CachePrefix:                            os.Getenv(CHAIN_ID_ENVIRONMENT_KEY),
 	}
 }

service/cachemdw/cache.go

@@ -18,8 +18,8 @@ type ServiceCache struct {
 	blockGetter              decode.EVMBlockGetter
 	cacheTTL                 time.Duration
 	decodedRequestContextKey any
-	// chainID is used as prefix for any key in the cache
-	chainID string
+	// cachePrefix is used as prefix for any key in the cache
+	cachePrefix string
 
 	*logging.ServiceLogger
 }
@@ -29,15 +29,15 @@ func NewServiceCache(
 	blockGetter decode.EVMBlockGetter,
 	cacheTTL time.Duration,
 	decodedRequestContextKey any,
-	chainID string,
+	cachePrefix string,
 	logger *logging.ServiceLogger,
 ) *ServiceCache {
 	return &ServiceCache{
 		cacheClient:              cacheClient,
 		blockGetter:              blockGetter,
 		cacheTTL:                 cacheTTL,
 		decodedRequestContextKey: decodedRequestContextKey,
-		chainID:                  chainID,
+		cachePrefix:              cachePrefix,
 		ServiceLogger:            logger,
 	}
 }
@@ -73,7 +73,7 @@ func (c *ServiceCache) GetCachedQueryResponse(
 	ctx context.Context,
 	req *decode.EVMRPCRequestEnvelope,
 ) ([]byte, error) {
-	key, err := GetQueryKey(c.chainID, req)
+	key, err := GetQueryKey(c.cachePrefix, req)
 	if err != nil {
 		return nil, err
 	}
@@ -106,7 +106,7 @@ func (c *ServiceCache) CacheQueryResponse(
 		return fmt.Errorf("response isn't cacheable")
 	}
 
-	key, err := GetQueryKey(c.chainID, req)
+	key, err := GetQueryKey(c.cachePrefix, req)
 	if err != nil {
 		return err
 	}

service/cachemdw/cache_test.go

@@ -18,14 +18,13 @@ import (
 )
 
 const (
-	defaultChainIDString = "1"
-	defaultHost          = "api.kava.io"
-	defaultBlockNumber   = "42"
+	defaultCachePrefixString = "1"
+	defaultBlockNumber       = "42"
 )
 
 var (
-	defaultChainID   = big.NewInt(1)
-	defaultQueryResp = []byte(testEVMQueries[TestRequestWeb3ClientVersion].ResponseBody)
+	defaultCachePrefix = big.NewInt(1)
+	defaultQueryResp   = []byte(testEVMQueries[TestRequestWeb3ClientVersion].ResponseBody)
 )
 
 type MockEVMBlockGetter struct{}
@@ -40,10 +39,6 @@ func (c *MockEVMBlockGetter) BlockByHash(ctx context.Context, hash common.Hash)
 	panic("not implemented")
 }
 
-func (c *MockEVMBlockGetter) ChainID(ctx context.Context) (*big.Int, error) {
-	return defaultChainID, nil
-}
-
 func TestUnitTestIsCacheable(t *testing.T) {
 	logger, err := logging.New("TRACE")
 	require.NoError(t, err)
@@ -83,7 +78,7 @@ func TestUnitTestCacheQueryResponse(t *testing.T) {
 	cacheTTL := time.Hour
 	ctxb := context.Background()
 
-	serviceCache := cachemdw.NewServiceCache(inMemoryCache, blockGetter, cacheTTL, service.DecodedRequestContextKey, defaultChainIDString, &logger)
+	serviceCache := cachemdw.NewServiceCache(inMemoryCache, blockGetter, cacheTTL, service.DecodedRequestContextKey, defaultCachePrefixString, &logger)
 
 	req := mkEVMRPCRequestEnvelope(defaultBlockNumber)
 	resp, err := serviceCache.GetCachedQueryResponse(ctxb, req)

service/cachemdw/keys.go

@@ -38,7 +38,7 @@ func BuildCacheKey(cacheItemType CacheItemType, parts []string) string {
 
 // GetQueryKey calculates cache key for request
 func GetQueryKey(
-	chainID string,
+	cachePrefix string,
 	req *decode.EVMRPCRequestEnvelope,
 ) (string, error) {
 	if req == nil {
@@ -58,7 +58,7 @@ func GetQueryKey(
 	hashedReq := crypto.Keccak256Hash(data)
 
 	parts := []string{
-		chainID,
+		cachePrefix,
 		req.Method,
 		hashedReq.Hex(),
 	}

service/cachemdw/keys_test.go

@@ -33,14 +33,14 @@ func TestUnitTestBuildCacheKey(t *testing.T) {
 func TestUnitTestGetQueryKey(t *testing.T) {
 	for _, tc := range []struct {
 		desc             string
-		chainID          string
+		cachePrefix      string
 		req              *decode.EVMRPCRequestEnvelope
 		expectedCacheKey string
 		errMsg           string
 	}{
 		{
-			desc:    "test case #1",
-			chainID: "chain1",
+			desc:        "test case #1",
+			cachePrefix: "chain1",
 			req: &decode.EVMRPCRequestEnvelope{
 				JSONRPCVersion: "2.0",
 				ID:             1,
@@ -50,14 +50,14 @@ func TestUnitTestGetQueryKey(t *testing.T) {
 			expectedCacheKey: "query:chain1:eth_getBlockByHash:0xb2b69f976d9aa41cd2065e2a2354254f6cba682a6fe2b3996571daa27ea4a6f4",
 		},
 		{
-			desc:    "test case #1",
-			chainID: "chain1",
-			req:     nil,
-			errMsg:  "request shouldn't be nil",
+			desc:        "test case #1",
+			cachePrefix: "chain1",
+			req:         nil,
+			errMsg:      "request shouldn't be nil",
 		},
 	} {
 		t.Run(tc.desc, func(t *testing.T) {
-			cacheKey, err := cachemdw.GetQueryKey(tc.chainID, tc.req)
+			cacheKey, err := cachemdw.GetQueryKey(tc.cachePrefix, tc.req)
 			if tc.errMsg == "" {
 				require.NoError(t, err)
 				require.Equal(t, tc.expectedCacheKey, cacheKey)

service/cachemdw/middleware_test.go

@@ -24,7 +24,7 @@ func TestE2ETestServiceCacheMiddleware(t *testing.T) {
 	blockGetter := NewMockEVMBlockGetter()
 	cacheTTL := time.Duration(0) // TTL: no expiry
 
-	serviceCache := cachemdw.NewServiceCache(inMemoryCache, blockGetter, cacheTTL, service.DecodedRequestContextKey, defaultChainIDString, &logger)
+	serviceCache := cachemdw.NewServiceCache(inMemoryCache, blockGetter, cacheTTL, service.DecodedRequestContextKey, defaultCachePrefixString, &logger)
 
 	emptyHandler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {})
 	cachingMdw := serviceCache.CachingMiddleware(emptyHandler)

service/service.go

@@ -212,7 +212,7 @@ func createServiceCache(
 		evmclient,
 		config.CacheTTL,
 		DecodedRequestContextKey,
-		config.ChainID,
+		config.CachePrefix,
 		logger,
 	)