diff options
author | Felix Lange <fjl@twurst.com> | 2015-03-19 22:08:04 +0800 |
---|---|---|
committer | Felix Lange <fjl@twurst.com> | 2015-03-19 22:08:04 +0800 |
commit | 4811f460e7aad37c6c6867df0461a5fa162b5f2c (patch) | |
tree | 19d8021b660aa7dac6bd732ea756c0836fb5e787 /p2p | |
parent | e13c6739804604849c7e43d27b073e68fba58191 (diff) | |
download | dexon-4811f460e7aad37c6c6867df0461a5fa162b5f2c.tar dexon-4811f460e7aad37c6c6867df0461a5fa162b5f2c.tar.gz dexon-4811f460e7aad37c6c6867df0461a5fa162b5f2c.tar.bz2 dexon-4811f460e7aad37c6c6867df0461a5fa162b5f2c.tar.lz dexon-4811f460e7aad37c6c6867df0461a5fa162b5f2c.tar.xz dexon-4811f460e7aad37c6c6867df0461a5fa162b5f2c.tar.zst dexon-4811f460e7aad37c6c6867df0461a5fa162b5f2c.zip |
p2p: export ExpectMsg (for eth protocol testing)
Diffstat (limited to 'p2p')
-rw-r--r-- | p2p/message.go | 32 | ||||
-rw-r--r-- | p2p/peer_test.go | 32 |
2 files changed, 32 insertions, 32 deletions
diff --git a/p2p/message.go b/p2p/message.go index 14e4404c9..e7e6af287 100644 --- a/p2p/message.go +++ b/p2p/message.go @@ -208,3 +208,35 @@ func (p *MsgPipeRW) Close() error { close(p.closing) return nil } + +// ExpectMsg reads a message from r and verifies that its +// code and encoded RLP content match the provided values. +// If content is nil, the payload is discarded and not verified. +func ExpectMsg(r MsgReader, code uint64, content interface{}) error { + msg, err := r.ReadMsg() + if err != nil { + return err + } + if msg.Code != code { + return fmt.Errorf("message code mismatch: got %d, expected %d", msg.Code, code) + } + if content == nil { + return msg.Discard() + } else { + contentEnc, err := rlp.EncodeToBytes(content) + if err != nil { + panic("content encode error: " + err.Error()) + } + if int(msg.Size) != len(contentEnc) { + return fmt.Errorf("message size mismatch: got %d, want %d", msg.Size, len(contentEnc)) + } + actualContent, err := ioutil.ReadAll(msg.Payload) + if err != nil { + return err + } + if !bytes.Equal(actualContent, contentEnc) { + return fmt.Errorf("message payload mismatch:\ngot: %x\nwant: %x", actualContent, contentEnc) + } + } + return nil +} diff --git a/p2p/peer_test.go b/p2p/peer_test.go index cc9f1f0cd..626dfd00f 100644 --- a/p2p/peer_test.go +++ b/p2p/peer_test.go @@ -192,35 +192,3 @@ func TestNewPeer(t *testing.T) { p.Disconnect(DiscAlreadyConnected) // Should not hang } - -// expectMsg reads a message from r and verifies that its -// code and encoded RLP content match the provided values. -// If content is nil, the payload is discarded and not verified. -func expectMsg(r MsgReader, code uint64, content interface{}) error { - msg, err := r.ReadMsg() - if err != nil { - return err - } - if msg.Code != code { - return fmt.Errorf("message code mismatch: got %d, expected %d", msg.Code, code) - } - if content == nil { - return msg.Discard() - } else { - contentEnc, err := rlp.EncodeToBytes(content) - if err != nil { - panic("content encode error: " + err.Error()) - } - if int(msg.Size) != len(contentEnc) { - return fmt.Errorf("message size mismatch: got %d, want %d", msg.Size, len(contentEnc)) - } - actualContent, err := ioutil.ReadAll(msg.Payload) - if err != nil { - return err - } - if !bytes.Equal(actualContent, contentEnc) { - return fmt.Errorf("message payload mismatch:\ngot: %x\nwant: %x", actualContent, contentEnc) - } - } - return nil -} |