update after rebase

tests/integration/multinodes.nim

@@ -68,8 +68,6 @@ template withLock(lock: AsyncLock, body: untyped) =
     except AsyncLockError as parent:
       raiseMultiNodeSuiteError "lock error", parent
 
-
-
 template multinodesuite*(name: string, body: untyped) =
   asyncchecksuite name:
     # Following the problem described here:
@@ -163,9 +161,7 @@ template multinodesuite*(name: string, body: untyped) =
         raiseMultiNodeSuiteError "Cannot start node at nodeIdx " & $nodeIdx &
           ", not enough eth accounts."
 
-      let datadir =
-        getTempDir() / "Codex" / sanitize(TestId) / sanitize(currentTestName) /
-        sanitize($starttime) / sanitize($role & "_" & $roleIdx)
+      let datadir = getDataDir(TestId, currentTestName, $starttime, $role, some roleIdx)
 
       try:
         if config.logFile.isSome or CodexLogToFile:

tests/integration/utils.nim

@@ -82,3 +82,11 @@ when defined(windows):
     let cmd = &"{absolutePath(path)} kill {processName} \"{matchingCriteria}\""
     trace "Forcefully killing windows process", processName, matchingCriteria, cmd
     return await execCommandEx(cmd, timeout = 5.seconds)
+
+proc getDataDir*(testId, testName, startTime, role: string, index = int.none): string =
+  var suffix = role
+  if idx =? index:
+    suffix &= "_" & $idx
+
+  getTempDir() / "Codex" / sanitize(testId) / sanitize(testName) / sanitize(startTime) /
+    sanitize(suffix)

tests/testIntegration.nim

@@ -124,3 +124,4 @@ when isMainModule:
     import ./integration/testproofs
     import ./integration/testvalidator
     import ./integration/testecbug
+    import ./integration/testrestapivalidation