fix comment

Signed-off-by: YarBor <yarbor.ww@gmail.com>
apache · Apr 21, 2024 · 44965e4 · 44965e4
1 parent d09d80f
commit 44965e4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/protocol/triple/triple_invoker.go b/protocol/triple/triple_invoker.go
@@ -87,7 +87,7 @@ func (ti *TripleInvoker) Invoke(ctx context.Context, invocation protocol.Invocat
 		return &result
 	}
 
-	ctx, err = mergeAttachmentToOutgoing(ctx, invocation.Attachments())
+	ctx, err = mergeAttachmentToOutgoing(ctx, invocation)
 	if err != nil {
 		result.SetError(err)
 		return &result
@@ -143,15 +143,15 @@ func (ti *TripleInvoker) Invoke(ctx context.Context, invocation protocol.Invocat
 	return &result
 }
 
-func mergeAttachmentToOutgoing(ctx context.Context, attachments map[string]interface{}) (context.Context, error) {
-	for key, valRaw := range attachments {
+func mergeAttachmentToOutgoing(ctx context.Context, inv protocol.Invocation) (context.Context, error) {
+	for key, valRaw := range inv.Attachments() {
 		if str, ok := valRaw.(string); ok {
-			ctx, _ = tri.AppendToOutgoingContext(ctx, key, str)
+			ctx = tri.AppendToOutgoingContext(ctx, key, str)
 			continue
 		}
 		if strs, ok := valRaw.([]string); ok {
 			for _, str := range strs {
-				ctx, _ = tri.AppendToOutgoingContext(ctx, key, str)
+				ctx = tri.AppendToOutgoingContext(ctx, key, str)
 			}
 			continue
 		}

diff --git a/protocol/triple/triple_invoker_test.go b/protocol/triple/triple_invoker_test.go
@@ -161,7 +161,7 @@ func Test_parseAttachments(t *testing.T) {
 			ctx := test.ctx()
 			inv := test.invo()
 			parseAttachments(ctx, test.url, inv)
-			ctx, err := mergeAttachmentToOutgoing(ctx, inv.Attachments())
+			ctx, err := mergeAttachmentToOutgoing(ctx, inv)
 			test.expect(t, ctx, err)
 		})
 	}

diff --git a/protocol/triple/triple_protocol/header.go b/protocol/triple/triple_protocol/header.go
@@ -115,7 +115,7 @@ func newIncomingContext(ctx context.Context, data http.Header) context.Context {
 // It is used for passing headers to server-side.
 // It is like grpc.NewOutgoingContext.
 // Please refer to https://github.com/grpc/grpc-go/blob/master/Documentation/grpc-metadata.md#sending-metadata.
-func NewOutgoingContext(ctx context.Context, data http.Header) (context.Context, error) {
+func NewOutgoingContext(ctx context.Context, data http.Header) context.Context {
 	var header = http.Header{}
 	if data != nil {
 		for key, vals := range data {
@@ -127,14 +127,14 @@ func NewOutgoingContext(ctx context.Context, data http.Header) (context.Context,
 		extraData = map[string]http.Header{}
 	}
 	extraData[headerOutgoingKey] = header
-	return context.WithValue(ctx, extraDataKey{}, extraData), nil
+	return context.WithValue(ctx, extraDataKey{}, extraData)
 }
 
 // AppendToOutgoingContext merges kv pairs from user and existing headers.
 // It is used for passing headers to server-side.
 // It is like grpc.AppendToOutgoingContext.
 // Please refer to https://github.com/grpc/grpc-go/blob/master/Documentation/grpc-metadata.md#sending-metadata.
-func AppendToOutgoingContext(ctx context.Context, kv ...string) (context.Context, error) {
+func AppendToOutgoingContext(ctx context.Context, kv ...string) context.Context {
 	if len(kv)%2 == 1 {
 		panic(fmt.Sprintf("AppendToOutgoingContext got an odd number of input pairs for header: %d", len(kv)))
 	}
@@ -152,7 +152,7 @@ func AppendToOutgoingContext(ctx context.Context, kv ...string) (context.Context
 		// todo(DMwangnima): think about lowering
 		header.Add(strings.ToLower(kv[i]), kv[i+1])
 	}
-	return ctx, nil
+	return ctx
 }
 
 func ExtractFromOutgoingContext(ctx context.Context) http.Header {