Simplify converter interface

admin/client.go

@@ -128,10 +128,8 @@ func (c *Client) Dial(rpcAddr string) error {
 }
 
 // Close closes the connection to the admin service.
-func (c *Client) Close() error {
+func (c *Client) Close() {
 	c.conn.CloseIdleConnections()
-
-	return nil
 }
 
 // LogIn logs in a user.
@@ -167,7 +165,7 @@ func (c *Client) SignUp(
 		return nil, err
 	}
 
-	return converter.FromUser(response.Msg.User)
+	return converter.FromUser(response.Msg.User), nil
 }
 
 // CreateProject creates a new project.

api/converter/from_pb.go

@@ -30,14 +30,12 @@ import (
 )
 
 // FromUser converts the given Protobuf formats to model format.
-func FromUser(pbUser *api.User) (*types.User, error) {
-	createdAt := pbUser.CreatedAt.AsTime()
-
+func FromUser(pbUser *api.User) *types.User {
 	return &types.User{
 		ID:        types.ID(pbUser.Id),
 		Username:  pbUser.Username,
-		CreatedAt: createdAt,
-	}, nil
+		CreatedAt: pbUser.CreatedAt.AsTime(),
+	}
 }
 
 // FromProjects converts the given Protobuf formats to model format.

api/converter/to_pb.go

@@ -33,35 +33,26 @@ import (
 )
 
 // ToUser converts the given model format to Protobuf format.
-func ToUser(user *types.User) (*api.User, error) {
-	pbCreatedAt := timestamppb.New(user.CreatedAt)
-
+func ToUser(user *types.User) *api.User {
 	return &api.User{
 		Id:        user.ID.String(),
 		Username:  user.Username,
-		CreatedAt: pbCreatedAt,
-	}, nil
+		CreatedAt: timestamppb.New(user.CreatedAt),
+	}
 }
 
 // ToProjects converts the given model to Protobuf.
