TrueCloudLab/neo-go
8
0
Fork 0
mirror of https://github.com/nspcc-dev/neo-go.git synced 2025-05-04 19:02:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

protocol: switch to binary MessageCommand

Browse source 
closes #888
This commit is contained in:
Anna Shaleva 2020-05-19 14:54:51 +03:00
parent 1317666167
commit 3bcc56bdcf
5 changed files with 140 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pkg/network/server.go
View file

@ -671,7 +671,7 @@ func (s *Server) requestBlocks(p Peer) error {
func (s *Server) handleMessage(peer Peer, msg *Message) error {
s.log.Debug("got msg",
zap.Stringer("addr", peer.RemoteAddr()),
zap.String("type", string(msg.CommandType())))
zap.String("type", msg.Command.String()))
// Make sure both server and peer are operating on
// the same network.
@ -685,7 +685,7 @@ func (s *Server) handleMessage(peer Peer, msg *Message) error {
return errInvalidInvType
}
}
switch msg.CommandType() {
switch msg.Command {
case CMDAddr:
addrs := msg.Payload.(*payload.AddressList)
return s.handleAddrCmd(peer, addrs)
@ -723,10 +723,10 @@ func (s *Server) handleMessage(peer Peer, msg *Message) error {
pong := msg.Payload.(*payload.Ping)
return s.handlePong(peer, pong)
case CMDVersion, CMDVerack:
return fmt.Errorf("received '%s' after the handshake", msg.CommandType())
return fmt.Errorf("received '%s' after the handshake", msg.Command.String())
}
} else {
switch msg.CommandType() {
switch msg.Command {
case CMDVersion:
version := msg.Payload.(*payload.Version)
return s.handleVersionCmd(peer, version)
@ -739,7 +739,7 @@ func (s *Server) handleMessage(peer Peer, msg *Message) error {
s.tryStartConsensus()
default:
return fmt.Errorf("received '%s' during handshake", msg.CommandType())
return fmt.Errorf("received '%s' during handshake", msg.Command.String())
}
}
return nil