From b9efe45705a4e80cc7d8e0e8f3b247ea13312631 Mon Sep 17 00:00:00 2001
From: a <a@tuxpa.in>
Date: Thu, 10 Nov 2022 17:52:06 -0600
Subject: [PATCH] anotha one
---
client.go | 2 +-
http.go | 6 +++---
json.go | 2 +-
server.go | 2 +-
types.go | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/client.go b/client.go
index 9d42cfc..9746f73 100644
--- a/client.go
+++ b/client.go
@@ -616,7 +616,7 @@ func (c *Client) drainRead() {
// read decodes RPC messages from a codec, feeding them into dispatch.
func (c *Client) read(codec ServerCodec) {
for {
- msgs, batch, err := codec.readBatch()
+ msgs, batch, err := codec.ReadBatch()
if _, ok := err.(*json.SyntaxError); ok {
codec.writeJSON(context.Background(), errorMessage(&parseError{err.Error()}))
}
diff --git a/http.go b/http.go
index 3a5da57..4636863 100644
--- a/http.go
+++ b/http.go
@@ -72,7 +72,7 @@ func (hc *httpConn) remoteAddr() string {
return hc.url
}
-func (hc *httpConn) readBatch() ([]*jsonrpcMessage, bool, error) {
+func (hc *httpConn) ReadBatch() ([]*jsonrpcMessage, bool, error) {
<-hc.closeCh
return nil, false, io.EOF
}
@@ -267,8 +267,8 @@ func (c *httpServerConn) PeerInfo() PeerInfo {
return c.pi
}
-func (c *httpServerConn) readBatch() (messages []*jsonrpcMessage, batch bool, err error) {
- return c.jc.readBatch()
+func (c *httpServerConn) ReadBatch() (messages []*jsonrpcMessage, batch bool, err error) {
+ return c.jc.ReadBatch()
}
func (c *httpServerConn) writeJSON(ctx context.Context, v any) error {
diff --git a/json.go b/json.go
index 5d2ef41..2cc9d99 100644
--- a/json.go
+++ b/json.go
@@ -225,7 +225,7 @@ func (c *jsonCodec) remoteAddr() string {
return c.remote
}
-func (c *jsonCodec) readBatch() (messages []*jsonrpcMessage, batch bool, err error) {
+func (c *jsonCodec) ReadBatch() (messages []*jsonrpcMessage, batch bool, err error) {
// Decode the next JSON object in the input stream.
// This verifies basic syntax, etc.
var rawmsg json.RawMessage
diff --git a/server.go b/server.go
index ab37347..4163d55 100644
--- a/server.go
+++ b/server.go
@@ -79,7 +79,7 @@ func (s *Server) serveSingleRequest(ctx context.Context, codec ServerCodec) {
defer h.close(io.EOF, nil)
// read the HTTP body
- reqs, batch, err := codec.readBatch()
+ reqs, batch, err := codec.ReadBatch()
if err != nil {
if err != io.EOF {
codec.writeJSON(ctx, errorMessage(&invalidMessageError{"parse error"}))
diff --git a/types.go b/types.go
index 0cdeb63..5a0e309 100644
--- a/types.go
+++ b/types.go
@@ -29,7 +29,7 @@ import (
// multiple go-routines concurrently.
type ServerCodec interface {
PeerInfo() PeerInfo
- readBatch() (msgs []*jsonrpcMessage, isBatch bool, err error)
+ ReadBatch() (msgs []*jsonrpcMessage, isBatch bool, err error)
close()
jsonWriter
--
GitLab