Particle lifecycle

package.json

@@ -16,7 +16,7 @@
   "author": "Fluence Labs",
   "license": "Apache-2.0",
   "dependencies": {
-    "@fluencelabs/aquamarine-interpreter": "^0.7.0",
+    "@fluencelabs/aquamarine-interpreter": "0.7.2",
     "async": "3.2.0",
     "base64-js": "1.3.1",
     "bs58": "4.0.1",

src/__test__/connection.ts

@@ -1,7 +1,3 @@
-import { generatePeerId } from '..';
-import { createClient } from '../api';
-import { FluenceClientImpl } from '../internal/FluenceClientImpl';
-
 // Uncomment to test on dev nodes
 // export const nodes = [
 //     {
@@ -14,22 +10,15 @@ import { FluenceClientImpl } from '../internal/FluenceClientImpl';
 //     },
 // ];
 
-// start docker container to run integration tests locally
-// > docker run --rm -e RUST_LOG="info" -p 1210:1210 -p 4310:4310 fluencelabs/fluence:freeze -t 1210 -w 4310 -k gKdiCSUr1TFGFEgu2t8Ch1XEUsrN5A2UfBLjSZvfci9SPR3NvZpACfcpPGC3eY4zma1pk7UvYv5zb1VjvPHwCjj
+/* 
+ * start docker container to run integration tests locally:
+
+docker run --rm -e RUST_LOG="info" -p 1210:1210 -p 4310:4310 fluencelabs/fluence -t 1210 -w 4310 -k gKdiCSUr1TFGFEgu2t8Ch1XEUsrN5A2UfBLjSZvfci9SPR3NvZpACfcpPGC3eY4zma1pk7UvYv5zb1VjvPHwCjj
+
+ */
 export const nodes = [
     {
         multiaddr: '/ip4/127.0.0.1/tcp/4310/ws/p2p/12D3KooWKEprYXUXqoV5xSBeyqrWLpQLLH4PXfvVkDJtmcqmh5V3',
         peerId: '12D3KooWKEprYXUXqoV5xSBeyqrWLpQLLH4PXfvVkDJtmcqmh5V3',
     },
 ];
-
-export const createLocalClient = async () => {
-    const peerId = await generatePeerId();
-    const client = new FluenceClientImpl(peerId);
-    await client.local();
-    return client;
-};
-
-export const createConnectedClient = async (node: string) => {
-    return (await createClient(node)) as FluenceClientImpl;
-};

src/__test__/integration/builtins.spec.ts

@@ -9,53 +9,46 @@ import {
     uploadModule,
 } from '../../internal/builtins';
 import { ModuleConfig } from '../../internal/moduleConfig';
-import { checkConnection } from '../../api';
-import { generatePeerId } from '../..';
-import { FluenceClientImpl } from '../../internal/FluenceClientImpl';
-import { createConnectedClient, nodes } from '../connection';
+import { createClient, FluenceClient } from '../../api.unstable';
+import { nodes } from '../connection';
+
+let client: FluenceClient;
 
 describe('Builtins usage suite', () => {
+    afterEach(async () => {
+        if (client) {
+            await client.disconnect();
+        }
+    });
+
     jest.setTimeout(10000);
 
     it('get_modules', async function () {
-        const client = await createConnectedClient(nodes[0].multiaddr);
+        client = await createClient(nodes[0].multiaddr);
 
         let modulesList = await getModules(client);
 
         expect(modulesList).not.toBeUndefined;
     });
 
     it('get_interfaces', async function () {
-        const client = await createConnectedClient(nodes[0].multiaddr);
+        client = await createClient(nodes[0].multiaddr);
 
         let interfaces = await getInterfaces(client);
 
         expect(interfaces).not.toBeUndefined;
     });
 
     it('get_blueprints', async function () {
-        const client = await createConnectedClient(nodes[0].multiaddr);
+        client = await createClient(nodes[0].multiaddr);
 
         let bpList = await getBlueprints(client);
 
         expect(bpList).not.toBeUndefined;
     });
 
-    it('check_connection', async function () {
-        const peerId = await generatePeerId();
-        const client = new FluenceClientImpl(peerId);
-        await client.local();
-        await client.connect(nodes[0].multiaddr);
-
-        let isConnected = await checkConnection(client);
-
-        expect(isConnected).toEqual(true);
-    });
-
     it('upload_modules', async function () {
-        const client = await createConnectedClient(nodes[0].multiaddr);
-
-        console.log('peerid: ' + client.selfPeerId);
+        client = await createClient(nodes[0].multiaddr);
 
         let config: ModuleConfig = {
             name: 'test_broken_module',
@@ -75,7 +68,7 @@ describe('Builtins usage suite', () => {
     });
 
     it('add_blueprint', async function () {
-        const client = await createConnectedClient(nodes[0].multiaddr);
+        client = await createClient(nodes[0].multiaddr);
 
         let bpId = 'some';
 
@@ -84,20 +77,19 @@ describe('Builtins usage suite', () => {
         expect(bpIdReturned).toEqual(bpId);
     });
 
-    // FIXME:: there is no error on broken blueprint from a node
-    it.skip('create_service', async function () {
-        const client = await createConnectedClient(nodes[0].multiaddr);
+    it('create broken blueprint', async function () {
+        client = await createClient(nodes[0].multiaddr);
 
-        let serviceId = await createService(client, 'test_broken_blueprint');
+        let promise = createService(client, 'test_broken_blueprint');
 
-        // TODO there is no error on broken blueprint from a node
-        expect(serviceId).not.toBeUndefined;
+        await expect(promise).rejects.toMatchObject({
+            error: expect.stringContaining("Blueprint wasn't found at"),
+            instruction: expect.stringContaining('blueprint_id'),
+        });
     });
 
     it('add and remove script', async function () {
-        const client = await createConnectedClient(nodes[0].multiaddr);
-
-        console.log('peerid: ' + client.selfPeerId);
+        client = await createClient(nodes[0].multiaddr);
 
         let script = `
         (seq
@@ -107,7 +99,7 @@ describe('Builtins usage suite', () => {
     `;
 
         let resMakingPromise = new Promise((resolve) => {
-            client.registerCallback('test', 'test1', (args, _) => {
+            client.aquaCallHandler.on('test', 'test1', (args, _) => {
                 resolve([...args]);
                 return {};
             });
@@ -117,7 +109,6 @@ describe('Builtins usage suite', () => {
 
         await resMakingPromise
             .then((args) => {
-                console.log('final!');
                 expect(args as string[]).toEqual(['1', '2', '3']);
             })
             .finally(() => {