using proto to unmarshal tasks (#39)

Signed-off-by: Alexander Zemtsov <a.zemtsov@gmail.com>
anoideaopen · Oct 2, 2024 · f46d54b · f46d54b
1 parent 09fe8d1
commit f46d54b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/pkg/hlf/parser/batch.go b/pkg/hlf/parser/batch.go
@@ -56,8 +56,10 @@ func (p *Parser) extractBatchResponse(payload []byte) (*fpb.BatchResponse, error
 
 func (p *Parser) extractTaskRequest(payload []byte) (*fpb.ExecuteTasksRequest, error) {
 	response := &fpb.ExecuteTasksRequest{}
-	if err := protojson.Unmarshal(payload, response); err != nil {
-		return nil, err
+	if err := proto.Unmarshal(payload, response); err != nil {
+		if err = protojson.Unmarshal(payload, response); err != nil {
+			return nil, err
+		}
 	}
 
 	return response, nil

diff --git a/test/builder/batcher/execute_tasks_request.go b/test/builder/batcher/execute_tasks_request.go
@@ -3,7 +3,7 @@ package batcher
 import (
 	fpb "github.com/anoideaopen/foundation/proto"
 	"github.com/go-errors/errors"
-	"google.golang.org/protobuf/encoding/protojson"
+	"github.com/golang/protobuf/proto" //nolint:staticcheck
 )
 
 type ExecuteTasksRequestBuilder struct {
@@ -28,7 +28,7 @@ func (b *ExecuteTasksRequestBuilder) Build() *fpb.ExecuteTasksRequest {
 }
 
 func (b *ExecuteTasksRequestBuilder) Marshal() []byte {
-	requestBytes, err := protojson.Marshal(b.request)
+	requestBytes, err := proto.Marshal(b.request)
 	if err != nil {
 		panic(errors.Errorf("Failed to marshal ExecuteTasksRequest: %v\n", err))
 	}