mdiluz/rove
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove empty proto i/o structs in favor of placeholders

Browse source
This commit is contained in:
Marc Di Luzio 2020-06-13 11:57:27 +01:00
parent fcbc29c80b
commit a4a04a15fb
6 changed files with 360 additions and 169 deletions
Download patch file Download diff file Expand all files Collapse all files

11
cmd/rove-server/internal/routes.go
View file

@ -4,7 +4,6 @@ import (
"context"
"fmt"
"github.com/golang/protobuf/ptypes/empty"
"github.com/google/uuid"
"github.com/mdiluz/rove/pkg/accounts"
"github.com/mdiluz/rove/pkg/game"
@ -13,7 +12,7 @@ import (
"google.golang.org/grpc"
)
func (s *Server) Status(context.Context, *empty.Empty) (*rove.StatusResponse, error) {
func (s *Server) Status(context.Context, *rove.StatusRequest) (*rove.StatusResponse, error) {
response := &rove.StatusResponse{
Ready: true,
Version: version.Version,
@ -30,7 +29,7 @@ func (s *Server) Status(context.Context, *empty.Empty) (*rove.StatusResponse, er
return response, nil
}
func (s *Server) Register(ctx context.Context, req *rove.RegisterRequest) (*empty.Empty, error) {
func (s *Server) Register(ctx context.Context, req *rove.RegisterRequest) (*rove.RegisterResponse, error) {
if len(req.Name) == 0 {
return nil, fmt.Errorf("empty account name")
}
@ -46,7 +45,7 @@ func (s *Server) Register(ctx context.Context, req *rove.RegisterRequest) (*empt
}
return &empty.Empty{}, nil
return &rove.RegisterResponse{}, nil
}
func (s *Server) Rover(ctx context.Context, req *rove.RoverRequest) (*rove.RoverResponse, error) {
@ -104,7 +103,7 @@ func (s *Server) Radar(ctx context.Context, req *rove.RadarRequest) (*rove.Radar
return response, nil
}
func (s *Server) Commands(ctx context.Context, req *rove.CommandsRequest) (*empty.Empty, error) {
func (s *Server) Commands(ctx context.Context, req *rove.CommandsRequest) (*rove.CommandsResponse, error) {
if len(req.Account) == 0 {
return nil, fmt.Errorf("empty account")
}
@ -131,5 +130,5 @@ func (s *Server) Commands(ctx context.Context, req *rove.CommandsRequest) (*empt
return nil, err
}
return &empty.Empty{}, nil
return &rove.CommandsResponse{}, nil
}