fix: remove reliance on config + api path fix

EYBlockchain · Jan 23, 2023 · eb6e07a · eb6e07a
1 parent 469990f
commit eb6e07a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/src/boilerplate/orchestration/javascript/raw/boilerplate-generator.ts b/src/boilerplate/orchestration/javascript/raw/boilerplate-generator.ts
@@ -721,7 +721,7 @@ zappFilesBoilerplate = () => {
       generic: true,
     },
     {
-      readPath: 'src/boilerplate/common/api.mjs',
+      readPath: pathPrefix + '/api.mjs',
       writePath: './orchestration/api.mjs',
       generic: true,
     },

diff --git a/src/transformers/visitors/checks/accessedVisitor.ts b/src/transformers/visitors/checks/accessedVisitor.ts
@@ -142,7 +142,7 @@ export default {
         // end of error checking
         // ------
         logger.debug(`Found an accessed secret state ${node.name}`);
-        if (config.get('log_level') === 'debug') backtrace.getSourceCode(node.src);
+        if (logger.level === 'debug') backtrace.getSourceCode(node.src);
         scope.getReferencedBinding(node)?.updateAccessed(path);
         const indicator = scope.getReferencedIndicator(node);
         if (indicator instanceof StateVariableIndicator) indicator.updateAccessed(path);

diff --git a/src/transformers/visitors/checks/incrementedVisitor.ts b/src/transformers/visitors/checks/incrementedVisitor.ts
@@ -175,7 +175,7 @@ export default {
       expressionNode.isDecremented = isDecremented;
 
       // print if in debug mode
-      if (config.get('log_level') === 'debug') backtrace.getSourceCode(node.src);
+      if (logger.level === 'debug') backtrace.getSourceCode(node.src);
       logger.debug(`statement is incremented? ${isIncremented}`);
       if (isIncremented && !isDecremented) {
         const incs = [];

diff --git a/src/traverse/Binding.ts b/src/traverse/Binding.ts
@@ -630,7 +630,7 @@ export class VariableBinding extends Binding {
       logger.debug(
         `Found a statement which burns the secret state and allows it to be reinitialised. If this line isn't meant to do that, check why you are setting the address to 0.`,
       );
-      if (config.get('log_level') === 'debug') backtrace.getSourceCode(node.src);
+      if (logger.level === 'debug') backtrace.getSourceCode(node.src);
       this.isBurned = true;
       // TODO more useful indicators here
     }

diff --git a/src/utils/logger.ts b/src/utils/logger.ts
@@ -17,7 +17,7 @@ function formatWithInspect(val: any) {
 }
 
 export default createLogger({
-  level: config.get('log_level') || 'info', // can be also edited using CLI option --log-level
+  level: config.has('log_level') ?  config.get('log_level') : 'info', // can be also edited using CLI option --log-level
   format: winston.format.combine(
     format.errors({ stack: true }),
     format.colorize(),