From 6087b0cc8393e1c1763189bcc9f87f2561e3da72 Mon Sep 17 00:00:00 2001 From: shuplenkov Date: Fri, 14 Apr 2023 17:55:18 +0300 Subject: [PATCH] test(dapi-client): fix broken SimplifiedMasternodeListDAPIAddressProvider test --- ...dMasternodeListDAPIAddressProvider.spec.js | 59 +++++++++++++++---- 1 file changed, 48 insertions(+), 11 deletions(-) diff --git a/packages/js-dapi-client/test/unit/dapiAddressProvider/SimplifiedMasternodeListDAPIAddressProvider.spec.js b/packages/js-dapi-client/test/unit/dapiAddressProvider/SimplifiedMasternodeListDAPIAddressProvider.spec.js index f1cad40085e..f130795e44e 100644 --- a/packages/js-dapi-client/test/unit/dapiAddressProvider/SimplifiedMasternodeListDAPIAddressProvider.spec.js +++ b/packages/js-dapi-client/test/unit/dapiAddressProvider/SimplifiedMasternodeListDAPIAddressProvider.spec.js @@ -1,6 +1,5 @@ const SimplifiedMNListEntry = require('@dashevo/dashcore-lib/lib/deterministicmnlist/SimplifiedMNListEntry'); -const getMNListDiffsFixture = require('../../../lib/test/fixtures/getMNListDiffsFixture'); const DAPIAddress = require('../../../lib/dapiAddressProvider/DAPIAddress'); const SimplifiedMasternodeListDAPIAddressProvider = require('../../../lib/dapiAddressProvider/SimplifiedMasternodeListDAPIAddressProvider'); @@ -14,22 +13,60 @@ describe('SimplifiedMasternodeListDAPIAddressProvider', () => { let addresses; beforeEach(function beforeEach() { - const [mnListDiffFixture] = getMNListDiffsFixture(); + const mnListDiffFixture = [{ + proRegTxHash: 'f5ec54aed788c434da2fc535ea6b125ec6fc54e58bc0a00a005d1a8d5e477a90', + confirmedHash: '53125505b0e9d11b371cf3e12c92d164296dfa215fde6201d28ea44bed992187', + service: '192.168.65.2:20101', + pubKeyOperator: '951a3208ba531ea75aedd2dc0a9efc75f2c4d9492f1ee0a989b593bcd9722b1a101774d80a426552a9f91d24eb55af6e', + votingAddress: 'yYH1rgZsgvkmT8bSSSw1cKCjyVPnFpTBCw', + isValid: true, + nVersion: 2, + nType: 1, + payoutAddress: 'yZv7wf496sjqJVgnEUAtYKozWQhVpoHRh9', + platformHTTPPort: 3200, + platformNodeID: 'fe84df23e1a7f1db40e8e3fd3a4d88662bf0d89d', + }, { + proRegTxHash: 'a2c9b34ef525271d84f70a0d4d2c107e8a2f81cd4d8256dc7b3911ed253d5611', + confirmedHash: '29ff8afb463604ba7d984b483e92dfefa4e80e12de3acae6d75f9b910df9eab6', + service: '192.168.65.2:20201', + pubKeyOperator: 'a5ad6d8cad7b233210b718a5fc9ec3cea18aeebe38b2e3122deb581e430aa28875fe7336c283871db42808f8d4107745', + votingAddress: 'yRXtaRmQ7LCmT5XcgzQdLwPEf31dycBaeY', + isValid: true, + nVersion: 2, + nType: 1, + payoutAddress: 'yiBP17AgHGit2TE9p9FpHEh4ouowNSxMxg', + platformHTTPPort: 3200, + platformNodeID: 'fe84df23e1a7f1db40e8e3fd3a4d88662bf0d89d', + }, { + proRegTxHash: '1c81a5faa2c0e0d96eb59c58a10fcbc87f431bb6cd880d960b43b269e682d2d2', + confirmedHash: '03cc2acc135ab51304d3cff42215c7a8041902fa3f19451d5562a03b38143e8f', + service: '192.168.65.2:20001', + pubKeyOperator: '96f83eedc8a7b87663e591987f051ce341a6fb88989322c64bbbf56d205e4e77d2cb7d839d8b4106a8a1f5d5cf7cfa57', + votingAddress: 'ybJfuKs59MJWkPEnS8qNmtvdisHrCy7Njn', + isValid: true, + nVersion: 2, + nType: 1, + payoutAddress: 'yd3AnRA5YRtN1jsv7jqUK8egA6Mk9e8HoS', + platformHTTPPort: 3200, + platformNodeID: 'fe84df23e1a7f1db40e8e3fd3a4d88662bf0d89d', + }]; validMasternodeList = [ - new SimplifiedMNListEntry(mnListDiffFixture.mnList[0]), - new SimplifiedMNListEntry(mnListDiffFixture.mnList[1]), - new SimplifiedMNListEntry(mnListDiffFixture.mnList[2]), + new SimplifiedMNListEntry(mnListDiffFixture[0]), + new SimplifiedMNListEntry(mnListDiffFixture[1]), + new SimplifiedMNListEntry(mnListDiffFixture[2]), ]; addresses = [ new DAPIAddress({ host: validMasternodeList[0].getIp(), proRegTxHash: validMasternodeList[0].proRegTxHash, + port: validMasternodeList[0].platformHTTPPort, }), new DAPIAddress({ host: '127.0.0.1', proRegTxHash: validMasternodeList[1].proRegTxHash, + port: validMasternodeList[1].platformHTTPPort, }), new DAPIAddress({ host: '127.0.0.1', @@ -80,7 +117,7 @@ describe('SimplifiedMasternodeListDAPIAddressProvider', () => { expect(firstAddress).to.equal(addresses[0]); expect(firstAddress.toJSON()).to.deep.equal({ host: validMasternodeList[0].getIp(), - port: DAPIAddress.DEFAULT_PORT, + port: validMasternodeList[0].platformHTTPPort, proRegTxHash: validMasternodeList[0].proRegTxHash, protocol: DAPIAddress.DEFAULT_PROTOCOL, allowSelfSignedCertificate: false, @@ -90,7 +127,7 @@ describe('SimplifiedMasternodeListDAPIAddressProvider', () => { expect(secondAddress).to.deep.equal(addresses[1]); expect(secondAddress.toJSON()).to.deep.equal({ host: validMasternodeList[1].getIp(), - port: DAPIAddress.DEFAULT_PORT, + port: validMasternodeList[1].platformHTTPPort, proRegTxHash: validMasternodeList[1].proRegTxHash, protocol: DAPIAddress.DEFAULT_PROTOCOL, allowSelfSignedCertificate: false, @@ -100,7 +137,7 @@ describe('SimplifiedMasternodeListDAPIAddressProvider', () => { expect(thirdAddress).to.not.equal(addresses[2]); expect(thirdAddress.toJSON()).to.deep.equal({ host: validMasternodeList[2].getIp(), - port: DAPIAddress.DEFAULT_PORT, + port: validMasternodeList[2].platformHTTPPort, proRegTxHash: validMasternodeList[2].proRegTxHash, protocol: DAPIAddress.DEFAULT_PROTOCOL, allowSelfSignedCertificate: false, @@ -116,7 +153,7 @@ describe('SimplifiedMasternodeListDAPIAddressProvider', () => { smlDAPIAddressProvider = new SimplifiedMasternodeListDAPIAddressProvider( smlProviderMock, listDAPIAddressProviderMock, - [new DAPIAddress(validMasternodeList[1].getIp())], + [new DAPIAddress(`${validMasternodeList[1].getIp()}:${validMasternodeList[1].platformHTTPPort}`)], ); await smlDAPIAddressProvider.getLiveAddress(); @@ -136,7 +173,7 @@ describe('SimplifiedMasternodeListDAPIAddressProvider', () => { expect(secondAddress).to.equal(addresses[0]); expect(secondAddress.toJSON()).to.deep.equal({ host: validMasternodeList[0].getIp(), - port: DAPIAddress.DEFAULT_PORT, + port: validMasternodeList[0].platformHTTPPort, proRegTxHash: validMasternodeList[0].proRegTxHash, protocol: DAPIAddress.DEFAULT_PROTOCOL, allowSelfSignedCertificate: false, @@ -146,7 +183,7 @@ describe('SimplifiedMasternodeListDAPIAddressProvider', () => { expect(thirdAddress).to.not.equal(addresses[2]); expect(thirdAddress.toJSON()).to.deep.equal({ host: validMasternodeList[1].getIp(), - port: DAPIAddress.DEFAULT_PORT, + port: validMasternodeList[1].platformHTTPPort, proRegTxHash: validMasternodeList[1].proRegTxHash, protocol: DAPIAddress.DEFAULT_PROTOCOL, allowSelfSignedCertificate: false,