[Merged by Bors] - Remove unused params

activation/nipost.go

@@ -355,7 +355,7 @@ func withConditionalTimeout(ctx context.Context, timeout time.Duration) (context
 	return ctx, func() {}
 }
 
-// Submit the challenge to a single PoET.
+// Submit the challenge (register) to a single PoET.
 func (nb *NIPostBuilder) submitPoetChallenge(
 	ctx context.Context,
 	nodeID types.NodeID,

activation/poetdb.go

@@ -94,7 +94,6 @@ func (db *PoetDb) Validate(
 		return fmt.Errorf("failed to validate poet proof for poetID %x round %s: %w", shortID, roundID, err)
 	}
 	// TODO(noamnelke): validate signature (or extract public key and use for salting merkle hashes)
-
 	return nil
 }
 

api/grpcserver/admin_service.go

@@ -57,20 +57,20 @@
 }
 
 // RegisterService registers this service with a grpc server instance.
-func (a AdminService) RegisterService(server *grpc.Server) {
+func (a *AdminService) RegisterService(server *grpc.Server) {
 	pb.RegisterAdminServiceServer(server, a)
 }
 
-func (s AdminService) RegisterHandlerService(mux *runtime.ServeMux) error {
-	return pb.RegisterAdminServiceHandlerServer(context.Background(), mux, s)
+func (a *AdminService) RegisterHandlerService(mux *runtime.ServeMux) error {
+	return pb.RegisterAdminServiceHandlerServer(context.Background(), mux, a)
 }
 
 // String returns the name of this service.
-func (a AdminService) String() string {
+func (a *AdminService) String() string {
 	return "AdminService"
 }
 
-func (a AdminService) CheckpointStream(
+func (a *AdminService) CheckpointStream(
 	req *pb.CheckpointStreamRequest,
 	stream pb.AdminService_CheckpointStreamServer,
 ) error {
@@ -118,13 +118,13 @@
 	}
 }
 
-func (a AdminService) Recover(ctx context.Context, _ *pb.RecoverRequest) (*emptypb.Empty, error) {
+func (a *AdminService) Recover(ctx context.Context, _ *pb.RecoverRequest) (*emptypb.Empty, error) {
 	ctxzap.Info(ctx, "going to recover from checkpoint")
 	a.recover()
 	return &emptypb.Empty{}, nil
 }
 
-func (a AdminService) EventsStream(req *pb.EventStreamRequest, stream pb.AdminService_EventsStreamServer) error {
+func (a *AdminService) EventsStream(_ *pb.EventStreamRequest, stream pb.AdminService_EventsStreamServer) error {
 	sub, buf, err := events.SubscribeUserEvents(events.WithBuffer(1000))
 	if err != nil {
 		return status.Errorf(codes.FailedPrecondition, err.Error())
@@ -156,7 +156,7 @@
 	}
 }
 
-func (a AdminService) PeerInfoStream(_ *emptypb.Empty, stream pb.AdminService_PeerInfoStreamServer) error {
+func (a *AdminService) PeerInfoStream(_ *emptypb.Empty, stream pb.AdminService_PeerInfoStreamServer) error {
 	for _, p := range a.p.GetPeers() {
 		select {
 		case <-stream.Context().Done():

api/grpcserver/admin_service_test.go

@@ -65,7 +65,7 @@ func TestAdminService_Checkpoint(t *testing.T) {
 
 	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 	defer cancel()
-	conn := dialGrpc(ctx, t, cfg)
+	conn := dialGrpc(t, cfg)
 	c := pb.NewAdminServiceClient(conn)
 
 	stream, err := c.CheckpointStream(ctx, &pb.CheckpointStreamRequest{SnapshotLayer: snapshot})
@@ -101,7 +101,7 @@ func TestAdminService_CheckpointError(t *testing.T) {
 
 	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 	defer cancel()
-	conn := dialGrpc(ctx, t, cfg)
+	conn := dialGrpc(t, cfg)
 	c := pb.NewAdminServiceClient(conn)
 
 	stream, err := c.CheckpointStream(ctx, &pb.CheckpointStreamRequest{SnapshotLayer: snapshot})
@@ -121,7 +121,7 @@ func TestAdminService_Recovery(t *testing.T) {
 
 	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 	defer cancel()
-	conn := dialGrpc(ctx, t, cfg)
+	conn := dialGrpc(t, cfg)
 	c := pb.NewAdminServiceClient(conn)
 
 	_, err := c.Recover(ctx, &pb.RecoverRequest{})
@@ -141,7 +141,7 @@ func TestAdminService_PeerInfo(t *testing.T) {
 
 	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 	defer cancel()
-	conn := dialGrpc(ctx, t, cfg)
+	conn := dialGrpc(t, cfg)
 	c := pb.NewAdminServiceClient(conn)
 
 	p1 := p2p.Peer("p1")

api/grpcserver/debug_service.go

@@ -32,16 +32,16 @@
 }
 
 // RegisterService registers this service with a grpc server instance.
-func (d DebugService) RegisterService(server *grpc.Server) {
+func (d *DebugService) RegisterService(server *grpc.Server) {
 	pb.RegisterDebugServiceServer(server, d)
 }
 
-func (s DebugService) RegisterHandlerService(mux *runtime.ServeMux) error {
-	return pb.RegisterDebugServiceHandlerServer(context.Background(), mux, s)
+func (d *DebugService) RegisterHandlerService(mux *runtime.ServeMux) error {
+	return pb.RegisterDebugServiceHandlerServer(context.Background(), mux, d)
 }
 
 // String returns the name of this service.
-func (d DebugService) String() string {
+func (d *DebugService) String() string {
 	return "DebugService"
 }
 
@@ -59,7 +59,7 @@
 }
 
 // Accounts returns current counter and balance for all accounts.
-func (d DebugService) Accounts(ctx context.Context, in *pb.AccountsRequest) (*pb.AccountsResponse, error) {
+func (d *DebugService) Accounts(ctx context.Context, in *pb.AccountsRequest) (*pb.AccountsResponse, error) {
 	var (
 		accts []*types.Account
 		err   error
@@ -96,7 +96,7 @@
 }
 
 // NetworkInfo query provides NetworkInfoResponse.
-func (d DebugService) NetworkInfo(ctx context.Context, _ *emptypb.Empty) (*pb.NetworkInfoResponse, error) {
+func (d *DebugService) NetworkInfo(ctx context.Context, _ *emptypb.Empty) (*pb.NetworkInfoResponse, error) {
 	resp := &pb.NetworkInfoResponse{Id: d.netInfo.ID().String()}
 	for _, a := range d.netInfo.ListenAddresses() {
 		resp.ListenAddresses = append(resp.ListenAddresses, a.String())
@@ -139,7 +139,7 @@
 }
 
 // ActiveSet query provides hare active set for the specified epoch.
-func (d DebugService) ActiveSet(ctx context.Context, req *pb.ActiveSetRequest) (*pb.ActiveSetResponse, error) {
+func (d *DebugService) ActiveSet(ctx context.Context, req *pb.ActiveSetRequest) (*pb.ActiveSetResponse, error) {
 	actives, err := d.oracle.ActiveSet(ctx, types.EpochID(req.Epoch))
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, fmt.Sprintf("active set for epoch %d: %s", req.Epoch, err.Error()))
@@ -152,7 +152,7 @@
 }
 
 // ProposalsStream streams all proposals confirmed by hare.
-func (d DebugService) ProposalsStream(_ *emptypb.Empty, stream pb.DebugService_ProposalsStreamServer) error {
+func (d *DebugService) ProposalsStream(_ *emptypb.Empty, stream pb.DebugService_ProposalsStreamServer) error {
 	sub := events.SubscribeProposals()
 	if sub == nil {
 		return status.Errorf(codes.FailedPrecondition, "event reporting is not enabled")
@@ -177,7 +177,7 @@
 	}
 }
 
-func (d DebugService) ChangeLogLevel(ctx context.Context, req *pb.ChangeLogLevelRequest) (*emptypb.Empty, error) {
+func (d *DebugService) ChangeLogLevel(ctx context.Context, req *pb.ChangeLogLevelRequest) (*emptypb.Empty, error) {
 	level, err := zap.ParseAtomicLevel(req.GetLevel())
 	if err != nil {
 		return nil, fmt.Errorf("parse level: %w", err)

api/grpcserver/globalstate_service.go

@@ -24,16 +24,16 @@
 }
 
 // RegisterService registers this service with a grpc server instance.
-func (s GlobalStateService) RegisterService(server *grpc.Server) {
+func (s *GlobalStateService) RegisterService(server *grpc.Server) {
 	pb.RegisterGlobalStateServiceServer(server, s)
 }
 
-func (s GlobalStateService) RegisterHandlerService(mux *runtime.ServeMux) error {
+func (s *GlobalStateService) RegisterHandlerService(mux *runtime.ServeMux) error {
 	return pb.RegisterGlobalStateServiceHandlerServer(context.Background(), mux, s)
 }
 
 // String returns the name of the service.
-func (s GlobalStateService) String() string {
+func (s *GlobalStateService) String() string {
 	return "GlobalStateService"
 }
 
@@ -46,7 +46,7 @@
 }
 
 // GlobalStateHash returns the latest layer and its computed global state hash.
-func (s GlobalStateService) GlobalStateHash(
+func (s *GlobalStateService) GlobalStateHash(
 	context.Context,
 	*pb.GlobalStateHashRequest,
 ) (*pb.GlobalStateHashResponse, error) {
@@ -60,7 +60,7 @@
 	}}, nil
 }
 
-func (s GlobalStateService) getAccount(addr types.Address) (acct *pb.Account, err error) {
+func (s *GlobalStateService) getAccount(addr types.Address) (acct *pb.Account, err error) {
 	balanceActual, err := s.conState.GetBalance(addr)
 	if err != nil {
 		return nil, err
@@ -84,7 +84,7 @@
 }
 
 // Account returns current and projected counter and balance for one account.
-func (s GlobalStateService) Account(ctx context.Context, in *pb.AccountRequest) (*pb.AccountResponse, error) {
+func (s *GlobalStateService) Account(ctx context.Context, in *pb.AccountRequest) (*pb.AccountResponse, error) {
 	if in.AccountId == nil {
 		return nil, status.Errorf(codes.InvalidArgument, "`AccountId` must be provided")
 	}
@@ -112,7 +112,7 @@
 }
 
 // AccountDataQuery returns historical account data such as rewards and receipts.
-func (s GlobalStateService) AccountDataQuery(
+func (s *GlobalStateService) AccountDataQuery(
 	ctx context.Context,
 	in *pb.AccountDataQueryRequest,
 ) (*pb.AccountDataQueryResponse, error) {
@@ -200,7 +200,7 @@
 }
 
 // SmesherDataQuery returns historical info on smesher rewards.
-func (s GlobalStateService) SmesherDataQuery(
+func (s *GlobalStateService) SmesherDataQuery(
 	_ context.Context,
 	in *pb.SmesherDataQueryRequest,
 ) (*pb.SmesherDataQueryResponse, error) {
@@ -210,7 +210,7 @@
 // STREAMS
 
 // AccountDataStream exposes a stream of account-related data.
-func (s GlobalStateService) AccountDataStream(
+func (s *GlobalStateService) AccountDataStream(
 	in *pb.AccountDataStreamRequest,
 	stream pb.GlobalStateService_AccountDataStreamServer,
 ) error {
@@ -328,15 +328,15 @@
 }
 
 // SmesherRewardStream exposes a stream of smesher rewards.
-func (s GlobalStateService) SmesherRewardStream(
+func (s *GlobalStateService) SmesherRewardStream(
 	in *pb.SmesherRewardStreamRequest,
 	stream pb.GlobalStateService_SmesherRewardStreamServer,
 ) error {
 	return status.Errorf(codes.Unimplemented, "DEPRECATED")
 }
 
 // AppEventStream exposes a stream of emitted app events.
-func (s GlobalStateService) AppEventStream(
+func (s *GlobalStateService) AppEventStream(
 	*pb.AppEventStreamRequest,
 	pb.GlobalStateService_AppEventStreamServer,
 ) error {
@@ -347,7 +347,7 @@
 }
 
 // GlobalStateStream exposes a stream of global data data items: rewards, receipts, account info, global state hash.
-func (s GlobalStateService) GlobalStateStream(
+func (s *GlobalStateService) GlobalStateStream(
 	in *pb.GlobalStateStreamRequest,
 	stream pb.GlobalStateService_GlobalStateStreamServer,
 ) error {

api/grpcserver/globalstate_service_test.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"math"
 	"testing"
-	"time"
 
 	pb "github.com/spacemeshos/api/release/go/spacemesh/v1"
 	"github.com/stretchr/testify/require"
@@ -30,9 +29,7 @@ func setupGlobalStateService(t *testing.T) (*globalStateServiceConn, context.Con
 	cfg, cleanup := launchServer(t, svc)
 	t.Cleanup(cleanup)
 
-	grpcCtx, cancel := context.WithTimeout(context.Background(), time.Second)
-	defer cancel()
-	conn := dialGrpc(grpcCtx, t, cfg)
+	conn := dialGrpc(t, cfg)
 	client := pb.NewGlobalStateServiceClient(conn)
 
 	return &globalStateServiceConn{