fix(pkg/database): return key not found when resolving a deleted entry

Signed-off-by: Jeronimo Irazabal <[email protected]>

Author: jeroiraz

pkg/database/database.go

@@ -449,17 +449,17 @@ func (d *db) getAt(key []byte, atTx uint64, resolved int, index store.KeyIndex,
 		if err != nil {
 			return nil, err
 		}
-
-		if md != nil && md.Deleted() {
-			return nil, store.ErrKeyNotFound
-		}
 	}
 
 	return d.resolveValue(key, val, resolved, txID, md, index, txHolder)
 }
 
 func (d *db) resolveValue(key []byte, val []byte, resolved int, txID uint64, md *store.KVMetadata,
 	index store.KeyIndex, txHolder *store.Tx) (*schema.Entry, error) {
+	if md != nil && md.Deleted() {
+		return nil, store.ErrKeyNotFound
+	}
+
 	if len(val) < 1 {
 		return nil, fmt.Errorf(
 			"%w: internal value consistency error - missing value prefix",

pkg/database/database_test.go

@@ -362,7 +362,7 @@ func TestDelete(t *testing.T) {
 	})
 	require.NoError(t, err)
 
-	tx, err := db.Delete(&schema.DeleteKeysRequest{
+	hdr, err = db.Delete(&schema.DeleteKeysRequest{
 		Keys: [][]byte{
 			[]byte("key1"),
 		},
@@ -377,10 +377,22 @@ func TestDelete(t *testing.T) {
 	_, err = db.VerifiableGet(&schema.VerifiableGetRequest{
 		KeyRequest: &schema.KeyRequest{
 			Key:  []byte("key1"),
-			AtTx: tx.Id,
+			AtTx: hdr.Id,
 		},
 	})
 	require.ErrorIs(t, err, store.ErrKeyNotFound)
+
+	tx, err := db.TxByID(&schema.TxRequest{
+		Tx: hdr.Id,
+		EntriesSpec: &schema.EntriesSpec{
+			KvEntriesSpec: &schema.EntryTypeSpec{
+				Action: schema.EntryTypeAction_RESOLVE,
+			},
+		},
+	})
+	require.NoError(t, err)
+	require.NotNil(t, tx)
+	require.Empty(t, tx.KvEntries)
 }
 
 func TestCurrentState(t *testing.T) {