@dashevo/dapi-client 0.24.0-dev.12 → 0.24.0-dev.14

package/README.md

@@ -50,8 +50,7 @@ const DAPIClient = require('@dashevo/dapi-client');
 var client = new DAPIClient({
   seeds: [{
      host: 'seed-1.evonet.networks.dash.org',
-     httpPort: 3000,
-     grpcPort: 3010,
+     port: 3000,
   }],
 });
 
@@ -71,8 +70,8 @@ const DAPIClient = require('@dashevo/dapi-client');
 
 var client = new DAPIClient({
   dapiAddresses: [
-    '127.0.0.1:3000:3010',
-    '127.0.0.2:3000:3010',
+    '127.0.0.1:3000',
+    '127.0.0.2:3000',
   ],
 });
 

package/lib/dapiAddressProvider/DAPIAddress.js

@@ -10,13 +10,12 @@ class DAPIAddress {
     }
 
     if (typeof address === 'string') {
-      const [host, httpPort, grpcPort, ssl] = address.split(':');
+      const [host, port, ssl] = address.split(':');
 
       // eslint-disable-next-line no-param-reassign
       address = {
         host,
-        httpPort: httpPort ? parseInt(httpPort, 10) : DAPIAddress.DEFAULT_HTTP_PORT,
-        grpcPort: grpcPort ? parseInt(grpcPort, 10) : DAPIAddress.DEFAULT_GRPC_PORT,
+        port: port ? parseInt(port, 10) : DAPIAddress.DEFAULT_PORT,
         protocol: ssl === 'no-ssl' ? 'http' : DAPIAddress.DEFAULT_PROTOCOL,
         allowSelfSignedCertificate: ssl === 'self-signed',
       };
@@ -28,8 +27,7 @@ class DAPIAddress {
 
     this.protocol = address.protocol || DAPIAddress.DEFAULT_PROTOCOL;
     this.host = address.host;
-    this.httpPort = address.httpPort || DAPIAddress.DEFAULT_HTTP_PORT;
-    this.grpcPort = address.grpcPort || DAPIAddress.DEFAULT_GRPC_PORT;
+    this.port = address.port || DAPIAddress.DEFAULT_PORT;
     this.proRegTxHash = address.proRegTxHash;
     this.allowSelfSignedCertificate = address.allowSelfSignedCertificate || false;
 
@@ -68,43 +66,22 @@ class DAPIAddress {
   }
 
   /**
-   * Get HTTP port
+   * Get port
    *
    * @returns {number}
    */
-  getHttpPort() {
-    return this.httpPort;
+  getPort() {
+    return this.port;
   }
 
   /**
-   * Set HTTP port
+   * Set port
    *
    * @param {number} port
    * @returns {DAPIAddress}
    */
-  setHttpPort(port) {
-    this.httpPort = port;
-
-    return this;
-  }
-
-  /**
-   * Get gRPC port
-   *
-   * @returns {number}
-   */
-  getGrpcPort() {
-    return this.grpcPort;
-  }
-
-  /**
-   * Set gRPC port
-   *
-   * @param {number} port
-   * @returns {DAPIAddress}
-   */
-  setGrpcPort(port) {
-    this.grpcPort = port;
+  setPort(port) {
+    this.port = port;
 
     return this;
   }
@@ -179,28 +156,25 @@ class DAPIAddress {
     return {
       protocol: this.getProtocol(),
       host: this.getHost(),
-      httpPort: this.getHttpPort(),
-      grpcPort: this.getGrpcPort(),
+      port: this.getPort(),
       proRegTxHash: this.getProRegTxHash(),
       allowSelfSignedCertificate: this.isSelfSignedCertificateAllowed(),
     };
   }
 
   toString() {
-    return `${this.getProtocol()}://${this.getHost()}:${this.getHttpPort()}:${this.getGrpcPort()}`;
+    return `${this.getProtocol()}://${this.getHost()}:${this.getPort()}`;
   }
 }
 
-DAPIAddress.DEFAULT_HTTP_PORT = 3000;
-DAPIAddress.DEFAULT_GRPC_PORT = 3010;
-DAPIAddress.DEFAULT_PROTOCOL = 'http';
+DAPIAddress.DEFAULT_PORT = 3000;
+DAPIAddress.DEFAULT_PROTOCOL = 'https';
 
 /**
  * @typedef {object} RawDAPIAddress
  * @property {string} protocol
  * @property {string} host
- * @property {number} [httpPort=3000]
- * @property {number} [grpcPort=3010]
+ * @property {number} [port=3000]
  * @property {string} [proRegTxHash]
  * @property {bool} [selfSigned]
  */

package/lib/dapiAddressProvider/ListDAPIAddressProvider.js

@@ -39,8 +39,7 @@ class ListDAPIAddressProvider {
       liveAddress.protocol = 'https';
       liveAddress.host = '127.0.0.1';
       liveAddress.allowSelfSignedCertificate = true;
-      liveAddress.httpPort = 3000 + randomNodeIndex * 100;
-      liveAddress.grpcPort = 3010 + randomNodeIndex * 100;
+      liveAddress.port = 3000 + randomNodeIndex * 100;
     }
 
     return liveAddress;