From 50df0051a81d214ddad4f0f3ec5d98e1bf6cd96c Mon Sep 17 00:00:00 2001 From: Dmitriy Ryajov Date: Wed, 11 Mar 2020 10:02:28 -0600 Subject: [PATCH 1/3] bumping libp2p to latest master --- vendor/nim-libp2p | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/nim-libp2p b/vendor/nim-libp2p index 381630f18..82af62364 160000 --- a/vendor/nim-libp2p +++ b/vendor/nim-libp2p @@ -1 +1 @@ -Subproject commit 381630f1854818be634a98e92a65dc317bf780a0 +Subproject commit 82af623641c6a01bcc5f0b46b351fb07b1f7d4dc From 8d6bfd7ce7efc35317aafca5efb5b496039f5cf3 Mon Sep 17 00:00:00 2001 From: Dmitriy Ryajov Date: Wed, 11 Mar 2020 10:53:36 -0600 Subject: [PATCH 2/3] bumping chronos to latest master --- vendor/nim-chronos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/nim-chronos b/vendor/nim-chronos index fe1b1a698..7ed9f1431 160000 --- a/vendor/nim-chronos +++ b/vendor/nim-chronos @@ -1 +1 @@ -Subproject commit fe1b1a698324cd754d9ef70722c7551ce32b6819 +Subproject commit 7ed9f1431a0a8262f988553e9927676cad54e470 From 399e91fe5b28e3ab9391d41c288e6a72af4b9fc8 Mon Sep 17 00:00:00 2001 From: cheatfate Date: Thu, 12 Mar 2020 02:02:33 +0200 Subject: [PATCH 3/3] Fix failing test. --- tests/test_sync_manager.nim | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/tests/test_sync_manager.nim b/tests/test_sync_manager.nim index 100a9bd50..1a6af2f4a 100644 --- a/tests/test_sync_manager.nim +++ b/tests/test_sync_manager.nim @@ -339,21 +339,30 @@ proc peerGroupTests(): Future[bool] {.async.} = slot1.peers = @[peers[3], peers[4], peers[5]] var slot2 = newPeerSlot[SimplePeer, SimplePeerKey](sman) slot2.peers = @[peers[6], peers[7], peers[8]] - var slot3 = newPeerSlot[SimplePeer, SimplePeerKey](sman) - slot3.peers = @[peers[9], peers[10], peers[11]] - var slot4 = newPeerSlot[SimplePeer, SimplePeerKey](sman) - slot4.peers = @[peers[12], peers[13], peers[14]] + + var slot31 = newPeerSlot[SimplePeer, SimplePeerKey](sman) + slot31.peers = @[peers[9], peers[10], peers[11]] + var slot32 = newPeerSlot[SimplePeer, SimplePeerKey](sman) + slot32.peers = @[peers[9], peers[10], peers[11]] + var slot33 = newPeerSlot[SimplePeer, SimplePeerKey](sman) + slot33.peers = @[peers[9], peers[10], peers[11]] + + var slot41 = newPeerSlot[SimplePeer, SimplePeerKey](sman) + slot41.peers = @[peers[12], peers[13], peers[14]] + var slot42 = newPeerSlot[SimplePeer, SimplePeerKey](sman) + slot42.peers = @[peers[12], peers[13], peers[14]] + var slot5 = newPeerSlot[SimplePeer, SimplePeerKey](sman) slot5.peers = @[peers[15], peers[16], peers[17]] var group0 = newPeerGroup(sman) group0.slots = @[slot0, slot1, slot2] var group1 = newPeerGroup(sman) - group1.slots = @[slot0, slot1, slot3] + group1.slots = @[slot0, slot1, slot31] var group2 = newPeerGroup(sman) - group2.slots = @[slot0, slot3, slot4] + group2.slots = @[slot0, slot32, slot41] var group3 = newPeerGroup(sman) - group3.slots = @[slot3, slot4, slot5] + group3.slots = @[slot33, slot42, slot5] var s0 = await group0.getBlocks(Slot(10000), 10'u64) cleanup()