From 25c59c977a41c714664337f78d7a6c139ec09a43 Mon Sep 17 00:00:00 2001
From: Awbrey Hughlett <awbrey.hughlett@smartcontract.com>
Date: Thu, 6 Feb 2025 12:58:42 -0600
Subject: [PATCH] address feedback

---
 pkg/solana/chainreader/batch.go              | 5 ++---
 pkg/solana/chainreader/bindings.go           | 5 +----
 pkg/solana/chainreader/chain_reader.go       | 6 +++---
 pkg/solana/chainreader/event_read_binding.go | 4 ++--
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkg/solana/chainreader/batch.go b/pkg/solana/chainreader/batch.go
index e02658fa4..5a4586ed1 100644
--- a/pkg/solana/chainreader/batch.go
+++ b/pkg/solana/chainreader/batch.go
@@ -51,7 +51,7 @@ func doMethodBatchCall(ctx context.Context, client MultipleAccountGetter, bindin
 			return nil, fmt.Errorf("failed to get address for %s account read: %w", call.ReadName, err)
 		}
 
-		lvBinding, ok := binding.(latestValueBinding)
+		eBinding, ok := binding.(eventBinding)
 		if ok {
 			results[idx] = batchResultWithErr{
 				address:      key.String(),
@@ -60,8 +60,7 @@ func doMethodBatchCall(ctx context.Context, client MultipleAccountGetter, bindin
 				returnVal:    call.ReturnVal,
 			}
 
-			// is an event read
-			results[idx].err = lvBinding.GetLatestValue(ctx, call.Params, results[idx].returnVal)
+			results[idx].err = eBinding.GetLatestValue(ctx, call.Params, results[idx].returnVal)
 
 			continue
 		}
diff --git a/pkg/solana/chainreader/bindings.go b/pkg/solana/chainreader/bindings.go
index 6a2c8bfb8..7b2673495 100644
--- a/pkg/solana/chainreader/bindings.go
+++ b/pkg/solana/chainreader/bindings.go
@@ -20,11 +20,8 @@ type readBinding interface {
 	Decode(context.Context, []byte, any) error
 }
 
-type latestValueBinding interface {
+type eventBinding interface {
 	GetLatestValue(_ context.Context, params, returnVal any) error
-}
-
-type queryBinding interface {
 	QueryKey(context.Context, query.KeyFilter, query.LimitAndSort, any) ([]types.Sequence, error)
 }
 
diff --git a/pkg/solana/chainreader/chain_reader.go b/pkg/solana/chainreader/chain_reader.go
index 6a45d05cc..f8c180697 100644
--- a/pkg/solana/chainreader/chain_reader.go
+++ b/pkg/solana/chainreader/chain_reader.go
@@ -223,14 +223,14 @@ func (s *ContractReaderService) QueryKey(ctx context.Context, contract types.Bou
 		return nil, err
 	}
 
-	qBinding, ok := binding.(queryBinding)
+	eBinding, ok := binding.(eventBinding)
 	if !ok {
 		return nil, fmt.Errorf("%w: invalid binding type for %s", types.ErrInvalidType, contract.Name)
 	}
 
 	_, isValuePtr := sequenceDataType.(*values.Value)
 	if !isValuePtr {
-		return qBinding.QueryKey(ctx, filter, limitAndSort, sequenceDataType)
+		return eBinding.QueryKey(ctx, filter, limitAndSort, sequenceDataType)
 	}
 
 	dataTypeFromReadIdentifier, err := s.CreateContractType(contract.ReadIdentifier(filter.Key), false)
@@ -238,7 +238,7 @@ func (s *ContractReaderService) QueryKey(ctx context.Context, contract types.Bou
 		return nil, err
 	}
 
-	sequence, err := qBinding.QueryKey(ctx, filter, limitAndSort, dataTypeFromReadIdentifier)
+	sequence, err := eBinding.QueryKey(ctx, filter, limitAndSort, dataTypeFromReadIdentifier)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/solana/chainreader/event_read_binding.go b/pkg/solana/chainreader/event_read_binding.go
index 0ec9cbb8d..ecc0c0584 100644
--- a/pkg/solana/chainreader/event_read_binding.go
+++ b/pkg/solana/chainreader/event_read_binding.go
@@ -174,13 +174,13 @@ func (b *eventReadBinding) normalizeParams(value any, itemType string) (any, err
 	return offChain, nil
 }
 
-func (b *eventReadBinding) extractFilterSubkeys(offChainValue any) (query.Expression, error) {
+func (b *eventReadBinding) extractFilterSubkeys(offChainParams any) (query.Expression, error) {
 	var expressions []query.Expression
 
 	for offChainKey, idx := range b.indexedSubKeys {
 		itemType := codec.WrapItemType(true, b.namespace, b.genericName+"."+offChainKey)
 
-		onChainValue, err := b.modifier.TransformToOnChain(offChainValue, itemType)
+		onChainValue, err := b.modifier.TransformToOnChain(offChainParams, itemType)
 		if err != nil {
 			return query.Expression{}, fmt.Errorf("%w: failed to apply on-chain transformation for key %s", types.ErrInternal, offChainKey)
 		}