smalll tweaks for cli

ensdomains · Apr 26, 2022 · 06df78a · 06df78a
1 parent fd62e73
commit 06df78a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/packages/ens-test-env/src/ens-test-env.default.config.js b/packages/ens-test-env/src/ens-test-env.default.config.js
@@ -11,6 +11,7 @@ module.exports = {
     forkRpcUrl: 'https://example.com',
     graphRpcUrl: 'http://localhost:8545',
     secretWords: 'test test test test test test test test test test test junk',
+    unlockedAccounts: ['0x0000000000000000000000000000000000000000'],
   },
   archive: {
     subgraphId: 'QmXxAE7Urtv6TPa8o8XmPwLVQNbH6r35hRKHP63udTxTNa',

diff --git a/packages/ens-test-env/src/ganache.js b/packages/ens-test-env/src/ganache.js
@@ -34,6 +34,7 @@ export const main = async (config) => {
     },
     wallet: {
       mnemonic: config.docker.secretWords,
+      unlockedAccounts: config.docker.unlockedAccounts || [],
     },
   })
 

diff --git a/packages/ens-test-env/src/manager.js b/packages/ens-test-env/src/manager.js
@@ -18,16 +18,22 @@ const killChildren = (cmdName, pid = 0, error) => {
     if (cmdName.startsWith('yarn ')) {
       cmdName = cmdName.replace('yarn ', 'yarn.*')
     }
-    let children = wrapTry(execSync, `pgrep -f "${cmdName}"`)
+    let children = wrapTry(execSync, `pgrep -f "${cmdName} || exit 0"`, {
+      stdio: 'ignore',
+    })
     while (children) {
       const child = children
         .toString()
         .split('\n')
         .find((x) => parseInt(x))
 
       if (child) {
-        const res = wrapTry(execSync, `pgrep -P ${child.trim()}`)
-        wrapTry(execSync, `${sudopref}kill -9 ${child.trim()}`)
+        const res = wrapTry(execSync, `pgrep -P ${child.trim()}`, {
+          stdio: 'ignore',
+        })
+        wrapTry(execSync, `${sudopref}kill -9 ${child.trim()} || exit 0`, {
+          stdio: 'ignore',
+        })
         if (res && !res.toString().includes('No such process')) {
           children = res
         } else {
@@ -38,7 +44,9 @@ const killChildren = (cmdName, pid = 0, error) => {
       }
     }
     if (pid) {
-      wrapTry(execSync, `${sudopref}kill -2 ${pid}`)
+      wrapTry(execSync, `${sudopref}kill -2 ${pid} || exit 0`, {
+        stdio: 'ignore',
+      })
     } else {
       process.exit(error ? 1 : 0)
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,6 +34,7 @@ export const main = async (config) => { @@
         },
         wallet: {
           mnemonic: config.docker.secretWords,
+          unlockedAccounts: config.docker.unlockedAccounts || [],
         },
       })
@@ Expand Down @@