Scripts: ASA always loads only once

scale-it · Sep 4, 2020 · 5bc073c · 5bc073c
1 parent 4fc7a99
commit 5bc073c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/packages/algob/src/builtin-tasks/run.ts b/packages/algob/src/builtin-tasks/run.ts
@@ -20,7 +20,7 @@ import {
   lsScriptsDir,
   scriptsDirectory
 } from "../lib/script-checkpoints";
-import { AlgobDeployer, AlgobRuntimeEnv, CheckpointRepo } from "../types";
+import { AlgobDeployer, AlgobRuntimeEnv, ASADefs, CheckpointRepo } from "../types";
 import { TASK_RUN } from "./task-names";
 
 interface Input {
@@ -35,12 +35,13 @@ function mkDeployer (
   runtimeEnv: AlgobRuntimeEnv,
   cpData: CheckpointRepo,
   allowWrite: boolean,
-  algoOp: AlgoOperator
+  algoOp: AlgoOperator,
+  asaDefs: ASADefs
 ): AlgobDeployer {
   const deployer = new AlgobDeployerImpl(
     runtimeEnv,
     cpData,
-    loadASAFile(),
+    asaDefs,
     algoOp);
   if (allowWrite) {
     return deployer;
@@ -86,15 +87,15 @@ export async function runMultipleScripts (
   allowWrite: boolean,
   algoOp: AlgoOperator
 ): Promise<void> {
+  const asaDefs = loadASAFile();
   for (const scriptsBatch of batchScriptNames(scriptNames)) {
     await runScriptsBatch(
       runtimeEnv,
       scriptsBatch,
       onSuccessFn,
       force,
       logDebugTag,
-      allowWrite,
-      algoOp
+      (cpData: CheckpointRepo) => mkDeployer(runtimeEnv, cpData, allowWrite, algoOp, asaDefs)
     );
   }
 }
@@ -105,13 +106,12 @@ async function runScriptsBatch (
   scriptNames: string[],
   onSuccessFn: (cpData: CheckpointRepo, relativeScriptPath: string) => void,
   force: boolean,
-  logTag: string,
-  allowWrite: boolean,
-  algoOp: AlgoOperator
+  logDebugTag: string,
+  mkDeployerFn: (cpData: CheckpointRepo) => AlgobDeployer
 ): Promise<void> {
-  const log = debug(logTag);
+  const log = debug(logDebugTag);
   const cpData: CheckpointRepo = loadCheckpointsRecursive();
-  const deployer: AlgobDeployer = mkDeployer(runtimeEnv, cpData, allowWrite, algoOp);
+  const deployer: AlgobDeployer = mkDeployerFn(cpData);
 
   const scriptsFromScriptsDir: string[] = lsScriptsDir();
 

diff --git a/packages/algob/src/internal/util/lists.ts b/packages/algob/src/internal/util/lists.ts
@@ -7,10 +7,10 @@ function getLastSubchild<T> (ts: T[][]): T {
   return getLast(getLast(ts));
 }
 
-export function partitionByFn (
-  f: (s: string, s1: string) => boolean,
-  input: string[]
-): string[][] {
+export function partitionByFn<T> (
+  f: (s: T, s1: T) => boolean,
+  input: T[]
+): T[][] {
   if (input.length === 0) {
     return [];
   }