fixing merge failures

mbissa · mbissa · commit 8eab968f86c3 · 2026-03-17T06:49:53.000Z
diff --git a/internal/transport/transport_test.go b/internal/transport/transport_test.go
@@ -3551,7 +3551,7 @@ func setupRSTStreamOnEOSTest(ctx context.Context, t *testing.T, sendServerFrames
 
 	// Set up a client.
 	copts := ConnectOptions{BufferPool: mem.DefaultBufferPool()}
-	ct, err := NewHTTP2Client(ctx, ctx, resolver.Address{Addr: lis.Addr().String()}, copts, func(GoAwayReason) {})
+	ct, err := NewHTTP2Client(ctx, ctx, resolver.Address{Addr: lis.Addr().String()}, copts, func(GoAwayReason, http2.ErrCode, error) {})
 	if err != nil {
 		t.Fatalf("NewHTTP2Client failed: %v", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -3551,7 +3551,7 @@ func setupRSTStreamOnEOSTest(ctx context.Context, t *testing.T, sendServerFrames`
`3551`	`3551`
`3552`	`3552`	`// Set up a client.`
`3553`	`3553`	`copts := ConnectOptions{BufferPool: mem.DefaultBufferPool()}`
`3554`		`- ct, err := NewHTTP2Client(ctx, ctx, resolver.Address{Addr: lis.Addr().String()}, copts, func(GoAwayReason) {})`
	`3554`	`+ ct, err := NewHTTP2Client(ctx, ctx, resolver.Address{Addr: lis.Addr().String()}, copts, func(GoAwayReason, http2.ErrCode, error) {})`
`3555`	`3555`	`if err != nil {`
`3556`	`3556`	`t.Fatalf("NewHTTP2Client failed: %v", err)`
`3557`	`3557`	`}`