maticnetwork · marcello33 · Jan 30, 2023 · Jan 20, 2023
diff --git a/src/express-cli.js b/src/express-cli.js
@@ -14,14 +14,13 @@ import { cleanup } from './express/commands/cleanup'
 import { setupDatadog } from './express/commands/setup-datadog'
 import { chaos } from './express/commands/chaos'
 import { checkDir } from './express/common/files-utils'
+import { timer } from './express/common/time-utils'
 import { program } from 'commander'
 import pkg from '../package.json'
 import { testEip1559 } from '../tests/test-eip-1559'
 import { stopInstances } from './express/commands/instances-stop'
 import { startInstances } from './express/commands/instances-start'
 
-const timer = (ms) => new Promise((resolve) => setTimeout(resolve, ms))
-
 program
   .option('-i, --init', 'Initiate the terraform setup')
   .option('-s, --start', 'Start the setup')

diff --git a/src/express/commands/chaos.js b/src/express/commands/chaos.js
@@ -1,14 +1,14 @@
 /* eslint-disable dot-notation */
 import { loadDevnetConfig, splitToArray } from '../common/config-utils'
+import { timer } from '../common/time-utils'
+
 const {
   runScpCommand,
   runSshCommand,
   maxRetries,
   runSshCommandWithoutExit
 } = require('../common/remote-worker')
 
-const timer = (ms) => new Promise((resolve) => setTimeout(resolve, ms))
-
 async function removeAllPeers(ip, staticNodes) {
   let command = 'mv ~/.bor/static-nodes.json ~/.bor/static-nodes.json_bkp'
   try {

diff --git a/src/express/commands/cleanup.js b/src/express/commands/cleanup.js
@@ -1,7 +1,6 @@
 import { loadDevnetConfig, splitToArray } from '../common/config-utils'
 import { maxRetries, runSshCommand } from '../common/remote-worker'
-
-const timer = (ms) => new Promise((resolve) => setTimeout(resolve, ms))
+import { timer } from '../common/time-utils'
 
 export async function cleanup() {
   require('dotenv').config({ path: `${process.cwd()}/.env` })

diff --git a/src/express/commands/instances-start.js b/src/express/commands/instances-start.js
@@ -3,11 +3,10 @@
 import { loadDevnetConfig } from '../common/config-utils'
 import { restartAll } from './restart'
 import { maxRetries, runSshCommand } from '../common/remote-worker'
+import { timer } from '../common/time-utils'
 
 const shell = require('shelljs')
 
-const timer = (ms) => new Promise((resolve) => setTimeout(resolve, ms))
-
 async function startGanache(doc) {
   const ip = `${doc.ethHostUser}@${doc.devnetBorHosts[0]}`
   console.log('📍Running ganache in machine ' + ip + ' ...')

diff --git a/src/express/commands/instances-stop.js b/src/express/commands/instances-stop.js
@@ -1,11 +1,10 @@
 // noinspection JSUnresolvedFunction
 
 import { loadDevnetConfig } from '../common/config-utils'
+import { timer } from '../common/time-utils'
 
 const shell = require('shelljs')
 
-const timer = (ms) => new Promise((resolve) => setTimeout(resolve, ms))
-
 export async function stopInstances() {
   console.log('📍Stopping instances...')
   require('dotenv').config({ path: `${process.cwd()}/.env` })

diff --git a/src/express/commands/monitor.js b/src/express/commands/monitor.js
@@ -1,10 +1,10 @@
 // noinspection JSCheckFunctionSignatures,JSUnresolvedFunction,JSUnresolvedVariable
 
 import { loadDevnetConfig } from '../common/config-utils'
+import { timer } from '../common/time-utils'
 
 const fetch = require('node-fetch')
 const Web3 = require('web3')
-const timer = (ms) => new Promise((resolve) => setTimeout(resolve, ms))
 const { runScpCommand, maxRetries } = require('../common/remote-worker')
 
 const lastStateIdABI = [

diff --git a/src/express/commands/setup-datadog.js b/src/express/commands/setup-datadog.js
@@ -1,6 +1,7 @@
 // noinspection JSCheckFunctionSignatures,JSUnresolvedVariable
 
 import { loadDevnetConfig, splitToArray } from '../common/config-utils'
+import { timer } from '../common/time-utils'
 
 const {
   runScpCommand,
@@ -12,8 +13,6 @@ const { installDocker } = require('./start.js')
 const yaml = require('js-yaml')
 const fs = require('fs')
 
-const timer = (ms) => new Promise((resolve) => setTimeout(resolve, ms))
-
 export async function setDatadogAPIKey(value, doc) {
   if (value !== undefined) {
     doc.exporters.datadog.api.key = value

diff --git a/src/express/commands/start.js b/src/express/commands/start.js
@@ -13,11 +13,11 @@ import {
   runScpCommand,
   runSshCommand
 } from '../common/remote-worker'
+import { timer } from '../common/time-utils'
 import yaml from 'js-yaml'
 import fs from 'fs'
 
 const shell = require('shelljs')
-const timer = (ms) => new Promise((resolve) => setTimeout(resolve, ms))
 
 async function terraformApply(devnetId) {
   console.log('📍Executing terraform apply...')

diff --git a/src/express/common/time-utils.js b/src/express/common/time-utils.js
@@ -0,0 +1,3 @@
+export function timer(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms))
+}