Remove deprecated RPC ListBlocks (#11243)

* Remove deprecated RPC ListBlocks

* Fix test

* Rm mock

* Go imports

* Rm unused

Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com>

beacon-chain/rpc/prysm/v1alpha1/beacon/blocks.go

@@ -33,31 +33,6 @@ type blockContainer struct {
 	isCanonical bool
 }
 
-// ListBlocks retrieves blocks by root, slot, or epoch.
-//
-// The server may return multiple blocks in the case that a slot or epoch is
-// provided as the filter criteria. The server may return an empty list when
-// no blocks in their database match the filter criteria. This RPC should
-// not return NOT_FOUND. Only one filter criteria should be used.
-func (bs *Server) ListBlocks(
-	ctx context.Context, req *ethpb.ListBlocksRequest,
-) (*ethpb.ListBlocksResponse, error) {
-	ctrs, numBlks, nextPageToken, err := bs.listBlocks(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-	blkContainers, err := convertToProto(ctrs)
-	if err != nil {
-		return nil, err
-	}
-
-	return &ethpb.ListBlocksResponse{
-		BlockContainers: blkContainers,
-		TotalSize:       int32(numBlks),
-		NextPageToken:   nextPageToken,
-	}, nil
-}
-
 // ListBeaconBlocks retrieves blocks by root, slot, or epoch.
 //
 // The server may return multiple blocks in the case that a slot or epoch is
@@ -272,23 +247,6 @@ func (bs *Server) listBlocksForGenesis(ctx context.Context, _ *ethpb.ListBlocksR
 	}}, 1, strconv.Itoa(0), nil
 }
 
-func convertToProto(ctrs []blockContainer) ([]*ethpb.BeaconBlockContainer, error) {
-	protoCtrs := make([]*ethpb.BeaconBlockContainer, len(ctrs))
-	for i, c := range ctrs {
-		phBlk, err := c.blk.PbPhase0Block()
-		if err != nil {
-			return nil, status.Errorf(codes.Internal, "Could not get phase 0 block: %v", err)
-		}
-		copiedRoot := c.root
-		protoCtrs[i] = &ethpb.BeaconBlockContainer{
-			Block:     &ethpb.BeaconBlockContainer_Phase0Block{Phase0Block: phBlk},
-			BlockRoot: copiedRoot[:],
-			Canonical: c.isCanonical,
-		}
-	}
-	return protoCtrs, nil
-}
-
 // GetChainHead retrieves information about the head of the beacon chain from
 // the view of the beacon chain node.
 //

beacon-chain/rpc/prysm/v1alpha1/beacon/blocks_test.go

