Fix/loop nodes accounts (#1493)

* fix loop when we set same proxies of one node id Signed-off-by: ochikov <[email protected]> * integration tests fix Signed-off-by: ochikov <[email protected]> * refactor tests Signed-off-by: ochikov <[email protected]> * refactor tests Signed-off-by: ochikov <[email protected]> --------- Signed-off-by: ochikov <[email protected]>
hiero-ledger · Mar 10, 2023 · 434b659 · 434b659
1 parent 697a2ee
commit 434b659
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/src/client/ManagedNetwork.js b/src/client/ManagedNetwork.js
@@ -270,6 +270,7 @@ export default class ManagedNetwork {
         /** @type {NetworkNodeT[]} */
         const nodes = [];
         const keys = new Set();
+        const nodeAddresses = new Set();
 
         // `this.getNode()` uses `Math.random()` internally to fetch
         // nodes, this means _techically_ `this.getNode()` can return
@@ -290,8 +291,12 @@ export default class ManagedNetwork {
 
             // Get a random node
             let node = this.getNode();
-            if (!keys.has(node.getKey())) {
+            if (
+                !keys.has(node.getKey()) ||
+                !nodeAddresses.has(node.address._address)
+            ) {
                 keys.add(node.getKey());
+                nodeAddresses.add(node.address._address);
                 nodes.push(node);
             } else {
                 i--;

diff --git a/test/integration/ClientIntegrationTest.js b/test/integration/ClientIntegrationTest.js
@@ -140,10 +140,11 @@ describe("ClientIntegration", function () {
     });
 
     it("can set network name on custom network", async function () {
+        this.timeout(120000);
         expect(clientTestnet.ledgerId).to.be.equal(LedgerId.TESTNET);
         expect(clientPreviewNet.ledgerId).to.be.equal(LedgerId.PREVIEWNET);
 
-        clientTestnet.setNetwork(clientPreviewNet.network);
+        await clientTestnet.setNetwork(clientPreviewNet.network);
 
         expect(clientTestnet.ledgerId).to.be.null;
 
@@ -152,6 +153,18 @@ describe("ClientIntegration", function () {
         expect(clientTestnet.ledgerId).to.be.equal(LedgerId.PREVIEWNET);
     });
 
+    it("can use same proxies of one node", async function () {
+        let nodes = {
+            "0.testnet.hedera.com:50211": new AccountId(3),
+            "34.94.106.61:50211": new AccountId(3),
+            "50.18.132.211:50211": new AccountId(3),
+            "138.91.142.219:50211": new AccountId(3),
+        };
+
+        const clientForNetwork = Client.forNetwork(nodes);
+        await clientForNetwork.pingAll();
+    });
+
     after(async function () {
         await env.close();
         clientTestnet.close();