tbc: fix fork tests failing if tbc is slow to insert blocks (#486)

* Explicitly wait for tbc to insert all blocks

* tbc: s/hasBlocks := false/var hasBlocks bool/g

---------

Co-authored-by: Joshua Sing <joshua@hemi.xyz>

Author: AL-CT

service/tbc/tbcfork_test.go

@@ -1124,8 +1124,20 @@ func GetFreePort() string {
 	return strconv.Itoa(port)
 }
 
+func (s *Server) hasAllBlocks(ctx context.Context, m map[int32][]*block) (bool, error) {
+	for _, k := range m {
+		for _, blk := range k {
+			_, err := s.db.BlockByHash(ctx, *blk.Hash())
+			if err != nil {
+				return false, err
+			}
+		}
+	}
+	return true, nil
+}
+
 func TestFork(t *testing.T) {
-	ctx, cancel := context.WithCancel(context.Background())
+	ctx, cancel := context.WithTimeout(context.Background(), 7*time.Second)
 	defer func() {
 		cancel()
 	}()
@@ -1268,6 +1280,17 @@ func TestFork(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+
+	// Wait for tbc to insert all blocks
+	var hasBlocks bool
+	for !hasBlocks {
+		hasBlocks, err = s.hasAllBlocks(ctx, n.blocksAtHeight)
+		if err != nil {
+			t.Logf("blocks not yet synced: %v", err)
+			time.Sleep(50 * time.Millisecond)
+		}
+	}
+
 	t.Logf("b11a: %v", b11a.Hash())
 	t.Logf("b11b: %v", b11b.Hash())
 	b11s := n.Best()
@@ -1382,7 +1405,7 @@ func TestWork(t *testing.T) {
 }
 
 func TestIndexNoFork(t *testing.T) {
-	ctx, cancel := context.WithCancel(context.Background())
+	ctx, cancel := context.WithTimeout(context.Background(), 7*time.Second)
 	defer func() {
 		cancel()
 	}()
@@ -1460,6 +1483,16 @@ func TestIndexNoFork(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	// Wait for tbc to insert all blocks
+	var hasBlocks bool
+	for !hasBlocks {
+		hasBlocks, err = s.hasAllBlocks(ctx, n.blocksAtHeight)
+		if err != nil {
+			t.Logf("blocks not yet synced: %v", err)
+			time.Sleep(50 * time.Millisecond)
+		}
+	}
+
 	// genesis -> b3 should work with negative direction (cdiff is less than target)
 	direction, err := s.TxIndexIsLinear(ctx, *b3.Hash())
 	if err != nil {
@@ -1560,7 +1593,7 @@ func TestIndexNoFork(t *testing.T) {
 }
 
 func TestKeystoneIndexNoFork(t *testing.T) {
-	ctx, cancel := context.WithCancel(context.Background())
+	ctx, cancel := context.WithTimeout(context.Background(), 7*time.Second)
 	defer func() {
 		cancel()
 	}()
@@ -1653,6 +1686,16 @@ func TestKeystoneIndexNoFork(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	// Wait for tbc to insert all blocks
+	var hasBlocks bool
+	for !hasBlocks {
+		hasBlocks, err = s.hasAllBlocks(ctx, n.blocksAtHeight)
+		if err != nil {
+			t.Logf("blocks not yet synced: %v", err)
+			time.Sleep(50 * time.Millisecond)
+		}
+	}
+
 	// genesis -> b3 should work with negative direction (cdiff is less than target)
 	direction, err := s.TxIndexIsLinear(ctx, *b3.Hash())
 	if err != nil {
@@ -1820,7 +1863,7 @@ func TestKeystoneIndexNoFork(t *testing.T) {
 }
 
 func TestIndexFork(t *testing.T) {
-	ctx, cancel := context.WithCancel(context.Background())
+	ctx, cancel := context.WithTimeout(context.Background(), 7*time.Second)
 	defer func() {
 		cancel()
 	}()
@@ -1920,6 +1963,16 @@ func TestIndexFork(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	// Wait for tbc to insert all blocks
+	var hasBlocks bool
+	for !hasBlocks {
+		hasBlocks, err = s.hasAllBlocks(ctx, n.blocksAtHeight)
+		if err != nil {
+			t.Logf("blocks not yet synced: %v", err)
+			time.Sleep(50 * time.Millisecond)
+		}
+	}
+
 	// Verify linear indexing. Current TxIndex is sitting at genesis
 
 	// genesis -> b3 should work with negative direction (cdiff is less than target)
@@ -2129,7 +2182,7 @@ func TestIndexFork(t *testing.T) {
 }
 
 func TestKeystoneIndexFork(t *testing.T) {
-	ctx, cancel := context.WithCancel(context.Background())
+	ctx, cancel := context.WithTimeout(context.Background(), 7*time.Second)
 	defer func() {
 		cancel()
 	}()
@@ -2244,6 +2297,16 @@ func TestKeystoneIndexFork(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	// Wait for tbc to insert all blocks
+	var hasBlocks bool
+	for !hasBlocks {
+		hasBlocks, err = s.hasAllBlocks(ctx, n.blocksAtHeight)
+		if err != nil {
+			t.Logf("blocks not yet synced: %v", err)
+			time.Sleep(50 * time.Millisecond)
+		}
+	}
+
 	// Verify linear indexing. Current TxIndex is sitting at genesis
 
 	// genesis -> b3 should work with negative direction (cdiff is less than target)
@@ -2630,7 +2693,7 @@ func TestTransactions(t *testing.T) {
 }
 
 func TestForkCanonicity(t *testing.T) {
-	ctx, cancel := context.WithCancel(context.Background())
+	ctx, cancel := context.WithTimeout(context.Background(), 7*time.Second)
 	defer func() {
 		cancel()
 	}()
@@ -2748,6 +2811,16 @@ func TestForkCanonicity(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	// Wait for tbc to insert all blocks
+	var hasBlocks bool
+	for !hasBlocks {
+		hasBlocks, err = s.hasAllBlocks(ctx, n.blocksAtHeight)
+		if err != nil {
+			t.Logf("blocks not yet synced: %v", err)
+			time.Sleep(50 * time.Millisecond)
+		}
+	}
+
 	// set checkpoints to genesis, b2 and b4
 	s.checkpoints = []checkpoint{
 		{4, *mainChainHashes["b4"]},