@@ -13,7 +13,6 @@ import (
 	statefeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/state"
 	dbTest "github.com/prysmaticlabs/prysm/v3/beacon-chain/db/testing"
 	v1 "github.com/prysmaticlabs/prysm/v3/beacon-chain/state/v1"
-	"github.com/prysmaticlabs/prysm/v3/cmd"
 	"github.com/prysmaticlabs/prysm/v3/config/features"
 	fieldparams "github.com/prysmaticlabs/prysm/v3/config/fieldparams"
 	"github.com/prysmaticlabs/prysm/v3/config/params"
@@ -31,344 +30,6 @@ import (
 	"google.golang.org/protobuf/types/known/emptypb"
 )
 
-func TestServer_ListBlocks_NoResults(t *testing.T) {
-	db := dbTest.SetupDB(t)
-	ctx := context.Background()
-
-	bs := &Server{
-		BeaconDB: db,
-	}
-	wanted := &ethpb.ListBlocksResponse{
-		BlockContainers: make([]*ethpb.BeaconBlockContainer, 0),
-		TotalSize:       int32(0),
-		NextPageToken:   strconv.Itoa(0),
-	}
-	res, err := bs.ListBlocks(ctx, &ethpb.ListBlocksRequest{
-		QueryFilter: &ethpb.ListBlocksRequest_Slot{
-			Slot: 0,
-		},
-	})
-	require.NoError(t, err)
-	if !proto.Equal(wanted, res) {
-		t.Errorf("Wanted %v, received %v", wanted, res)
-	}
-	res, err = bs.ListBlocks(ctx, &ethpb.ListBlocksRequest{
-		QueryFilter: &ethpb.ListBlocksRequest_Slot{
-			Slot: 0,
-		},
-	})
-	require.NoError(t, err)
-	if !proto.Equal(wanted, res) {
-		t.Errorf("Wanted %v, received %v", wanted, res)
-	}
-	res, err = bs.ListBlocks(ctx, &ethpb.ListBlocksRequest{
-		QueryFilter: &ethpb.ListBlocksRequest_Root{
-			Root: make([]byte, fieldparams.RootLength),
-		},
-	})
-	require.NoError(t, err)
-	if !proto.Equal(wanted, res) {
-		t.Errorf("Wanted %v, received %v", wanted, res)
-	}
-}
-
-func TestServer_ListBlocks_Genesis(t *testing.T) {
-	db := dbTest.SetupDB(t)
-	ctx := context.Background()
-
-	bs := &Server{
-		BeaconDB: db,
-	}
-
-	// Should throw an error if no genesis block is found.
-	_, err := bs.ListBlocks(ctx, &ethpb.ListBlocksRequest{
-		QueryFilter: &ethpb.ListBlocksRequest_Genesis{
-			Genesis: true,
-		},
-	})
-	require.ErrorContains(t, "Could not find genesis", err)
-
-	// Should return the proper genesis block if it exists.
-	parentRoot := [32]byte{'a'}
-	blk := util.NewBeaconBlock()
-	blk.Block.ParentRoot = parentRoot[:]
-	root, err := blk.Block.HashTreeRoot()
-	require.NoError(t, err)
-	util.SaveBlock(t, ctx, db, blk)
-	require.NoError(t, db.SaveGenesisBlockRoot(ctx, root))
-	wanted := &ethpb.ListBlocksResponse{
-		BlockContainers: []*ethpb.BeaconBlockContainer{
-			{
-				Block:     &ethpb.BeaconBlockContainer_Phase0Block{Phase0Block: blk},
-				BlockRoot: root[:],
-				Canonical: true,
-			},
-		},
-		NextPageToken: "0",
-		TotalSize:     1,
-	}
-	res, err := bs.ListBlocks(ctx, &ethpb.ListBlocksRequest{
-		QueryFilter: &ethpb.ListBlocksRequest_Genesis{
-			Genesis: true,
-		},
-	})
-	require.NoError(t, err)
-	if !proto.Equal(wanted, res) {
-		t.Errorf("Wanted %v, received %v", wanted, res)
-	}
-}
-
-func TestServer_ListBlocks_Genesis_MultiBlocks(t *testing.T) {
-	db := dbTest.SetupDB(t)
-	ctx := context.Background()
-
-	bs := &Server{
-		BeaconDB: db,
-	}
-	// Should return the proper genesis block if it exists.
-	parentRoot := [32]byte{1, 2, 3}
-	blk := util.NewBeaconBlock()
-	blk.Block.ParentRoot = parentRoot[:]
-	root, err := blk.Block.HashTreeRoot()
-	require.NoError(t, err)
-	util.SaveBlock(t, ctx, db, blk)
-	require.NoError(t, db.SaveGenesisBlockRoot(ctx, root))
-
-	count := types.Slot(100)
-	blks := make([]interfaces.SignedBeaconBlock, count)
-	for i := types.Slot(0); i < count; i++ {
-		b := util.NewBeaconBlock()
-		b.Block.Slot = i
-		require.NoError(t, err)
-		blks[i], err = blocks.NewSignedBeaconBlock(b)
-		require.NoError(t, err)
-	}
-	require.NoError(t, db.SaveBlocks(ctx, blks))
-
-	// Should throw an error if more than one blk returned.
-	_, err = bs.ListBlocks(ctx, &ethpb.ListBlocksRequest{
-		QueryFilter: &ethpb.ListBlocksRequest_Genesis{
-			Genesis: true,
-		},
-	})
-	require.NoError(t, err)
-}
-
-func TestServer_ListBlocks_Pagination(t *testing.T) {
-	params.SetupTestConfigCleanup(t)
-	params.OverrideBeaconConfig(params.MinimalSpecConfig())
-
-	db := dbTest.SetupDB(t)
-	chain := &chainMock.ChainService{
-		CanonicalRoots: map[[32]byte]bool{},
-	}
-	ctx := context.Background()
-
-	count := types.Slot(100)
-	blks := make([]interfaces.SignedBeaconBlock, count)
-	blkContainers := make([]*ethpb.BeaconBlockContainer, count)
-	for i := types.Slot(0); i < count; i++ {
-		b := util.NewBeaconBlock()
-		b.Block.Slot = i
-		root, err := b.Block.HashTreeRoot()
-		require.NoError(t, err)
-		chain.CanonicalRoots[root] = true
-		blks[i], err = blocks.NewSignedBeaconBlock(b)
-		require.NoError(t, err)
-		blkContainers[i] = &ethpb.BeaconBlockContainer{
-			Block:     &ethpb.BeaconBlockContainer_Phase0Block{Phase0Block: b},
-			BlockRoot: root[:],
-			Canonical: true,
-		}
-	}
-	require.NoError(t, db.SaveBlocks(ctx, blks))
-
-	orphanedBlk := util.NewBeaconBlock()
-	orphanedBlk.Block.Slot = 300
-	orphanedBlkRoot, err := orphanedBlk.Block.HashTreeRoot()
-	require.NoError(t, err)
-	util.SaveBlock(t, ctx, db, orphanedBlk)
-
-	bs := &Server{
-		BeaconDB:         db,
-		CanonicalFetcher: chain,
-	}
-
-	root6, err := blks[6].Block().HashTreeRoot()
-	require.NoError(t, err)
-
-	tests := []struct {
-		req *ethpb.ListBlocksRequest
-		res *ethpb.ListBlocksResponse
-	}{
-		{req: &ethpb.ListBlocksRequest{
-			PageToken:   strconv.Itoa(0),
-			QueryFilter: &ethpb.ListBlocksRequest_Slot{Slot: 5},
-			PageSize:    3},
-			res: &ethpb.ListBlocksResponse{
-				BlockContainers: []*ethpb.BeaconBlockContainer{
-					{
-						Block: &ethpb.BeaconBlockContainer_Phase0Block{
-							Phase0Block: util.HydrateSignedBeaconBlock(&ethpb.SignedBeaconBlock{
-								Block: &ethpb.BeaconBlock{
-									Slot: 5,
-								},
-							}),
-						},
-						BlockRoot: blkContainers[5].BlockRoot,
-						Canonical: blkContainers[5].Canonical,
-					},
-				},
-				NextPageToken: "",
-				TotalSize:     1,
-			},
-		},
-		{req: &ethpb.ListBlocksRequest{
-			PageToken:   strconv.Itoa(0),
-			QueryFilter: &ethpb.ListBlocksRequest_Root{Root: root6[:]},
-			PageSize:    3},
-			res: &ethpb.ListBlocksResponse{
-				BlockContainers: []*ethpb.BeaconBlockContainer{
-					{
-						Block: &ethpb.BeaconBlockContainer_Phase0Block{
-							Phase0Block: util.HydrateSignedBeaconBlock(&ethpb.SignedBeaconBlock{
-								Block: &ethpb.BeaconBlock{
-									Slot: 6,
-								},
-							}),
-						},
-						BlockRoot: blkContainers[6].BlockRoot,
-						Canonical: blkContainers[6].Canonical,
-					},
-				},
-				TotalSize:     1,
-				NextPageToken: strconv.Itoa(0),
-			},
-		},
-		{req: &ethpb.ListBlocksRequest{QueryFilter: &ethpb.ListBlocksRequest_Root{Root: root6[:]}},
-			res: &ethpb.ListBlocksResponse{
-				BlockContainers: []*ethpb.BeaconBlockContainer{
-					{
-						Block: &ethpb.BeaconBlockContainer_Phase0Block{
-							Phase0Block: util.HydrateSignedBeaconBlock(&ethpb.SignedBeaconBlock{
-								Block: &ethpb.BeaconBlock{
-									Slot: 6,
-								},
-							}),
-						},
-						BlockRoot: blkContainers[6].BlockRoot,
-						Canonical: blkContainers[6].Canonical,
-					},
-				},
-				TotalSize:     1,
-				NextPageToken: strconv.Itoa(0),
-			},
-		},
-		{req: &ethpb.ListBlocksRequest{
-			PageToken:   strconv.Itoa(0),
-			QueryFilter: &ethpb.ListBlocksRequest_Epoch{Epoch: 0},
-			PageSize:    100},
-			res: &ethpb.ListBlocksResponse{
-				BlockContainers: blkContainers[0:params.BeaconConfig().SlotsPerEpoch],
-				NextPageToken:   "",
-				TotalSize:       int32(params.BeaconConfig().SlotsPerEpoch)}},
-		{req: &ethpb.ListBlocksRequest{
-			PageToken:   strconv.Itoa(1),
-			QueryFilter: &ethpb.ListBlocksRequest_Epoch{Epoch: 5},
-			PageSize:    3},
-			res: &ethpb.ListBlocksResponse{
-				BlockContainers: blkContainers[43:46],
-				NextPageToken:   "2",
-				TotalSize:       int32(params.BeaconConfig().SlotsPerEpoch)}},
-		{req: &ethpb.ListBlocksRequest{
-			PageToken:   strconv.Itoa(1),
-			QueryFilter: &ethpb.ListBlocksRequest_Epoch{Epoch: 11},
-			PageSize:    7},
-			res: &ethpb.ListBlocksResponse{
-				BlockContainers: blkContainers[95:96],
-				NextPageToken:   "",
-				TotalSize:       int32(params.BeaconConfig().SlotsPerEpoch)}},
-		{req: &ethpb.ListBlocksRequest{
-			PageToken:   strconv.Itoa(0),
-			QueryFilter: &ethpb.ListBlocksRequest_Epoch{Epoch: 12},
-			PageSize:    4},
-			res: &ethpb.ListBlocksResponse{
-				BlockContainers: blkContainers[96:100],
-				NextPageToken:   "",
-				TotalSize:       int32(params.BeaconConfig().SlotsPerEpoch / 2)}},
-		{req: &ethpb.ListBlocksRequest{
-			PageToken:   strconv.Itoa(0),
-			QueryFilter: &ethpb.ListBlocksRequest_Slot{Slot: 300},
-			PageSize:    3},
-			res: &ethpb.ListBlocksResponse{
-				BlockContainers: []*ethpb.BeaconBlockContainer{
-					{
-						Block: &ethpb.BeaconBlockContainer_Phase0Block{
-							Phase0Block: util.HydrateSignedBeaconBlock(&ethpb.SignedBeaconBlock{
-								Block: &ethpb.BeaconBlock{
-									Slot: 300,
-								},
-							}),
-						},
-						BlockRoot: orphanedBlkRoot[:],
-						Canonical: false,
-					},
-				},
-				NextPageToken: "",
-				TotalSize:     1}},
-	}
-
-	for i, test := range tests {
-		t.Run(fmt.Sprintf("test_%d", i), func(t *testing.T) {
-			res, err := bs.ListBlocks(ctx, test.req)
-			require.NoError(t, err)
-			require.DeepSSZEqual(t, res, test.res)
-		})
-	}
-}
-
-func TestServer_ListBlocks_Errors(t *testing.T) {
-	db := dbTest.SetupDB(t)
-	ctx := context.Background()
-
-	bs := &Server{BeaconDB: db}
-	exceedsMax := int32(cmd.Get().MaxRPCPageSize + 1)
-
-	wanted := fmt.Sprintf("Requested page size %d can not be greater than max size %d", exceedsMax, cmd.Get().MaxRPCPageSize)
-	req := &ethpb.ListBlocksRequest{PageToken: strconv.Itoa(0), PageSize: exceedsMax}
-	_, err := bs.ListBlocks(ctx, req)
-	assert.ErrorContains(t, wanted, err)
-
-	wanted = "Must specify a filter criteria for fetching"
-	req = &ethpb.ListBlocksRequest{}
-	_, err = bs.ListBlocks(ctx, req)
-	assert.ErrorContains(t, wanted, err)
-
-	req = &ethpb.ListBlocksRequest{QueryFilter: &ethpb.ListBlocksRequest_Slot{Slot: 0}}
-	res, err := bs.ListBlocks(ctx, req)
-	require.NoError(t, err)
-	assert.Equal(t, 0, len(res.BlockContainers), "Wanted empty list")
-	assert.Equal(t, int32(0), res.TotalSize, "Wanted total size 0")
-
-	req = &ethpb.ListBlocksRequest{QueryFilter: &ethpb.ListBlocksRequest_Slot{}}
-	res, err = bs.ListBlocks(ctx, req)
-	require.NoError(t, err)
-	assert.Equal(t, 0, len(res.BlockContainers), "Wanted empty list")
-	assert.Equal(t, int32(0), res.TotalSize, "Wanted total size 0")
-
-	req = &ethpb.ListBlocksRequest{QueryFilter: &ethpb.ListBlocksRequest_Root{Root: []byte{'A'}}}
-	res, err = bs.ListBlocks(ctx, req)
-	require.NoError(t, err)
-	assert.Equal(t, 0, len(res.BlockContainers), "Wanted empty list")
-	assert.Equal(t, int32(0), res.TotalSize, "Wanted total size 0")
-
-	req = &ethpb.ListBlocksRequest{QueryFilter: &ethpb.ListBlocksRequest_Root{Root: []byte{'A'}}}
-	res, err = bs.ListBlocks(ctx, req)
-	require.NoError(t, err)
-	assert.Equal(t, 0, len(res.BlockContainers), "Wanted empty list")
-	assert.Equal(t, int32(0), res.TotalSize, "Wanted total size 0")
-}
-
 // ensures that if any of the checkpoints are zero-valued, an error will be generated without genesis being present
 func TestServer_GetChainHead_NoGenesis(t *testing.T) {
 	db := dbTest.SetupDB(t)
@@ -1192,47 +853,3 @@ func runListBeaconBlocksPagination(t *testing.T, orphanedBlk interfaces.SignedBe
 		})
 	}
 }
