refactor: addressed reviewed changes

Author: Gmin2

packages/node-core/src/indexer/dynamic-ds.service.ts

@@ -128,10 +128,7 @@ export class DynamicDsService<DS extends BaseDataSource = BaseDataSource, P exte
    * @returns DatasourceParams if found, undefined otherwise
    */
   getDatasourceParamByIndex(index: number): DatasourceParams | undefined {
-    if (!this._datasourceParams || index < 0 || index >= this._datasourceParams.length) {
-      return undefined;
-    }
-    return this._datasourceParams[index];
+    return this._datasourceParams?.[index];
   }
 
   async destroyDynamicDatasource(
@@ -144,16 +141,16 @@ export class DynamicDsService<DS extends BaseDataSource = BaseDataSource, P exte
       throw new Error('DynamicDsService has not been initialized');
     }
 
-    // Validate the global index is within bounds
-    if (index < 0 || index >= this._datasourceParams.length) {
+    // Get the datasource at the global index
+    const dsParam = this._datasourceParams[index];
+
+    // Validate datasource exists
+    if (!dsParam) {
       throw new Error(
         `Index ${index} is out of bounds. There are ${this._datasourceParams.length} datasource(s) in total`
       );
     }
 
-    // Get the datasource at the global index
-    const dsParam = this._datasourceParams[index];
-
     // Validate it matches the template name and is not already destroyed
     if (dsParam.templateName !== templateName) {
       throw new Error(

packages/node-core/src/indexer/indexer.manager.ts

@@ -125,28 +125,11 @@ export abstract class BaseIndexerManager<
         vm.freeze(async (templateName: string, index: number) => {
           await this.dynamicDsService.destroyDynamicDatasource(templateName, blockHeight, index);
 
-          // Remove the destroyed datasource from current processing
-          // The datasource at the global index now has an endBlock set
-          const destroyedDsParam = this.dynamicDsService.getDatasourceParamByIndex(index);
-
-          if (!destroyedDsParam) {
-            logger.warn(`Unable to filter destroyed datasource at index ${index} - params not found`);
-            return;
-          }
-
-          // Filter out the destroyed datasource by matching startBlock and args
+          // Re-filter datasources to exclude the destroyed one
+          // The destroyed datasource now has endBlock set, so filterDataSources will exclude it
           // Note: Reassigning filteredDataSources is intentional - subsequent handlers
           // within the same block will see the updated filtered list
-          filteredDataSources = filteredDataSources.filter((fds) => {
-            const fdsStartBlock = (fds as any).startBlock;
-            // For custom datasources, args are stored in processor.options
-            // For runtime datasources, they may be stored differently
-            const fdsArgs = JSON.stringify((fds as any).processor?.options || (fds as any).options || {});
-            const paramArgs = JSON.stringify(destroyedDsParam.args || {});
-
-            // Keep datasource if it doesn't match the destroyed one
-            return !(fdsStartBlock === destroyedDsParam.startBlock && fdsArgs === paramArgs);
-          });
+          filteredDataSources = this.filterDataSources(blockHeight, filteredDataSources);
         }, 'destroyDynamicDatasource');
 
         return vm;