Added Len Check

Signed-off-by: Effi-S <effi.szt@gmail.com>

Author: Effi-S

token/services/network/fabric/tokenfetcher.go

@@ -127,6 +127,9 @@ func (f *spentTokenFetcher) QuerySpentTokens(ctx context.Context, namespace stri
 	if err := json.Unmarshal(payloadBoxed, &spent); err != nil {
 		return nil, errors.Wrapf(err, "failed to unmarshal esponse")
 	}
+	if len(spent) != len(IDs) {
+		return nil, errors.Errorf("unexpected number of spent flags: got [%d], expected [%d]", len(spent), len(IDs))
+	}
 
 	return spent, nil
 }

token/services/network/fabricx/qe/qe.go

@@ -158,9 +158,16 @@ func (e *Executor) QuerySpentTokens(_ context.Context, namespace driver.Namespac
 	}
 
 	// This operation depends on the driver.
-	// Let's assume for now that the driver is non-graph hiding
+	// Let's assume for now that the driver is non-graph hiding.
+	//
+	// The returned slice is positionally aligned with ids: spentFlags[i]
+	// corresponds to ids[i], so its length always equals len(ids). Callers
+	// (e.g. tokens.Service.deleteTokens, htlc.OwnerWallet.deleteTokens) index
+	// the result by token position, so a shorter slice would panic. A nil id
+	// carries no ledger key and is reported as not spent.
 	keys := make([]driver.PKey, 0, len(ids))