-
-func TestServer_ListBeaconBlocks_Errors(t *testing.T) {
-	db := dbTest.SetupDB(t)
-	ctx := context.Background()
-
-	bs := &Server{
-		BeaconDB: db,
-	}
-	exceedsMax := int32(cmd.Get().MaxRPCPageSize + 1)
-
-	wanted := fmt.Sprintf("Requested page size %d can not be greater than max size %d", exceedsMax, cmd.Get().MaxRPCPageSize)
-	req := &ethpb.ListBlocksRequest{PageToken: strconv.Itoa(0), PageSize: exceedsMax}
-	_, err := bs.ListBlocks(ctx, req)
-	assert.ErrorContains(t, wanted, err)
-
-	wanted = "Must specify a filter criteria for fetching"
-	req = &ethpb.ListBlocksRequest{}
-	_, err = bs.ListBeaconBlocks(ctx, req)
-	assert.ErrorContains(t, wanted, err)
-
-	req = &ethpb.ListBlocksRequest{QueryFilter: &ethpb.ListBlocksRequest_Slot{Slot: 0}}
-	res, err := bs.ListBeaconBlocks(ctx, req)
-	require.NoError(t, err)
-	assert.Equal(t, 0, len(res.BlockContainers), "Wanted empty list")
-	assert.Equal(t, int32(0), res.TotalSize, "Wanted total size 0")
-
-	req = &ethpb.ListBlocksRequest{QueryFilter: &ethpb.ListBlocksRequest_Slot{}}
-	res, err = bs.ListBeaconBlocks(ctx, req)
-	require.NoError(t, err)
-	assert.Equal(t, 0, len(res.BlockContainers), "Wanted empty list")
-	assert.Equal(t, int32(0), res.TotalSize, "Wanted total size 0")
-
-	req = &ethpb.ListBlocksRequest{QueryFilter: &ethpb.ListBlocksRequest_Root{Root: []byte{'A'}}}
-	res, err = bs.ListBeaconBlocks(ctx, req)
-	require.NoError(t, err)
-	assert.Equal(t, 0, len(res.BlockContainers), "Wanted empty list")
-	assert.Equal(t, int32(0), res.TotalSize, "Wanted total size 0")
-
-	req = &ethpb.ListBlocksRequest{QueryFilter: &ethpb.ListBlocksRequest_Root{Root: []byte{'A'}}}
-	res, err = bs.ListBeaconBlocks(ctx, req)
-	require.NoError(t, err)
-	assert.Equal(t, 0, len(res.BlockContainers), "Wanted empty list")
-	assert.Equal(t, int32(0), res.TotalSize, "Wanted total size 0")
-}

