linting

Author: ci-bot

libs/remix-debug/test/decoder/localsTests/callTypes.ts

@@ -3,6 +3,28 @@ import { NestedScope } from '@remix-project/remix-debug'
 import * as helper from './helper'
 
 module.exports = async function (st, privateKey, contractBytecode, compilationResult, contractCode) {
+  // Traverse the call tree to verify call types
+  let callCount = 0
+  let staticCallCount = 0
+  let delegateCallCount = 0
+  let contractBFunctionTotalCount = 0
+  let contractCFunctionTotalCount = 0
+  function traverseScopes(scope: NestedScope, parent?: NestedScope) {
+    if (scope.functionDefinition && scope.functionDefinition.name && scope.functionDefinition.name.includes('contractBFunction')) contractBFunctionTotalCount++
+    if (scope.functionDefinition && scope.functionDefinition.name && scope.functionDefinition.name.includes('contractCFunction')) contractCFunctionTotalCount++
+
+    if (parent && parent.opcodeInfo.op === 'CALL' && scope.functionDefinition && scope.functionDefinition.name && scope.functionDefinition.name.includes('contractBFunction')) {
+      callCount++
+    } else if (parent && parent.opcodeInfo.op === 'STATICCALL' && scope.functionDefinition && scope.functionDefinition.name && scope.functionDefinition.name.includes('contractCFunction')) {
+      staticCallCount++
+    } else if (parent && parent.opcodeInfo.op === 'DELEGATECALL' && scope.functionDefinition && scope.functionDefinition.name && scope.functionDefinition.name.includes('contractBFunction')) {
+      delegateCallCount++
+    }
+
+    if (scope.children) {
+      scope.children.forEach(child => traverseScopes(child, scope))
+    }
+  }
   try {
     // Deploy the contract first (constructor deployment)
     const { traceManager: deployTraceManager, callTree: deployCallTree, waitForCallTree: waitForDeployCallTree } = await helper.setupDebugger(privateKey, contractBytecode, compilationResult, contractCode)
@@ -24,29 +46,6 @@ module.exports = async function (st, privateKey, contractBytecode, compilationRe
     // Get the nested JSON representation of scopes
     const nestedScopes: NestedScope[] = callTree.getScopesAsNestedJSON()
 
-    // Traverse the call tree to verify call types
-    let callCount = 0
-    let staticCallCount = 0
-    let delegateCallCount = 0
-    let contractBFunctionTotalCount = 0
-    let contractCFunctionTotalCount = 0
-    function traverseScopes(scope: NestedScope, parent?: NestedScope) {
-      if (scope.functionDefinition && scope.functionDefinition.name && scope.functionDefinition.name.includes('contractBFunction')) contractBFunctionTotalCount++
-      if (scope.functionDefinition && scope.functionDefinition.name && scope.functionDefinition.name.includes('contractCFunction')) contractCFunctionTotalCount++
-
-      if (parent && parent.opcodeInfo.op === 'CALL' && scope.functionDefinition && scope.functionDefinition.name && scope.functionDefinition.name.includes('contractBFunction')) {
-        callCount++
-      } else if (parent && parent.opcodeInfo.op === 'STATICCALL' && scope.functionDefinition && scope.functionDefinition.name && scope.functionDefinition.name.includes('contractCFunction')) {
-        staticCallCount++
-      } else if (parent && parent.opcodeInfo.op === 'DELEGATECALL' && scope.functionDefinition && scope.functionDefinition.name && scope.functionDefinition.name.includes('contractBFunction')) {
-        delegateCallCount++
-      }
-
-      if (scope.children) {
-        scope.children.forEach(child => traverseScopes(child, scope))
-      }
-    }
-
     traverseScopes(nestedScopes[0])
 
     // Verify we found the expected call types

libs/remix-debug/test/decoder/localsTests/helper.ts

@@ -98,27 +98,15 @@ export async function decodeLocals (st, index, traceManager, callTree, verifier)
   try {
     // Convert traceManager methods to async but keep callback compatibility
     const getStackAt = async (stepIndex) => {
-      try {
-        return traceManager.getStackAt(stepIndex)
-      } catch (error) {
-        throw error
-      }
+      return traceManager.getStackAt(stepIndex)
     }
 
     const getMemoryAt = async (stepIndex) => {
-      try {
-        return traceManager.getMemoryAt(stepIndex)
-      } catch (error) {
-        throw error
-      }
+      return traceManager.getMemoryAt(stepIndex)
     }
 
     const getCallDataAt = async (stepIndex) => {
-      try {
-        return traceManager.getCallDataAt(stepIndex)
-      } catch (error) {
-        throw error
-      }
+      return traceManager.getCallDataAt(stepIndex)
     }
 
     // Execute all operations in parallel