wip...

pkg/client/query/cache/config.go

@@ -4,20 +4,19 @@ import (
 	"time"
 )
 
-// EvictionPolicy determines how items are removed when cache is full
-type EvictionPolicy string
+// EvictionPolicy determines how items are removed when cache is full.
+type EvictionPolicy int64
 
-// TODO_IN_THIS_COMMIT: refactor to an enum.
 const (
-	LeastRecentlyUsed   EvictionPolicy = "LEAST_RECENTLY_USED"
-	LeastFrequentlyUsed EvictionPolicy = "LEAST_FREQUENTLY_USED"
-	FirstInFirstOut     EvictionPolicy = "FIRST_IN_FIRST_OUT"
+	FirstInFirstOut = EvictionPolicy(iota)
+	LeastRecentlyUsed
+	LeastFrequentlyUsed
 )
 
 // CacheConfig is the configuration options for a cache.
 type CacheConfig struct {
-	// MaxSize is the maximum number of items the cache can hold.
-	MaxSize int64
+	// MaxItems is the maximum number of items the cache can hold.
+	MaxItems int64
 	// EvictionPolicy is how items should be removed when the cache is full.
 	EvictionPolicy EvictionPolicy
 	// TTL is how long items should remain in the cache
@@ -55,7 +54,7 @@ func WithHistoricalMode(pruneOlderThan int64) CacheOption {
 // WithMaxSize sets the maximum size of the cache
 func WithMaxSize(size int64) CacheOption {
 	return func(cfg *CacheConfig) {
-		cfg.MaxSize = size
+		cfg.MaxItems = size
 	}
 }
 

pkg/client/query/cache/memory.go

@@ -123,7 +123,7 @@ func (c *InMemoryCache[T]) Set(key string, value T) error {
 		return c.SetAtHeight(key, value, c.latestHeight.Load())
 	}
 
-	if c.config.MaxSize > 0 && int64(len(c.items)) >= c.config.MaxSize {
+	if c.config.MaxItems > 0 && int64(len(c.items)) >= c.config.MaxItems {
 		c.evict()
 	}
 

pkg/client/query/options.go

@@ -28,7 +28,7 @@ func DefaultParamsQuerierConfig() *ParamsQuerierConfig {
 		CacheOpts: []cache.CacheOption{
 			// TODO_IN_THIS_COMMIT: extract to constants.
 			cache.WithHistoricalMode(100),
-			// TODO_IN_THIS_COMMIT: reconcile the fact that MaxSize doesn't apply to historical mode...
+			// TODO_IN_THIS_COMMIT: reconcile the fact that MaxItems doesn't apply to historical mode...
 			//cache.WithMaxSize(1),
 			// TODO_IN_THIS_COMMIT: extract to constants.
 			cache.WithEvictionPolicy(cache.FirstInFirstOut),

pkg/client/query/paramsquerier.go

@@ -37,7 +37,6 @@ func NewBaseParamsQuerier[P cosmostypes.Msg, Q paramsQuerierIface[P]](
 	if err := depinject.Inject(
 		deps,
 		&querier.clientConn,
-		&querier.blockQuerier,
 	); err != nil {
 		return nil, err
 	}
@@ -52,11 +51,10 @@ func NewBaseParamsQuerier[P cosmostypes.Msg, Q paramsQuerierIface[P]](
 // It handles parameter caching and chain querying in a generic way, where
 // R is the type of the parameters and Q is the type of the query client.
 type baseParamsQuerier[P cosmostypes.Msg, Q paramsQuerierIface[P]] struct {
-	clientConn   gogogrpc.ClientConn
-	queryClient  Q
-	blockQuerier client.BlockQueryClient
-	paramsCache  client.HistoricalQueryCache[P]
-	config       *ParamsQuerierConfig
+	clientConn  gogogrpc.ClientConn
+	queryClient Q
+	paramsCache client.HistoricalQueryCache[P]
+	config      *ParamsQuerierConfig
 }
 
 // TODO_IN_THIS_COMMIT: update godoc...