Make the e2e tests pass

Author: Tobin C. Harding

api_tests/lib/cnd_runner.ts

@@ -1,4 +1,5 @@
 import * as fs from "fs";
+import * as path from "path";
 import { promisify } from "util";
 import { CndInstance } from "../lib_sdk/cnd_instance";
 import { CND_CONFIGS } from "./config";
@@ -43,8 +44,10 @@ export class CndRunner {
                 ledgerConfig
             );
 
-            if (await existsAsync(cndconfig.dbPath)) {
-                await unlinkAsync(cndconfig.dbPath); // delete the old database for the new test
+            const db = path.join(cndconfig.data, "cnd.sqlite");
+
+            if (await existsAsync(db)) {
+                await unlinkAsync(db); // delete the old database for the new test
             }
 
             await process.start();

api_tests/lib/config.ts

@@ -1,11 +1,11 @@
-import tempfile from "tempfile";
+import * as tmp from "tmp";
 import { BitcoinNodeConfig } from "./bitcoin";
 import { EthereumNodeConfig } from "./ethereum";
 import { LedgerConfig } from "./ledger_runner";
 
 export interface CndConfigFile {
     http_api: HttpApi;
-    database?: { sqlite: string };
+    data?: { dir: string };
     network: { listen: string[] };
 }
 
@@ -15,7 +15,7 @@ export interface HttpApi {
 
 export class E2ETestActorConfig {
     public readonly seed: Uint8Array;
-    public readonly dbPath: string;
+    public readonly data: string;
 
     constructor(
         public readonly httpApiPort: number,
@@ -26,7 +26,11 @@ export class E2ETestActorConfig {
         this.httpApiPort = httpApiPort;
         this.comitPort = comitPort;
         this.seed = new Uint8Array(Buffer.from(seed, "hex"));
-        this.dbPath = tempfile(`.${this.name}.sqlite`);
+
+        const tmpobj = tmp.dirSync();
+        tmpobj.removeCallback(); // Manual cleanup
+
+        this.data = tmpobj.name;
     }
 
     public generateCndConfigFile(ledgerConfig: LedgerConfig): CndConfigFile {
@@ -37,8 +41,8 @@ export class E2ETestActorConfig {
                     port: this.httpApiPort,
                 },
             },
-            database: {
-                sqlite: this.dbPath,
+            data: {
+                dir: this.data,
             },
             network: {
                 listen: [`/ip4/0.0.0.0/tcp/${this.comitPort}`],

api_tests/lib_sdk/cnd_instance.ts

@@ -1,7 +1,6 @@
 import { JsonMap, stringify } from "@iarna/toml";
 import { ChildProcess, spawn } from "child_process";
 import * as fs from "fs";
-import { PEMObject } from "pem-ts";
 import tempWrite from "temp-write";
 import { promisify } from "util";
 import { CndConfigFile, E2ETestActorConfig } from "../lib/config";
@@ -39,27 +38,20 @@ export class CndInstance {
             "config.toml"
         );
 
-        const pemObject = new PEMObject("SEED", this.actorConfig.seed);
-        const seedFile = await tempWrite(pemObject.encoded, "seed.pem");
-
-        this.process = spawn(
-            bin,
-            ["--config", configFile, "--seed-file", seedFile],
-            {
-                cwd: this.projectRoot,
-                stdio: [
-                    "ignore", // stdin
-                    await openAsync(
-                        this.logDir + "/cnd-" + this.actorConfig.name + ".log",
-                        "w"
-                    ), // stdout
-                    await openAsync(
-                        this.logDir + "/cnd-" + this.actorConfig.name + ".log",
-                        "w"
-                    ), // stderr
-                ],
-            }
-        );
+        this.process = spawn(bin, ["--config", configFile], {
+            cwd: this.projectRoot,
+            stdio: [
+                "ignore", // stdin
+                await openAsync(
+                    this.logDir + "/cnd-" + this.actorConfig.name + ".log",
+                    "w"
+                ), // stdout
+                await openAsync(
+                    this.logDir + "/cnd-" + this.actorConfig.name + ".log",
+                    "w"
+                ), // stderr
+            ],
+        });
 
         this.process.on("exit", (code: number, signal: number) => {
             console.log(

api_tests/package.json

@@ -55,8 +55,8 @@
         "rimraf": "^3.0.0",
         "satoshi-bitcoin": "^1.0.4",
         "temp-write": "^4.0.0",
-        "tempfile": "^3.0.0",
         "testcontainers": "^2.1.0",
+        "tmp": "^0.1.0",
         "ts-node": "^8.5.4",
         "tslint": "^5.20.1",
         "tslint-config-prettier": "^1.18.0",

api_tests/yarn.lock

@@ -2557,6 +2557,13 @@ rfdc@^1.1.4:
   resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.1.4.tgz#ba72cc1367a0ccd9cf81a870b3b58bd3ad07f8c2"
   integrity sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug==
 
+rimraf@^2.6.3:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
+  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
+  dependencies:
+    glob "^7.1.3"
+
 rimraf@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.0.tgz#614176d4b3010b75e5c390eb0ee96f6dc0cebb9b"
@@ -2914,7 +2921,7 @@ temp-write@^4.0.0:
     temp-dir "^1.0.0"
     uuid "^3.3.2"
 
-tempfile@*, tempfile@^3.0.0:
+tempfile@*:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-3.0.0.tgz#5376a3492de7c54150d0cc0612c3f00e2cdaf76c"
   integrity sha512-uNFCg478XovRi85iD42egu+eSFUmmka750Jy7L5tfHI5hQKKtbPnxaSaXAbBqCDYrw3wx4tXjKwci4/QmsZJxw==
@@ -2974,6 +2981,13 @@ tiny-secp256k1@^1.1.0, tiny-secp256k1@^1.1.1:
     elliptic "^6.4.0"
     nan "^2.13.2"
 
+tmp@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.1.0.tgz#ee434a4e22543082e294ba6201dcc6eafefa2877"
+  integrity sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==
+  dependencies:
+    rimraf "^2.6.3"
+
 to-buffer@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80"