-func ToProjects(projects []*types.Project) ([]*api.Project, error) {
+func ToProjects(projects []*types.Project) []*api.Project {
 	var pbProjects []*api.Project
 	for _, project := range projects {
-		pbProject, err := ToProject(project)
-		if err != nil {
-			return nil, err
-		}
-		pbProjects = append(pbProjects, pbProject)
+		pbProjects = append(pbProjects, ToProject(project))
 	}
 
-	return pbProjects, nil
+	return pbProjects
 }
 
 // ToProject converts the given model to Protobuf.
-func ToProject(project *types.Project) (*api.Project, error) {
-	pbCreatedAt := timestamppb.New(project.CreatedAt)
-	pbUpdatedAt := timestamppb.New(project.UpdatedAt)
-
+func ToProject(project *types.Project) *api.Project {
 	return &api.Project{
 		Id:                        project.ID.String(),
 		Name:                      project.Name,
@@ -70,38 +61,30 @@ func ToProject(project *types.Project) (*api.Project, error) {
 		ClientDeactivateThreshold: project.ClientDeactivateThreshold,
 		PublicKey:                 project.PublicKey,
 		SecretKey:                 project.SecretKey,
-		CreatedAt:                 pbCreatedAt,
-		UpdatedAt:                 pbUpdatedAt,
-	}, nil
+		CreatedAt:                 timestamppb.New(project.CreatedAt),
+		UpdatedAt:                 timestamppb.New(project.UpdatedAt),
+	}
 }
 
 // ToDocumentSummaries converts the given model to Protobuf.
-func ToDocumentSummaries(summaries []*types.DocumentSummary) ([]*api.DocumentSummary, error) {
+func ToDocumentSummaries(summaries []*types.DocumentSummary) []*api.DocumentSummary {
 	var pbSummaries []*api.DocumentSummary
 	for _, summary := range summaries {
-		pbSummary, err := ToDocumentSummary(summary)
-		if err != nil {
-			return nil, err
-		}
-		pbSummaries = append(pbSummaries, pbSummary)
+		pbSummaries = append(pbSummaries, ToDocumentSummary(summary))
 	}
-	return pbSummaries, nil
+	return pbSummaries
 }
 
 // ToDocumentSummary converts the given model to Protobuf format.
-func ToDocumentSummary(summary *types.DocumentSummary) (*api.DocumentSummary, error) {
-	pbCreatedAt := timestamppb.New(summary.CreatedAt)
-	pbAccessedAt := timestamppb.New(summary.AccessedAt)
-	pbUpdatedAt := timestamppb.New(summary.UpdatedAt)
-
+func ToDocumentSummary(summary *types.DocumentSummary) *api.DocumentSummary {
 	return &api.DocumentSummary{
 		Id:         summary.ID.String(),
 		Key:        summary.Key.String(),
-		CreatedAt:  pbCreatedAt,
-		AccessedAt: pbAccessedAt,
-		UpdatedAt:  pbUpdatedAt,
+		CreatedAt:  timestamppb.New(summary.CreatedAt),
+		AccessedAt: timestamppb.New(summary.AccessedAt),
+		UpdatedAt:  timestamppb.New(summary.UpdatedAt),
 		Snapshot:   summary.Snapshot,
-	}, nil
+	}
 }
 
 // ToPresences converts the given model to Protobuf format.

cmd/yorkie/document/list.go

@@ -59,7 +59,7 @@ func newListCommand() *cobra.Command {
 				return err
 			}
 			defer func() {
-				_ = cli.Close()
+				cli.Close()
 			}()
 
 			ctx := context.Background()

cmd/yorkie/document/remove.go

@@ -54,7 +54,7 @@ func newRemoveCommand() *cobra.Command {
 				return err
 			}
 			defer func() {
-				_ = cli.Close()
+				cli.Close()
 			}()
 
 			ctx := context.Background()

cmd/yorkie/history.go

@@ -56,7 +56,7 @@ func newHistoryCmd() *cobra.Command {
 				return err
 			}
 			defer func() {
-				_ = cli.Close()
+				cli.Close()
 			}()
 
 			ctx := context.Background()

cmd/yorkie/login.go

@@ -43,7 +43,7 @@ func newLoginCmd() *cobra.Command {
 				return err
 			}
 			defer func() {
-				_ = cli.Close()
+				cli.Close()
 			}()
 
 			ctx := context.Background()

cmd/yorkie/project/create.go

@@ -53,7 +53,7 @@ func newCreateCommand() *cobra.Command {
 				return err
 			}
 			defer func() {
-				_ = cli.Close()
+				cli.Close()
 			}()
 
 			ctx := context.Background()

cmd/yorkie/project/list.go

@@ -46,7 +46,7 @@ func newListCommand() *cobra.Command {
 				return err
 			}
 			defer func() {
-				_ = cli.Close()
+				cli.Close()
 			}()
 
 			ctx := context.Background()

cmd/yorkie/project/update.go

@@ -62,7 +62,7 @@ func newUpdateCommand() *cobra.Command {
 				return err
 			}
 			defer func() {
-				_ = cli.Close()
+				cli.Close()
 			}()
 
 			ctx := context.Background()

server/rpc/admin_server.go

@@ -65,13 +65,8 @@ func (s *adminServer) SignUp(
 		return nil, err
 	}
 
-	pbUser, err := converter.ToUser(user)
-	if err != nil {
-		return nil, err
-	}
-
 	return connect.NewResponse(&api.SignUpResponse{
-		User: pbUser,
+		User: converter.ToUser(user),
 	}), nil
 }
 
@@ -116,13 +111,8 @@ func (s *adminServer) CreateProject(
 		return nil, err
 	}
 
-	pbProject, err := converter.ToProject(project)
-	if err != nil {
-		return nil, err
-	}
-
 	return connect.NewResponse(&api.CreateProjectResponse{
-		Project: pbProject,
+		Project: converter.ToProject(project),
 	}), nil
 }
 
@@ -137,13 +127,8 @@ func (s *adminServer) ListProjects(
 		return nil, err
 	}
 
-	pbProjects, err := converter.ToProjects(projectList)
-	if err != nil {
-		return nil, err
-	}
-
 	return connect.NewResponse(&api.ListProjectsResponse{
-		Projects: pbProjects,
+		Projects: converter.ToProjects(projectList),
 	}), nil
 }
 
@@ -158,13 +143,8 @@ func (s *adminServer) GetProject(
 		return nil, err
 	}
 
-	pbProject, err := converter.ToProject(project)
-	if err != nil {
-		return nil, err
-	}
-
 	return connect.NewResponse(&api.GetProjectResponse{
-		Project: pbProject,
+		Project: converter.ToProject(project),
 	}), nil
 }
 
@@ -193,13 +173,8 @@ func (s *adminServer) UpdateProject(
 		return nil, err
 	}
 
-	pbProject, err := converter.ToProject(project)
-	if err != nil {
-		return nil, err
-	}
-
 	return connect.NewResponse(&api.UpdateProjectResponse{
-		Project: pbProject,
+		Project: converter.ToProject(project),
 	}), nil
 }
 
@@ -224,13 +199,8 @@ func (s *adminServer) GetDocument(
 		return nil, err
 	}
 
-	pbDocument, err := converter.ToDocumentSummary(document)
-	if err != nil {
-		return nil, err
-	}
-
 	return connect.NewResponse(&api.GetDocumentResponse{
-		Document: pbDocument,
+		Document: converter.ToDocumentSummary(document),
 	}), nil
 }
 
@@ -293,13 +263,8 @@ func (s *adminServer) ListDocuments(
 		return nil, err
 	}
 
-	pbDocuments, err := converter.ToDocumentSummaries(docs)
-	if err != nil {
-		return nil, err
-	}
-
 	return connect.NewResponse(&api.ListDocumentsResponse{
-		Documents: pbDocuments,
+		Documents: converter.ToDocumentSummaries(docs),
 	}), nil
 }
 
