fix: update daily test configuration

tari-project · Apr 25, 2022 · ba3f219 · ba3f219
1 parent 50e2812
commit ba3f219
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 36 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/applications/daily_tests/automatic_recovery_test.js b/applications/daily_tests/automatic_recovery_test.js
@@ -72,7 +72,8 @@ async function run(options = {}) {
     options.seedWords
   );
 
-  await wallet.startNew();
+  await wallet.init();
+  await wallet.start();
 
   let startTime = new Date();
 
@@ -91,7 +92,9 @@ async function run(options = {}) {
           let recoveredAmount = 0;
           if (recoveredAmountMatch[2] === "T") {
             // convert to micro tari
-            recoveredAmount = round(parseFloat(recoveredAmountMatch[1]) * 1000000);
+            recoveredAmount = round(
+              parseFloat(recoveredAmountMatch[1]) * 1000000
+            );
           } else {
             recoveredAmount = parseInt(recoveredAmountMatch[1]);
           }

diff --git a/applications/daily_tests/automatic_sync_test.js b/applications/daily_tests/automatic_sync_test.js
@@ -7,7 +7,7 @@ const path = require("path");
 const helpers = require("./helpers");
 const BaseNodeProcess = require("integration_tests/helpers/baseNodeProcess");
 
-const NETWORK = "DIBBLER";
+const NETWORK = "dibbler";
 
 const SyncType = {
   Archival: "Archival",
@@ -59,12 +59,14 @@ async function run(options) {
   const baseNode = new BaseNodeProcess("compile", true);
   await baseNode.init();
 
-  // Bypass tor for outbound TCP (faster but less private)
-  process.env[`TARI_BASE_NODE__${NETWORK}__TOR_PROXY_BYPASS_FOR_OUTBOUND_TCP`] =
-    "true";
+  let config = {
+    // Bypass tor for outbound TCP (faster but less private)
+    [`${NETWORK}.base_node.p2p.transport.tor.proxy_bypass_for_outbound_tcp`]: true,
+  };
+
   // Set pruning horizon in config file if `pruned` command line arg is present
   if (options.syncType === SyncType.Pruned) {
-    process.env[`TARI_BASE_NODE__${NETWORK}__PRUNING_HORIZON`] = 20;
+    config[`${NETWORK}.base_node.storage.pruning_horizon`] = 20;
   }
 
   if (options.forceSyncPeer) {
@@ -73,11 +75,10 @@ async function run(options) {
       forcedSyncPeersStr = options.forceSyncPeer.join(",");
     }
     console.log(`Force sync peer set to ${forcedSyncPeersStr}`);
-    process.env[`TARI_BASE_NODE__${NETWORK}__FORCE_SYNC_PEERS`] =
-      forcedSyncPeersStr;
+    config[`${NETWORK}.base_node.force_sync_peers`] = forcedSyncPeersStr;
   }
 
-  await baseNode.start();
+  await baseNode.start({ network: NETWORK, config });
 
   await fs.mkdir(path.dirname(options.log), { recursive: true });
   let logfile = await fs.open(options.log, "w+");

diff --git a/integration_tests/features/support/wallet_cli_steps.js b/integration_tests/features/support/wallet_cli_steps.js
@@ -36,7 +36,7 @@ Then(
   async function (name, is_not, password) {
     let wallet = this.getWallet(name);
     try {
-      await wallet.start(password);
+      await wallet.start({ password });
     } catch (error) {
       expect(error).to.equal(
         is_not === "not" ? "Incorrect password" : undefined

diff --git a/integration_tests/features/support/world.js b/integration_tests/features/support/world.js
@@ -426,7 +426,7 @@ class CustomWorld {
 
   async startNode(name, args) {
     const node = this.seeds[name] || this.nodes[name];
-    await node.start(args);
+    await node.start({ args });
     console.log("\n", name, "started\n");
   }
 

diff --git a/integration_tests/helpers/baseNodeProcess.js b/integration_tests/helpers/baseNodeProcess.js
@@ -252,21 +252,23 @@ class BaseNodeProcess {
     return await this.createGrpcClient();
   }
 
-  async start(opts = []) {
+  async start(opts = {}) {
     const args = [
       "--non-interactive-mode",
       "--watch",
       "status",
       "--base-path",
       ".",
       "--network",
-      "localnet",
+      opts.network || "localnet",
     ];
     if (this.logFilePath) {
       args.push("--log-config", this.logFilePath);
     }
-    args.concat(opts);
-    const overrides = this.getOverrides();
+    if (opts.args) {
+      args.concat(opts.args);
+    }
+    const overrides = Object.assign(this.getOverrides(), opts.config);
     Object.keys(overrides).forEach((k) => {
       args.push("-p");
       args.push(`${k}=${overrides[k]}`);

diff --git a/integration_tests/helpers/walletProcess.js b/integration_tests/helpers/walletProcess.js
@@ -213,25 +213,25 @@ class WalletProcess {
     });
   }
 
-  async start(password) {
+  async start(opts = {}) {
     const args = [
       "--base-path",
       ".",
       "--password",
-      `${password ? password : "kensentme"}`,
+      opts.password || "kensentme",
       "--seed-words-file-name",
       this.seedWordsFile,
       "--non-interactive",
       "--network",
-      "localnet",
+      opts.network || (this.options || {}).network || "localnet",
     ];
     if (this.recoverWallet) {
       args.push("--recover", "--seed-words", this.seedWords);
     }
     if (this.logFilePath) {
       args.push("--log-config", this.logFilePath);
     }
-    const overrides = this.getOverrides();
+    const overrides = Object.assign(this.getOverrides(), opts.config);
     Object.keys(overrides).forEach((k) => {
       args.push("-p");
       args.push(`${k}=${overrides[k]}`);