Genesis is always canonical

prysmaticlabs · Jan 21, 2021 · f3dada5 · f3dada5
1 parent f7a8903
commit f3dada5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 17 deletions.
diff --git a/beacon-chain/rpc/beacon/blocks.go b/beacon-chain/rpc/beacon/blocks.go
@@ -164,15 +164,11 @@ func (bs *Server) ListBlocks(
 		if err != nil {
 			return nil, err
 		}
-		canonical, err := bs.CanonicalFetcher.IsCanonical(ctx, root)
-		if err != nil {
-			return nil, err
-		}
 		containers := []*ethpb.BeaconBlockContainer{
 			{
 				Block:     genBlk,
 				BlockRoot: root[:],
-				Canonical: canonical,
+				Canonical: true,
 			},
 		}
 

diff --git a/beacon-chain/rpc/beacon/blocks_test.go b/beacon-chain/rpc/beacon/blocks_test.go
@@ -71,14 +71,10 @@ func TestServer_ListBlocks_NoResults(t *testing.T) {
 
 func TestServer_ListBlocks_Genesis(t *testing.T) {
 	db := dbTest.SetupDB(t)
-	chain := &chainMock.ChainService{
-		CanonicalRoots: map[[32]byte]bool{},
-	}
 	ctx := context.Background()
 
 	bs := &Server{
-		BeaconDB:         db,
-		CanonicalFetcher: chain,
+		BeaconDB: db,
 	}
 
 	// Should throw an error if no genesis block is found.
@@ -97,7 +93,6 @@ func TestServer_ListBlocks_Genesis(t *testing.T) {
 	require.NoError(t, err)
 	require.NoError(t, db.SaveBlock(ctx, blk))
 	require.NoError(t, db.SaveGenesisBlockRoot(ctx, root))
-	chain.CanonicalRoots[root] = true
 	wanted := &ethpb.ListBlocksResponse{
 		BlockContainers: []*ethpb.BeaconBlockContainer{
 			{
@@ -122,14 +117,10 @@ func TestServer_ListBlocks_Genesis(t *testing.T) {
 
 func TestServer_ListBlocks_Genesis_MultiBlocks(t *testing.T) {
 	db := dbTest.SetupDB(t)
-	chain := &chainMock.ChainService{
-		CanonicalRoots: map[[32]byte]bool{},
-	}
 	ctx := context.Background()
 
 	bs := &Server{
-		BeaconDB:         db,
-		CanonicalFetcher: chain,
+		BeaconDB: db,
 	}
 	// Should return the proper genesis block if it exists.
 	parentRoot := [32]byte{1, 2, 3}
@@ -139,7 +130,6 @@ func TestServer_ListBlocks_Genesis_MultiBlocks(t *testing.T) {
 	require.NoError(t, err)
 	require.NoError(t, db.SaveBlock(ctx, blk))
 	require.NoError(t, db.SaveGenesisBlockRoot(ctx, root))
-	chain.CanonicalRoots[root] = true
 
 	count := uint64(100)
 	blks := make([]*ethpb.SignedBeaconBlock, count)