@@ -325,14 +290,9 @@ func (s *adminServer) SearchDocuments(
 		return nil, err
 	}
 
-	pbDocuments, err := converter.ToDocumentSummaries(result.Elements)
-	if err != nil {
-		return nil, err
-	}
-
 	return connect.NewResponse(&api.SearchDocumentsResponse{
 		TotalCount: int32(result.TotalCount),
-		Documents:  pbDocuments,
+		Documents:  converter.ToDocumentSummaries(result.Elements),
 	}), nil
 }
 

test/bench/grpc_bench_test.go

@@ -301,7 +301,7 @@ func BenchmarkRPC(b *testing.B) {
 
 	b.Run("adminCli to server", func(b *testing.B) {
 		adminCli := helper.CreateAdminCli(b, defaultServer.RPCAddr())
-		defer func() { assert.NoError(b, adminCli.Close()) }()
+		defer func() { adminCli.Close() }()
 
 		ctx := context.Background()
 		for i := 0; i < b.N; i++ {

test/helper/helper.go

@@ -49,9 +49,9 @@ var testStartedAt int64
 
 // Below are the values of the Yorkie config used in the test.
 var (
-	RPCPort = 21101
+	RPCPort = 11101
 
-	ProfilingPort = 21102
+	ProfilingPort = 11102
 
 	AdminUser                             = server.DefaultAdminUser
 	AdminPassword                         = server.DefaultAdminPassword

test/integration/admin_test.go

@@ -43,7 +43,7 @@ func TestAdmin(t *testing.T) {
 	_, err = adminCli.LogIn(ctx, "admin", "admin")
 	assert.NoError(t, err)
 	defer func() {
-		assert.NoError(t, adminCli.Close())
+		adminCli.Close()
 	}()
 
 	clients := activeClients(t, 1)

test/integration/auth_webhook_test.go

@@ -84,7 +84,7 @@ func TestProjectAuthWebhook(t *testing.T) {
 	defer func() { assert.NoError(t, svr.Shutdown(true)) }()
 
 	adminCli := helper.CreateAdminCli(t, svr.RPCAddr())
-	defer func() { assert.NoError(t, adminCli.Close()) }()
+	defer func() { adminCli.Close() }()
 
 	project, err := adminCli.CreateProject(context.Background(), "auth-webhook-test")
 	assert.NoError(t, err)
@@ -199,7 +199,7 @@ func TestAuthWebhook(t *testing.T) {
 		defer func() { assert.NoError(t, svr.Shutdown(true)) }()
 
 		adminCli := helper.CreateAdminCli(t, svr.RPCAddr())
-		defer func() { assert.NoError(t, adminCli.Close()) }()
+		defer func() { adminCli.Close() }()
 		project, err := adminCli.CreateProject(context.Background(), "success-webhook-after-retries")
 		assert.NoError(t, err)
 		project.AuthWebhookURL = authServer.URL
@@ -241,7 +241,7 @@ func TestAuthWebhook(t *testing.T) {
 		defer func() { assert.NoError(t, svr.Shutdown(true)) }()
 
 		adminCli := helper.CreateAdminCli(t, svr.RPCAddr())
-		defer func() { assert.NoError(t, adminCli.Close()) }()
+		defer func() { adminCli.Close() }()
 		project, err := adminCli.CreateProject(context.Background(), "fail-webhook-after-retries")
 		assert.NoError(t, err)
 		project.AuthWebhookURL = authServer.URL
@@ -294,7 +294,7 @@ func TestAuthWebhook(t *testing.T) {
 		defer func() { assert.NoError(t, svr.Shutdown(true)) }()
 
 		adminCli := helper.CreateAdminCli(t, svr.RPCAddr())
-		defer func() { assert.NoError(t, adminCli.Close()) }()
+		defer func() { adminCli.Close() }()
 		project, err := adminCli.CreateProject(context.Background(), "auth-request-cache")
 		assert.NoError(t, err)
 		project.AuthWebhookURL = authServer.URL
@@ -370,7 +370,7 @@ func TestAuthWebhook(t *testing.T) {
 		defer func() { assert.NoError(t, svr.Shutdown(true)) }()
 
 		adminCli := helper.CreateAdminCli(t, svr.RPCAddr())
-		defer func() { assert.NoError(t, adminCli.Close()) }()
+		defer func() { adminCli.Close() }()
 		project, err := adminCli.CreateProject(context.Background(), "unauth-request-cache")
 		assert.NoError(t, err)
 		project.AuthWebhookURL = authServer.URL

test/integration/document_test.go

@@ -672,7 +672,7 @@ func TestDocument(t *testing.T) {
 func TestDocumentWithProjects(t *testing.T) {
 	ctx := context.Background()
 	adminCli := helper.CreateAdminCli(t, defaultServer.RPCAddr())
-	defer func() { assert.NoError(t, adminCli.Close()) }()
+	defer func() { adminCli.Close() }()
 
 	project1, err := adminCli.CreateProject(ctx, "project1")
 	assert.NoError(t, err)