Move conditional TIMEOUT_DURATION to top of file

source-academy · Aug 7, 2018 · 55bcc12 · 55bcc12
1 parent 50e98ae
commit 55bcc12
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -1,7 +1,7 @@
 import { createContext, runInContext, Result as SourceResult } from 'js-slang'
 import { SourceError } from 'js-slang/dist/types'
 
-const TIMEOUT_DURATION = 20000
+const TIMEOUT_DURATION = process.env.NODE_ENV !== 'test' ? 20000 : 1000
 
 type AwsEvent = {
   graderPrograms: string[]
@@ -90,10 +90,7 @@ const run = async (chap: number, stdPrg: string, gdrPrg: string): Promise<Output
 }
 
 const catchTimeouts = (slangPromise: Promise<Result>): Promise<Result> => {
-  const timeoutDuration = process.env.NODE_ENV !== 'test'
-    ? TIMEOUT_DURATION
-    : 1000 // facilitate testing
-  return Promise.race([slangPromise, timeout(timeoutDuration)])
+  return Promise.race([slangPromise, timeout(TIMEOUT_DURATION)])
 }
 
 const timeout = (msDuration: number): Promise<TimeoutResult> => (