mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-24 13:46:43 +00:00
rpc: rename
This commit is contained in:
parent
595480fe0f
commit
a6d9aa523f
3 changed files with 8 additions and 28 deletions
|
|
@ -54,7 +54,7 @@ type Server struct {
|
||||||
batchItemLimit int
|
batchItemLimit int
|
||||||
batchResponseLimit int
|
batchResponseLimit int
|
||||||
httpBodyLimit int
|
httpBodyLimit int
|
||||||
readLimit int64
|
wsReadLimit int64
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewServer creates a new server instance with no registered handlers.
|
// NewServer creates a new server instance with no registered handlers.
|
||||||
|
|
@ -63,7 +63,7 @@ func NewServer() *Server {
|
||||||
idgen: randomIDGenerator(),
|
idgen: randomIDGenerator(),
|
||||||
codecs: make(map[ServerCodec]struct{}),
|
codecs: make(map[ServerCodec]struct{}),
|
||||||
httpBodyLimit: defaultBodyLimit,
|
httpBodyLimit: defaultBodyLimit,
|
||||||
readLimit: wsDefaultReadLimit,
|
wsReadLimit: wsDefaultReadLimit,
|
||||||
}
|
}
|
||||||
server.run.Store(true)
|
server.run.Store(true)
|
||||||
// Register the default service providing meta information about the RPC service such
|
// Register the default service providing meta information about the RPC service such
|
||||||
|
|
@ -91,11 +91,11 @@ func (s *Server) SetHTTPBodyLimit(limit int) {
|
||||||
s.httpBodyLimit = limit
|
s.httpBodyLimit = limit
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetReadLimits sets the limit for max message size for Websocket requests.
|
// SetWebsocketReadLimit sets the limit for max message size for Websocket requests.
|
||||||
//
|
//
|
||||||
// This method should be called before processing any requests via Websocket server.
|
// This method should be called before processing any requests via Websocket server.
|
||||||
func (s *Server) SetReadLimits(limit int64) {
|
func (s *Server) SetWebsocketReadLimit(limit int64) {
|
||||||
s.readLimit = limit
|
s.wsReadLimit = limit
|
||||||
}
|
}
|
||||||
|
|
||||||
// RegisterName creates a service for the given receiver type under the given name. When no
|
// RegisterName creates a service for the given receiver type under the given name. When no
|
||||||
|
|
|
||||||
|
|
@ -205,7 +205,7 @@ func TestServerBatchResponseSizeLimit(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestServerSetReadLimits(t *testing.T) {
|
func TestServerWebsocketReadLimit(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
|
|
||||||
// Test different read limits
|
// Test different read limits
|
||||||
|
|
@ -233,7 +233,7 @@ func TestServerSetReadLimits(t *testing.T) {
|
||||||
t.Run(tc.name, func(t *testing.T) {
|
t.Run(tc.name, func(t *testing.T) {
|
||||||
// Create server and set read limits
|
// Create server and set read limits
|
||||||
srv := newTestServer()
|
srv := newTestServer()
|
||||||
srv.SetReadLimits(tc.readLimit)
|
srv.SetWebsocketReadLimit(tc.readLimit)
|
||||||
defer srv.Stop()
|
defer srv.Stop()
|
||||||
|
|
||||||
// Start HTTP server with WebSocket handler
|
// Start HTTP server with WebSocket handler
|
||||||
|
|
@ -278,23 +278,3 @@ func TestServerSetReadLimits(t *testing.T) {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Test that SetReadLimits properly updates the server's readerLimit field
|
|
||||||
func TestServerSetReadLimitsField(t *testing.T) {
|
|
||||||
server := NewServer()
|
|
||||||
|
|
||||||
// Test initial default value
|
|
||||||
if server.readLimit != wsDefaultReadLimit {
|
|
||||||
t.Errorf("expected initial readerLimit to be %d, got %d", wsDefaultReadLimit, server.readLimit)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Test setting different values
|
|
||||||
testValues := []int64{1024, 10240, 102400, 1048576}
|
|
||||||
|
|
||||||
for _, expectedLimit := range testValues {
|
|
||||||
server.SetReadLimits(expectedLimit)
|
|
||||||
if server.readLimit != expectedLimit {
|
|
||||||
t.Errorf("expected readerLimit to be %d after SetReadLimits, got %d", expectedLimit, server.readLimit)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -60,7 +60,7 @@ func (s *Server) WebsocketHandler(allowedOrigins []string) http.Handler {
|
||||||
log.Debug("WebSocket upgrade failed", "err", err)
|
log.Debug("WebSocket upgrade failed", "err", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
codec := newWebsocketCodec(conn, r.Host, r.Header, s.readLimit)
|
codec := newWebsocketCodec(conn, r.Host, r.Header, s.wsReadLimit)
|
||||||
s.ServeCodec(codec, 0)
|
s.ServeCodec(codec, 0)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue