Merge pull request #6022 from onflow/leo/v0.33-get-block-fix

Backport v0.33 fix get block API

Author: zhangchiqing

fvm/environment/block_info.go

@@ -145,9 +145,7 @@ func (info *blockInfo) GetBlockAtHeight(
 	// Check if the requested block height is within the range of the current
 	// block height and the extra blocks in the root sealing segment.
 	if height+uint64(flow.ExtraBlocksInRootSealingSegment) < info.blockHeader.Height {
-		// TODO replace with:
-		// return runtime.Block{}, false, nil
-		return runtime.Block{}, false, errors.NewBlockHeightOutOfRangeError(height)
+		return runtime.Block{}, false, nil
 	}
 
 	header, err := info.blocks.ByHeightFrom(height, info.blockHeader)

fvm/environment/block_info_test.go

@@ -47,10 +47,9 @@ func TestBlockInfo(t *testing.T) {
 	require.Equal(t, lowestHeader.Height, b.Height)
 
 	// verify that the block at the height before the lowest accepted height does not exist
-	// TODO: enable the test case
-	// _, exists, err = bi.GetBlockAtHeight(lowestAcceptedHeight - 1)
-	// require.NoError(t, err)
-	// require.False(t, exists)
+	_, exists, err = bi.GetBlockAtHeight(lowestAcceptedHeight - 1)
+	require.NoError(t, err)
+	require.False(t, exists)
 }
 
 type mockBlocks struct {