From 218371800f6faaf346c689113d41cb48da38926a Mon Sep 17 00:00:00 2001 From: Lua Date: Tue, 2 Apr 2024 17:28:04 +0200 Subject: [PATCH] small fixes blob --- .gitignore | 1 + src/main_executor.js | 6 ++++-- src/sm/sm_main/helpers/ft-blob.js | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0f665ec2..df92c500 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ main.pil.json main_blob.pil.json tools/full-tracer-tests/ft-traces/ batch-l2-data.json +src/sm/sm_main/logs-ft-* diff --git a/src/main_executor.js b/src/main_executor.js index 945230ce..2c6212c2 100644 --- a/src/main_executor.js +++ b/src/main_executor.js @@ -72,7 +72,10 @@ async function run() { process.exit(1); } - const blob = argv.blob ? true : false; + if(typeof config.blob === 'undefined') { + config.blob = argv.blob ? true : false; + } + const blob = config.blob; // parse commandline config sets @@ -106,7 +109,6 @@ async function run() { config[confname] = (typeof argv[argname] === 'string' ? argv[argname].trim() : (config[confname] ?? configFiles[name])); } - config.blob = blob; if (argv.define) { config.defines = config.defines ?? {}; for (define of argv.define) { diff --git a/src/sm/sm_main/helpers/ft-blob.js b/src/sm/sm_main/helpers/ft-blob.js index 423a563e..0ed8a60d 100644 --- a/src/sm/sm_main/helpers/ft-blob.js +++ b/src/sm/sm_main/helpers/ft-blob.js @@ -27,7 +27,7 @@ module.exports = class FtBlob extends Helper { this.pathLogFile = `${this.folderLogs}/${this.logFileName.split('.')[0]}__ft`; // Final trace this.finalTrace = { - batch_data: [] + batch_data: [], }; }