-	for _, id := range ids {
+	keyIndex := make([]int, 0, len(ids))
+	for i, id := range ids {
 		if id == nil {
 			continue
 		}
@@ -169,9 +176,12 @@ func (e *Executor) QuerySpentTokens(_ context.Context, namespace driver.Namespac
 			return nil, errors.Wrapf(err, "error creating output id key [%s:%d]", id.TxId, id.Index)
 		}
 		keys = append(keys, outputID)
+		keyIndex = append(keyIndex, i)
 	}
+
+	spentFlags := make([]bool, len(ids))
 	if len(keys) == 0 {
-		return nil, nil
+		return spentFlags, nil
 	}
 
 	qs, err := e.qsProvider.Get(e.network, e.channel)
@@ -187,10 +197,9 @@ func (e *Executor) QuerySpentTokens(_ context.Context, namespace driver.Namespac
 
 	// map[driver.Namespace]map[driver.PKey]driver.VaultValue
 	ns := res[namespace]
-	spentFlags := make([]bool, len(keys))
-	for i, key := range keys {
+	for j, key := range keys {
 		value := ns[key]
-		spentFlags[i] = len(value.Raw) == 0
+		spentFlags[keyIndex[j]] = len(value.Raw) == 0
 	}
 
 	return spentFlags, nil

token/services/network/fabricx/qe/qe_test.go

@@ -341,3 +341,106 @@ func TestQuerySpentTokens_EmptyIDs(t *testing.T) {
 	require.Nil(t, res)
 	assert.Equal(t, 0, qsp.GetCallCount())
 }
+
+// TestQuerySpentTokens_NilIDPreservesAlignment is a regression guard: a nil id
+// must not shift the remaining flags or shorten the result. The returned slice
+// stays positionally aligned with ids (length == len(ids)); the nil position is
+// reported as not spent, and only the non-nil ids are looked up on the ledger.
+func TestQuerySpentTokens_NilIDPreservesAlignment(t *testing.T) {
+	ids := []*token.ID{nil, {TxId: "tx1", Index: 0}, {TxId: "tx2", Index: 1}}
+	k1 := outputKey(t, "tx1", 0)
+	k2 := outputKey(t, "tx2", 1)
+
+	qsp := &mock.QueryServiceProvider{}
+	qs := &mock.QueryService{}
+	qsp.GetReturns(qs, nil)
+	// tx1 is present (unspent) -> false; tx2 is missing (spent) -> true.
+	qs.GetStatesReturns(map[driver.Namespace]map[driver.PKey]driver.VaultValue{
+		testNamespace: {k1: {Raw: []byte("token1")}},
+	}, nil)
+
+	e := newExecutor(qsp)
+	res, err := e.QuerySpentTokens(t.Context(), testNamespace, ids, nil)
+	require.NoError(t, err)
+	// index 0 (nil) -> false, index 1 (tx1 present) -> false, index 2 (tx2 missing) -> true.
+	require.Equal(t, []bool{false, false, true}, res)
+
+	// Only the non-nil ids are queried on the ledger; the nil id is not.
+	queried := qs.GetStatesArgsForCall(0)
+	require.Equal(t, map[driver.Namespace][]driver.PKey{testNamespace: {k1, k2}}, queried)
+}
+
+// TestQuerySpentTokens_AllNilIDs is a regression guard: before the fix, an
+// all-nil ids slice returned (nil, nil) — length 0 — which made the callers'
+// spent[i] loop panic with index-out-of-range. It must now return a slice of
+// len(ids) with every position reported as not spent, without touching the
+// query service.
+func TestQuerySpentTokens_AllNilIDs(t *testing.T) {
+	ids := []*token.ID{nil, nil}
+
+	qsp := &mock.QueryServiceProvider{}
+
+	e := newExecutor(qsp)
+	res, err := e.QuerySpentTokens(t.Context(), testNamespace, ids, nil)
+	require.NoError(t, err)
+	require.Equal(t, []bool{false, false}, res)
+	assert.Equal(t, 0, qsp.GetCallCount())
+}
+
+// TestQuerySpentTokens_InteriorNilPreservesAlignment guards the index mapping
+// for a nil that sits between two non-nil ids (not just a leading nil): the
+// flag for each non-nil id must land at that id's original position, and the
+// nil slot stays not spent.
+func TestQuerySpentTokens_InteriorNilPreservesAlignment(t *testing.T) {
+	ids := []*token.ID{{TxId: "tx1", Index: 0}, nil, {TxId: "tx2", Index: 1}}
+	k1 := outputKey(t, "tx1", 0)
+	k2 := outputKey(t, "tx2", 1)
+
+	qsp := &mock.QueryServiceProvider{}
+	qs := &mock.QueryService{}
+	qsp.GetReturns(qs, nil)
+	// tx1 missing (spent) -> true; tx2 present (unspent) -> false.
+	qs.GetStatesReturns(map[driver.Namespace]map[driver.PKey]driver.VaultValue{
+		testNamespace: {k2: {Raw: []byte("token2")}},
+	}, nil)
+
+	e := newExecutor(qsp)
+	res, err := e.QuerySpentTokens(t.Context(), testNamespace, ids, nil)
+	require.NoError(t, err)
+	// index 0 (tx1 missing) -> true, index 1 (nil) -> false, index 2 (tx2 present) -> false.
+	require.Equal(t, []bool{true, false, false}, res)
+
+	// The nil id is not queried; only tx1 and tx2 are.
+	queried := qs.GetStatesArgsForCall(0)
+	require.Equal(t, map[driver.Namespace][]driver.PKey{testNamespace: {k1, k2}}, queried)
+}
+
+func TestQuerySpentTokens_ProviderError(t *testing.T) {
+	ids := []*token.ID{{TxId: "tx1", Index: 0}}
+
+	qsp := &mock.QueryServiceProvider{}
+	qsp.GetReturns(nil, errors.New("boom"))
+
+	e := newExecutor(qsp)
+	res, err := e.QuerySpentTokens(t.Context(), testNamespace, ids, nil)
+	require.Error(t, err)
+	assert.Nil(t, res)
+	assert.Contains(t, err.Error(), "failed getting qs")
+	assert.Contains(t, err.Error(), "boom")
+}
+
+func TestQuerySpentTokens_GetStatesError(t *testing.T) {
+	ids := []*token.ID{{TxId: "tx1", Index: 0}}
+
+	qsp := &mock.QueryServiceProvider{}
+	qs := &mock.QueryService{}
+	qsp.GetReturns(qs, nil)
+	qs.GetStatesReturns(nil, errors.New("rpc failed"))
+
+	e := newExecutor(qsp)
+	res, err := e.QuerySpentTokens(t.Context(), testNamespace, ids, nil)
+	require.Error(t, err)
+	assert.Nil(t, res)
+	assert.Contains(t, err.Error(), "failed getting states")
+	assert.Contains(t, err.Error(), "rpc failed")
+}