chore: update DashCore service image version to 0.15

* chore: update `DashCore` service image version to `0.15` * chore: bump version * chore: use `generateToAddress` method * chore: update dependencies * chore: update `package-lock` * fix: usage of the `generateToAddress` * fix: mount points test assertions
dashpay · Feb 27, 2020 · c698328 · c698328
1 parent b212f2f
commit c698328
Show file tree

Hide file tree

Showing 8 changed files with 344 additions and 270 deletions.
diff --git a/lib/services/dashCore/DashCoreOptions.js b/lib/services/dashCore/DashCoreOptions.js
@@ -26,7 +26,7 @@ class DashCoreOptions extends DockerServiceOptions {
     };
 
     const defaultContainerOptions = {
-      image: 'dashpay/dashd:evo-latest',
+      image: 'dashpay/dashd:0.15',
       network: {
         name: 'dash_test_network',
         driver: 'bridge',

diff --git a/lib/services/dashCore/startDashCore.js b/lib/services/dashCore/startDashCore.js
@@ -34,7 +34,8 @@ startDashCore.many = async function many(number, options) {
     // Workaround for develop branch
     // We should generate genesis block before we connect instances
     if (i === 0 && number > 1) {
-      await instance.getApi().generate(1);
+      const { result: address } = await instance.getApi().getNewAddress();
+      await instance.getApi().generateToAddress(1, address);
     }
 
     if (instances.length > 0) {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/dp-services-ctl",
-  "version": "0.11.0-dev.2",
+  "version": "0.11.0-dev.3",
   "description": "Control Dash Platform services using JavaScript and Docker",
   "engines": {
     "node": ">=8"
@@ -50,8 +50,8 @@
     "cids": "^0.6.0"
   },
   "dependencies": {
-    "@dashevo/dapi-client": "~0.9.0-dev.5",
-    "@dashevo/dashd-rpc": "^1.3.1",
+    "@dashevo/dapi-client": "~0.9.0-dev.6",
+    "@dashevo/dashd-rpc": "^2.0.0",
     "@dashevo/drive-grpc": "~0.3.0",
     "aws-sdk": "^2.382.0",
     "axios": "^0.19.0",

diff --git a/test/integration/services/dashCore/createDashCore.js b/test/integration/services/dashCore/createDashCore.js
@@ -120,7 +120,8 @@ describe('createDashCore', function main() {
     it('should have several instances connected to each other', async () => {
       // Workaround for develop branch
       // We should generate genesis block before we connect instances
-      await instanceOne.getApi().generate(1);
+      const { result: address } = await instanceOne.getApi().getNewAddress();
+      await instanceOne.getApi().generateToAddress(1, address);
 
       await instanceOne.connect(instanceTwo);
       await wait(2000);
@@ -143,7 +144,8 @@ describe('createDashCore', function main() {
       expect(blocksInstanceOne).to.equal(1);
       expect(blocksInstanceTwo).to.equal(1);
 
-      await instanceOne.rpcClient.generate(2);
+      const { result: address } = await instanceOne.rpcClient.getNewAddress();
+      await instanceOne.rpcClient.generateToAddress(2, address);
       await wait(3000);
 
       const { result: blocksOne } = await instanceOne.rpcClient.getBlockCount();
@@ -217,7 +219,7 @@ describe('createDashCore', function main() {
 
       const { Mounts } = await instance.container.inspect();
 
-      expect(Mounts[0].Destination).to.equal(CONTAINER_VOLUME);
+      expect(Mounts.map(mount => mount.Destination)).to.include(CONTAINER_VOLUME);
     });
 
     it('should be able to start an instance with DashCoreOptions', async () => {
@@ -237,7 +239,7 @@ describe('createDashCore', function main() {
 
       const { Mounts } = await instance.container.inspect();
 
-      expect(Mounts[0].Destination).to.equal(CONTAINER_VOLUME);
+      expect(Mounts.map(mount => mount.Destination)).to.include(CONTAINER_VOLUME);
     });
 
     it('should be able to start an instance with custom default DashCoreOptions', async () => {

diff --git a/test/integration/services/dashCore/startDashCore.js b/test/integration/services/dashCore/startDashCore.js
@@ -30,7 +30,7 @@ describe('startDashCore', function main() {
       const { State, Mounts } = await dashCoreNode.container.inspect();
 
       expect(State.Status).to.equal('running');
-      expect(Mounts[0].Destination).to.equal(CONTAINER_VOLUME);
+      expect(Mounts.map(mount => mount.Destination)).to.include(CONTAINER_VOLUME);
     });
 
     it('should have RPC connected', async () => {
@@ -69,7 +69,7 @@ describe('startDashCore', function main() {
         const { State, Mounts } = await dashCoreNodes[i].container.inspect();
 
         expect(State.Status).to.equal('running');
-        expect(Mounts[0].Destination).to.equal(CONTAINER_VOLUME);
+        expect(Mounts.map(mount => mount.Destination)).to.include(CONTAINER_VOLUME);
       }
     });
 
@@ -80,7 +80,8 @@ describe('startDashCore', function main() {
         expect(blocks).to.equal(1);
       }
 
-      await dashCoreNodes[0].rpcClient.generate(2);
+      const { result: address } = await dashCoreNodes[0].rpcClient.getNewAddress();
+      await dashCoreNodes[0].rpcClient.generateToAddress(2, address);
 
       await wait(5000);
 

diff --git a/test/integration/services/startDapi.js b/test/integration/services/startDapi.js
@@ -44,7 +44,7 @@ describe('startDapi', function main() {
       const { State, Mounts } = await dapiNode.driveApi.container.inspect();
 
       expect(State.Status).to.equal('running');
-      expect(Mounts[0].Destination).to.equal(CONTAINER_VOLUME);
+      expect(Mounts.map(mount => mount.Destination)).to.include(CONTAINER_VOLUME);
     });
 
     it('should have Insight API container running', async () => {
@@ -250,7 +250,7 @@ describe('startDapi', function main() {
         const { State, Mounts } = await dapiNodes[i].driveApi.container.inspect();
 
         expect(State.Status).to.equal('running');
-        expect(Mounts[0].Destination).to.equal(CONTAINER_VOLUME);
+        expect(Mounts.map(mount => mount.Destination)).to.include(CONTAINER_VOLUME);
       }
     });
 

diff --git a/test/integration/services/startDrive.js b/test/integration/services/startDrive.js
@@ -43,7 +43,7 @@ describe('startDrive', function main() {
       const { State, Mounts } = await driveNode.driveApi.container.inspect();
 
       expect(State.Status).to.equal('running');
-      expect(Mounts[0].Destination).to.equal(CONTAINER_VOLUME);
+      expect(Mounts.map(mount => mount.Destination)).to.include(CONTAINER_VOLUME);
     });
 
     it('should have proper env variables set for Drive container', async () => {
@@ -128,7 +128,7 @@ describe('startDrive', function main() {
         const { State, Mounts } = await driveNodes[i].driveApi.container.inspect();
 
         expect(State.Status).to.equal('running');
-        expect(Mounts[0].Destination).to.equal(CONTAINER_VOLUME);
+        expect(Mounts.map(mount => mount.Destination)).to.include(CONTAINER_VOLUME);
       }
     });
   });