proto/prysm/v1alpha1/beacon_chain.pb.gw.go

@@ -179,42 +179,6 @@ func local_request_BeaconChain_AttestationPool_0(ctx context.Context, marshaler
 
 }
 
-var (
-	filter_BeaconChain_ListBlocks_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
-)
-
-func request_BeaconChain_ListBlocks_0(ctx context.Context, marshaler runtime.Marshaler, client BeaconChainClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq ListBlocksRequest
-	var metadata runtime.ServerMetadata
-
-	if err := req.ParseForm(); err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_BeaconChain_ListBlocks_0); err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-
-	msg, err := client.ListBlocks(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
-	return msg, metadata, err
-
-}
-
-func local_request_BeaconChain_ListBlocks_0(ctx context.Context, marshaler runtime.Marshaler, server BeaconChainServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq ListBlocksRequest
-	var metadata runtime.ServerMetadata
-
-	if err := req.ParseForm(); err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_BeaconChain_ListBlocks_0); err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-
-	msg, err := server.ListBlocks(ctx, &protoReq)
-	return msg, metadata, err
-
-}
-
 var (
 	filter_BeaconChain_ListBeaconBlocks_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
 )
@@ -887,29 +851,6 @@ func RegisterBeaconChainHandlerServer(ctx context.Context, mux *runtime.ServeMux
 
 	})
 
