Terminate cnd in new e2e format

Author: bonomat

api_tests/e2e/rfc003/btc_eth/cnd_can_be_restarted.ts

@@ -1,13 +1,29 @@
+import { Actor } from "../../../lib_sdk/actors/actor";
 import { createActors } from "../../../lib_sdk/create_actors";
 
 setTimeout(function() {
+    let alice: Actor;
+    let bob: Actor;
+
+    beforeEach(async function() {
+        this.timeout(20000);
+        const actors = await createActors("cnd_can_be_restarted.log");
+        alice = actors.alice;
+        bob = actors.bob;
+    });
+
+    afterEach(() => {
+        if (alice) {
+            alice.stop();
+        }
+        if (bob) {
+            bob.stop();
+        }
+    });
+
     describe("cnd can be restarted", function() {
         this.timeout(60000);
         it("after the swap was accepted", async function() {
-            const { alice, bob } = await createActors(
-                "cnd_can_be_restarted.log"
-            );
-
             await alice.sendRequest();
             await bob.accept();
 

api_tests/e2e/rfc003/btc_eth/happy.ts

@@ -1,14 +1,30 @@
+import { Actor } from "../../../lib_sdk/actors/actor";
 import { AssetKind } from "../../../lib_sdk/asset";
 import { createActors } from "../../../lib_sdk/create_actors";
 
 setTimeout(function() {
+    let alice: Actor;
+    let bob: Actor;
+
+    beforeEach(async function() {
+        this.timeout(20000);
+        const actors = await createActors("e2e-rfc003-btc-eth-happy.log");
+        alice = actors.alice;
+        bob = actors.bob;
+    });
+
+    afterEach(() => {
+        if (alice) {
+            alice.stop();
+        }
+        if (bob) {
+            bob.stop();
+        }
+    });
+
     describe("happy path", function() {
         this.timeout(60000);
         it("bitcoin ether", async function() {
-            const { alice, bob } = await createActors(
-                "e2e-rfc003-btc-eth-happy.log"
-            );
-
             await alice.sendRequest(AssetKind.Bitcoin, AssetKind.Ether);
             await bob.accept();
             await alice.fund();

api_tests/lib_sdk/actors/actor.ts

@@ -244,6 +244,10 @@ export class Actor {
         await this.cndInstance.start();
     }
 
+    public stop() {
+        this.cndInstance.stop();
+    }
+
     private async additionalIdentities(
         alphaAsset: AssetKind,
         betaAsset: AssetKind