Skip to content

Commit 4c432d8

Browse files
Remove duplicate header write (#4408)
1 parent 63cc1a1 commit 4c432d8

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

vms/rpcchainvm/ghttp/http_client.go

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ import (
77
"io"
88
"net/http"
99

10+
"go.uber.org/zap"
11+
1012
"github.com/ava-labs/avalanchego/proto/pb/io/reader"
13+
"github.com/ava-labs/avalanchego/utils/logging"
1114
"github.com/ava-labs/avalanchego/vms/rpcchainvm/ghttp/greader"
1215
"github.com/ava-labs/avalanchego/vms/rpcchainvm/ghttp/gresponsewriter"
1316
"github.com/ava-labs/avalanchego/vms/rpcchainvm/grpcutils"
@@ -21,13 +24,15 @@ var _ http.Handler = (*Client)(nil)
2124
// Client is an http.Handler that talks over RPC.
2225
type Client struct {
2326
client httppb.HTTPClient
27+
log logging.Logger
2428
}
2529

2630
// NewClient returns an HTTP handler database instance connected to a remote
2731
// HTTP handler instance
28-
func NewClient(client httppb.HTTPClient) *Client {
32+
func NewClient(client httppb.HTTPClient, log logging.Logger) *Client {
2933
return &Client{
3034
client: client,
35+
log: log,
3136
}
3237
}
3338

@@ -190,8 +195,9 @@ func (c *Client) serveHTTPSimple(w http.ResponseWriter, r *http.Request) {
190195
}
191196

192197
if err := convertWriteResponse(w, resp); err != nil {
193-
http.Error(w, err.Error(), http.StatusInternalServerError)
194-
return
198+
c.log.Debug("failed sending HTTP response",
199+
zap.Error(err),
200+
)
195201
}
196202
}
197203

vms/rpcchainvm/ghttp/http_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717
"google.golang.org/grpc/credentials/insecure"
1818
"google.golang.org/grpc/test/bufconn"
1919

20+
"github.com/ava-labs/avalanchego/utils/logging"
2021
"github.com/ava-labs/avalanchego/vms/rpcchainvm/grpcutils"
2122

2223
httppb "github.com/ava-labs/avalanchego/proto/pb/http"
@@ -76,7 +77,7 @@ func TestRequestClientArbitrarilyLongBody(t *testing.T) {
7677
conn, err := grpc.NewClient(listener.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()))
7778
require.NoError(err)
7879

79-
client := NewClient(httppb.NewHTTPClient(conn))
80+
client := NewClient(httppb.NewHTTPClient(conn), logging.NoLog{})
8081

8182
w := &httptest.ResponseRecorder{}
8283
r := &http.Request{
@@ -167,7 +168,7 @@ func TestHttpResponse(t *testing.T) {
167168
Body: bytes.NewBuffer(nil),
168169
}
169170

170-
client := NewClient(httppb.NewHTTPClient(conn))
171+
client := NewClient(httppb.NewHTTPClient(conn), logging.NoLog{})
171172
request := &http.Request{
172173
Body: io.NopCloser(strings.NewReader("foo")),
173174
Header: tt.requestHeaders,

vms/rpcchainvm/vm_client.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ func (vm *VMClient) CreateHandlers(ctx context.Context) (map[string]http.Handler
382382
}
383383

384384
vm.conns = append(vm.conns, clientConn)
385-
handlers[handler.Prefix] = ghttp.NewClient(httppb.NewHTTPClient(clientConn))
385+
handlers[handler.Prefix] = ghttp.NewClient(httppb.NewHTTPClient(clientConn), vm.logger)
386386
}
387387
return handlers, nil
388388
}
@@ -403,7 +403,7 @@ func (vm *VMClient) NewHTTPHandler(ctx context.Context) (http.Handler, error) {
403403
}
404404

405405
vm.conns = append(vm.conns, clientConn)
406-
return ghttp.NewClient(httppb.NewHTTPClient(clientConn)), nil
406+
return ghttp.NewClient(httppb.NewHTTPClient(clientConn), vm.logger), nil
407407
}
408408

409409
func (vm *VMClient) WaitForEvent(ctx context.Context) (common.Message, error) {

0 commit comments

Comments
 (0)