-	mux.Handle("GET", pattern_BeaconChain_ListBlocks_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
-		ctx, cancel := context.WithCancel(req.Context())
-		defer cancel()
-		var stream runtime.ServerTransportStream
-		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
-		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/ethereum.eth.v1alpha1.BeaconChain/ListBlocks")
-		if err != nil {
-			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
-			return
-		}
-		resp, md, err := local_request_BeaconChain_ListBlocks_0(rctx, inboundMarshaler, server, req, pathParams)
-		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
-		ctx = runtime.NewServerMetadataContext(ctx, md)
-		if err != nil {
-			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
-			return
-		}
-
-		forward_BeaconChain_ListBlocks_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
-	})
-
 	mux.Handle("GET", pattern_BeaconChain_ListBeaconBlocks_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -1417,26 +1358,6 @@ func RegisterBeaconChainHandlerClient(ctx context.Context, mux *runtime.ServeMux
 
 	})
 
-	mux.Handle("GET", pattern_BeaconChain_ListBlocks_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
-		ctx, cancel := context.WithCancel(req.Context())
-		defer cancel()
-		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		rctx, err := runtime.AnnotateContext(ctx, mux, req, "/ethereum.eth.v1alpha1.BeaconChain/ListBlocks")
-		if err != nil {
-			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
-			return
-		}
-		resp, md, err := request_BeaconChain_ListBlocks_0(rctx, inboundMarshaler, client, req, pathParams)
-		ctx = runtime.NewServerMetadataContext(ctx, md)
-		if err != nil {
-			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
-			return
-		}
-
-		forward_BeaconChain_ListBlocks_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
-	})
-
 	mux.Handle("GET", pattern_BeaconChain_ListBeaconBlocks_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -1811,8 +1732,6 @@ var (
 
 	pattern_BeaconChain_AttestationPool_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4}, []string{"eth", "v1alpha1", "beacon", "attestations", "pool"}, ""))
 
