Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: remove unused isResponse param in message handlers #431

Merged
merged 1 commit into from
Nov 25, 2023
Merged

chore: remove unused isResponse param in message handlers #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion protocol/blockfetch/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ func (c *Client) GetBlock(point common.Point) (ledger.Block, error) {
return block, nil
}

func (c *Client) messageHandler(msg protocol.Message, isResponse bool) error {
func (c *Client) messageHandler(msg protocol.Message) error {
var err error
switch msg.Type() {
case MessageTypeStartBatch:
Expand Down
2 changes: 1 addition & 1 deletion protocol/blockfetch/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func NewServer(protoOptions protocol.ProtocolOptions, cfg *Config) *Server {
return s
}

func (s *Server) messageHandler(msg protocol.Message, isResponse bool) error {
func (s *Server) messageHandler(msg protocol.Message) error {
var err error
// TODO: add cases for messages from client
switch msg.Type() {
Expand Down
2 changes: 1 addition & 1 deletion protocol/chainsync/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func NewClient(protoOptions protocol.ProtocolOptions, cfg *Config) *Client {
return c
}

func (c *Client) messageHandler(msg protocol.Message, isResponse bool) error {
func (c *Client) messageHandler(msg protocol.Message) error {
var err error
switch msg.Type() {
case MessageTypeAwaitReply:
Expand Down
2 changes: 1 addition & 1 deletion protocol/chainsync/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func NewServer(protoOptions protocol.ProtocolOptions, cfg *Config) *Server {
return s
}

func (s *Server) messageHandler(msg protocol.Message, isResponse bool) error {
func (s *Server) messageHandler(msg protocol.Message) error {
var err error
switch msg.Type() {
case MessageTypeRequestNext:
Expand Down
2 changes: 1 addition & 1 deletion protocol/handshake/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ func (c *Client) Start() {
})
}

func (c *Client) handleMessage(msg protocol.Message, isResponse bool) error {
func (c *Client) handleMessage(msg protocol.Message) error {
var err error
switch msg.Type() {
case MessageTypeAcceptVersion:
Expand Down
2 changes: 1 addition & 1 deletion protocol/handshake/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func NewServer(protoOptions protocol.ProtocolOptions, cfg *Config) *Server {
return s
}

func (s *Server) handleMessage(msg protocol.Message, isResponse bool) error {
func (s *Server) handleMessage(msg protocol.Message) error {
var err error
switch msg.Type() {
case MessageTypeProposeVersions:
Expand Down
2 changes: 1 addition & 1 deletion protocol/keepalive/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ func (c *Client) startTimer() {
})
}

func (c *Client) messageHandler(msg protocol.Message, isResponse bool) error {
func (c *Client) messageHandler(msg protocol.Message) error {
var err error
switch msg.Type() {
case MessageTypeKeepAliveResponse:
Expand Down
2 changes: 1 addition & 1 deletion protocol/keepalive/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func NewServer(protoOptions protocol.ProtocolOptions, cfg *Config) *Server {
return s
}

func (s *Server) messageHandler(msg protocol.Message, isResponse bool) error {
func (s *Server) messageHandler(msg protocol.Message) error {
var err error
switch msg.Type() {
case MessageTypeKeepAlive:
Expand Down
2 changes: 1 addition & 1 deletion protocol/localstatequery/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ func NewClient(protoOptions protocol.ProtocolOptions, cfg *Config) *Client {
return c
}

func (c *Client) messageHandler(msg protocol.Message, isResponse bool) error {
func (c *Client) messageHandler(msg protocol.Message) error {
var err error
switch msg.Type() {
case MessageTypeAcquired:
Expand Down
2 changes: 1 addition & 1 deletion protocol/localstatequery/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ func NewServer(protoOptions protocol.ProtocolOptions, cfg *Config) *Server {
return s
}

func (s *Server) messageHandler(msg protocol.Message, isResponse bool) error {
func (s *Server) messageHandler(msg protocol.Message) error {
var err error
switch msg.Type() {
case MessageTypeAcquire:
Expand Down
2 changes: 1 addition & 1 deletion protocol/localtxmonitor/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ func NewClient(protoOptions protocol.ProtocolOptions, cfg *Config) *Client {
return c
}

func (c *Client) messageHandler(msg protocol.Message, isResponse bool) error {
func (c *Client) messageHandler(msg protocol.Message) error {
var err error
switch msg.Type() {
case MessageTypeAcquired:
Expand Down
2 changes: 1 addition & 1 deletion protocol/localtxmonitor/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func NewServer(protoOptions protocol.ProtocolOptions, cfg *Config) *Server {
return s
}

func (s *Server) messageHandler(msg protocol.Message, isResponse bool) error {
func (s *Server) messageHandler(msg protocol.Message) error {
var err error
switch msg.Type() {
case MessageTypeAcquire:
Expand Down
2 changes: 1 addition & 1 deletion protocol/localtxsubmission/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ func NewClient(protoOptions protocol.ProtocolOptions, cfg *Config) *Client {
return c
}

func (c *Client) messageHandler(msg protocol.Message, isResponse bool) error {
func (c *Client) messageHandler(msg protocol.Message) error {
var err error
switch msg.Type() {
case MessageTypeAcceptTx:
Expand Down
2 changes: 1 addition & 1 deletion protocol/localtxsubmission/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func NewServer(protoOptions protocol.ProtocolOptions, cfg *Config) *Server {
return s
}

func (s *Server) messageHandler(msg protocol.Message, isResponse bool) error {
func (s *Server) messageHandler(msg protocol.Message) error {
var err error
switch msg.Type() {
case MessageTypeSubmitTx:
Expand Down
2 changes: 1 addition & 1 deletion protocol/peersharing/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ func (c *Client) GetPeers(amount uint8) ([]interface{}, error) {
return peers, nil
}

func (c *Client) handleMessage(msg protocol.Message, isResponse bool) error {
func (c *Client) handleMessage(msg protocol.Message) error {
var err error
switch msg.Type() {
case MessageTypeSharePeers:
Expand Down
2 changes: 1 addition & 1 deletion protocol/peersharing/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func NewServer(protoOptions protocol.ProtocolOptions, cfg *Config) *Server {
return s
}

func (s *Server) handleMessage(msg protocol.Message, isResponse bool) error {
func (s *Server) handleMessage(msg protocol.Message) error {
var err error
switch msg.Type() {
case MessageTypeShareRequest:
Expand Down
11 changes: 4 additions & 7 deletions protocol/protocol.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ type ProtocolOptions struct {
}

// MessageHandlerFunc represents a function that handles an incoming message
type MessageHandlerFunc func(Message, bool) error
type MessageHandlerFunc func(Message) error

// MessageFromCborFunc represents a function that parses a mini-protocol message
type MessageFromCborFunc func(uint, []byte) (Message, error)
Expand Down Expand Up @@ -316,7 +316,6 @@ func (p *Protocol) sendLoop() {
func (p *Protocol) recvLoop() {
defer p.waitGroup.Done()
leftoverData := false
isResponse := false
for {
var err error
// Don't grab the next segment from the muxer if we still have data in the buffer
Expand All @@ -333,8 +332,6 @@ func (p *Protocol) recvLoop() {
}
// Add segment payload to buffer
p.recvBuffer.Write(segment.Payload)
// Save whether it's a response
isResponse = segment.IsResponse()
}
}
leftoverData = false
Expand Down Expand Up @@ -383,7 +380,7 @@ func (p *Protocol) recvLoop() {
return
}
// Handle message
if err := p.handleMessage(msg, isResponse); err != nil {
if err := p.handleMessage(msg); err != nil {
p.SendError(err)
return
}
Expand Down Expand Up @@ -470,7 +467,7 @@ func (p *Protocol) setState(state State) {
}
}

func (p *Protocol) handleMessage(msg Message, isResponse bool) error {
func (p *Protocol) handleMessage(msg Message) error {
// Lock the state to prevent collisions
p.stateMutex.Lock()
newState, err := p.getNewState(msg)
Expand All @@ -481,5 +478,5 @@ func (p *Protocol) handleMessage(msg Message, isResponse bool) error {
p.setState(newState)
p.stateMutex.Unlock()
// Call handler function
return p.config.MessageHandlerFunc(msg, isResponse)
return p.config.MessageHandlerFunc(msg)
}
2 changes: 1 addition & 1 deletion protocol/txsubmission/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ func (c *Client) Init() {
})
}

func (c *Client) messageHandler(msg protocol.Message, isResponse bool) error {
func (c *Client) messageHandler(msg protocol.Message) error {
var err error
switch msg.Type() {
case MessageTypeRequestTxIds:
Expand Down
2 changes: 1 addition & 1 deletion protocol/txsubmission/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func NewServer(protoOptions protocol.ProtocolOptions, cfg *Config) *Server {
return s
}

func (s *Server) messageHandler(msg protocol.Message, isResponse bool) error {
func (s *Server) messageHandler(msg protocol.Message) error {
var err error
switch msg.Type() {
case MessageTypeReplyTxIds:
Expand Down