change to one function

Author: samliok

long_running_test.go

@@ -11,7 +11,7 @@ func TestLongRunningSimple(t *testing.T) {
 	net := testutil.NewDefaultLongRunningNetwork(t, 5)
 
 	net.StartInstances()
-	net.WaitForAllNodesToEnterRound(40)
+	net.WaitForNodesToEnterRound(40)
 	net.StopAndAssert(false)
 }
 
@@ -22,15 +22,15 @@ func TestLongRunningReplication(t *testing.T) {
 	}
 	net.StartInstances()
 
-	net.WaitForAllNodesToEnterRound(40)
+	net.WaitForNodesToEnterRound(40)
 	net.NoMoreBlocks()
 	net.DisconnectNodes(2)
 	net.ContinueBlocks()
-	net.WaitForCertainNodesToEnterRound(70, 1, 3, 4, 5, 6)
+	net.WaitForNodesToEnterRound(70, 1, 3, 4, 5, 6)
 	net.DisconnectNodes(4)
-	net.WaitForCertainNodesToEnterRound(90, 1, 3, 5, 6, 7, 8, 9)
+	net.WaitForNodesToEnterRound(90, 1, 3, 5, 6, 7, 8, 9)
 	net.ConnectNodes(2, 4)
-	net.WaitForAllNodesToEnterRound(150)
+	net.WaitForNodesToEnterRound(150)
 	net.StopAndAssert(false)
 }
 
@@ -46,14 +46,14 @@ func TestLongRunningCrash(t *testing.T) {
 	}
 
 	net.StartInstances()
-	net.WaitForAllNodesToEnterRound(30)
+	net.WaitForNodesToEnterRound(30)
 	net.CrashNodes(3)
 	crashedNodeLatestBlock := net.Instances[3].Storage.NumBlocks()
 
-	net.WaitForCertainNodesToEnterRound(80, 1, 2, 4, 5, 6, 7, 8, 9)
+	net.WaitForNodesToEnterRound(80, 1, 2, 4, 5, 6, 7, 8, 9)
 	net.RestartNodes(3)
 
 	waitForRound := math.Max(float64(crashedNodeLatestBlock*2), 150)
-	net.WaitForAllNodesToEnterRound(uint64(waitForRound))
+	net.WaitForNodesToEnterRound(uint64(waitForRound))
 	net.StopAndAssert(false)
 }

testutil/long_running_network.go

@@ -113,13 +113,14 @@ func (n *LongRunningInMemoryNetwork) ContinueBlocks() {
 	}
 }
 
-func (n *LongRunningInMemoryNetwork) WaitForAllNodesToEnterRound(round uint64) {
-	for _, instance := range n.Instances {
-		WaitToEnterRoundWithTimeout(n.t, instance.E, round, 3*time.Second)
+func (n *LongRunningInMemoryNetwork) WaitForNodesToEnterRound(round uint64, nodeIndexes ...uint64) {
+	// check if nodeIndexes have length 0
+	if len(nodeIndexes) == 0 {
+		for _, instance := range n.Instances {
+			WaitToEnterRoundWithTimeout(n.t, instance.E, round, 3*time.Second)
+		}
 	}
-}
 
-func (n *LongRunningInMemoryNetwork) WaitForCertainNodesToEnterRound(round uint64, nodeIndexes ...uint64) {
 	for _, idx := range nodeIndexes {
 		WaitToEnterRoundWithTimeout(n.t, n.Instances[idx].E, round, 3*time.Second)
 	}