-	pattern_BeaconChain_ListBlocks_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"eth", "v1alpha1", "beacon", "blocks"}, ""))
-
 	pattern_BeaconChain_ListBeaconBlocks_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"eth", "v1alpha2", "beacon", "blocks"}, ""))
 
 	pattern_BeaconChain_StreamBlocks_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4}, []string{"eth", "v1alpha1", "beacon", "blocks", "stream"}, ""))
@@ -1861,8 +1780,6 @@ var (
 
 	forward_BeaconChain_AttestationPool_0 = runtime.ForwardResponseMessage
 
-	forward_BeaconChain_ListBlocks_0 = runtime.ForwardResponseMessage
-
 	forward_BeaconChain_ListBeaconBlocks_0 = runtime.ForwardResponseMessage
 
 	forward_BeaconChain_StreamBlocks_0 = runtime.ForwardResponseStream

proto/prysm/v1alpha1/beacon_chain.proto

@@ -91,22 +91,6 @@ service BeaconChain {
         };
     }
 
-	// DEPRECATED in favor of ListBeaconBlocks.
-	//
-    // Retrieve blocks by root, slot, or epoch.
-    //
-    // The server may return multiple blocks in the case that a slot or epoch is
-    // provided as the filter criteria. The server may return an empty list when
-    // no blocks in their database match the filter criteria. This RPC should
-    // not return NOT_FOUND. Only one filter criteria should be used. This endpoint
-    // allows for retrieval of genesis information via a boolean query filter.
-    rpc ListBlocks(ListBlocksRequest) returns (ListBlocksResponse) {
-        option deprecated = true;
-        option (google.api.http) = {
-            get: "/eth/v1alpha1/beacon/blocks"
-        };
-    }
-
     // Retrieve blocks by root, slot, or epoch.
     //
     // The server may return multiple blocks in the case that a slot or epoch is
@@ -389,19 +373,6 @@ message ListBlocksRequest {
     string page_token = 6;
 }
 
-message ListBlocksResponse {
-    repeated BeaconBlockContainer blockContainers = 1;
-
-    // A pagination token returned from a previous call to `ListBlocks`
-    // that indicates from where listing should continue.
-    // This field is optional.
-    string next_page_token = 2;
-
-    // Total count of Blocks matching the request filter.
-    int32 total_size = 3;
-}
-
-
 message ListBeaconBlocksResponse {
     repeated BeaconBlockContainer block_containers = 1;
 

testing/mock/beacon_chain_altair_client_mock.go

@@ -5,13 +5,7 @@
 package mock
 
 import (
-	context "context"
-	reflect "reflect"
-
 	gomock "github.com/golang/mock/gomock"
-	v1alpha1 "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1"
-	v2 "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1"
-	grpc "google.golang.org/grpc"
 )
 
 // MockBeaconChainAltairClient is a mock of BeaconChainAltairClient interface
@@ -36,23 +30,3 @@ func NewMockBeaconChainAltairClient(ctrl *gomock.Controller) *MockBeaconChainAlt
 func (m *MockBeaconChainAltairClient) EXPECT() *MockBeaconChainAltairClientMockRecorder {
 	return m.recorder
 }
-
-// ListBlocks mocks base method
-func (m *MockBeaconChainAltairClient) ListBlocks(arg0 context.Context, arg1 *v1alpha1.ListBlocksRequest, arg2 ...grpc.CallOption) (*v2.ListBlocksResponse, error) {
-	m.ctrl.T.Helper()
-	varargs := []interface{}{arg0, arg1}
-	for _, a := range arg2 {
-		varargs = append(varargs, a)
-	}
-	ret := m.ctrl.Call(m, "ListBlocks", varargs...)
-	ret0, _ := ret[0].(*v2.ListBlocksResponse)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// ListBlocks indicates an expected call of ListBlocks
-func (mr *MockBeaconChainAltairClientMockRecorder) ListBlocks(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	varargs := append([]interface{}{arg0, arg1}, arg2...)
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListBlocks", reflect.TypeOf((*MockBeaconChainAltairClient)(nil).ListBlocks), varargs...)
-}

testing/mock/beacon_chain_altair_service_mock.go

@@ -5,12 +5,7 @@
 package mock
 
 import (
-	context "context"
-	reflect "reflect"
-
 	gomock "github.com/golang/mock/gomock"
-	v1alpha1 "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1"
-	v2 "github.com/prysmaticlabs/prysm/v3/proto/prysm/v1alpha1"
 )
 
 // MockBeaconChainAltairServer is a mock of BeaconChainAltairServer interface
@@ -35,18 +30,3 @@ func NewMockBeaconChainAltairServer(ctrl *gomock.Controller) *MockBeaconChainAlt
 func (m *MockBeaconChainAltairServer) EXPECT() *MockBeaconChainAltairServerMockRecorder {
 	return m.recorder
 }
-
-// ListBlocks mocks base method
-func (m *MockBeaconChainAltairServer) ListBlocks(arg0 context.Context, arg1 *v1alpha1.ListBlocksRequest) (*v2.ListBlocksResponse, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "ListBlocks", arg0, arg1)
-	ret0, _ := ret[0].(*v2.ListBlocksResponse)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// ListBlocks indicates an expected call of ListBlocks
-func (mr *MockBeaconChainAltairServerMockRecorder) ListBlocks(arg0, arg1 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListBlocks", reflect.TypeOf((*MockBeaconChainAltairServer)(nil).ListBlocks), arg0, arg1)
-}

testing/mock/beacon_service_mock.go

@@ -278,26 +278,6 @@ func (mr *MockBeaconChainClientMockRecorder) ListBeaconCommittees(arg0, arg1 int
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListBeaconCommittees", reflect.TypeOf((*MockBeaconChainClient)(nil).ListBeaconCommittees), varargs...)
 }
 
-// ListBlocks mocks base method.
-func (m *MockBeaconChainClient) ListBlocks(arg0 context.Context, arg1 *eth.ListBlocksRequest, arg2 ...grpc.CallOption) (*eth.ListBlocksResponse, error) {
-	m.ctrl.T.Helper()
-	varargs := []interface{}{arg0, arg1}
-	for _, a := range arg2 {
-		varargs = append(varargs, a)
-	}
-	ret := m.ctrl.Call(m, "ListBlocks", varargs...)
-	ret0, _ := ret[0].(*eth.ListBlocksResponse)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// ListBlocks indicates an expected call of ListBlocks.
-func (mr *MockBeaconChainClientMockRecorder) ListBlocks(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	varargs := append([]interface{}{arg0, arg1}, arg2...)
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListBlocks", reflect.TypeOf((*MockBeaconChainClient)(nil).ListBlocks), varargs...)
-}
-
 // ListIndexedAttestations mocks base method.
 func (m *MockBeaconChainClient) ListIndexedAttestations(arg0 context.Context, arg1 *eth.ListIndexedAttestationsRequest, arg2 ...grpc.CallOption) (*eth.ListIndexedAttestationsResponse, error) {
 	m.ctrl.T.Helper()