1 files changed, 55 insertions, 23 deletions
diff --git a/p2p/message_test.go b/p2p/message_test.go
index e9d46f2c3..7b39b061d 100644
--- a/p2p/message_test.go
+++ b/p2p/message_test.go
@@ -1,38 +1,70 @@
 package p2p
 
 import (
+	"bytes"
+	"io/ioutil"
 	"testing"
+
+	"github.com/ethereum/go-ethereum/ethutil"
 )
 
 func TestNewMsg(t *testing.T) {
-	msg, _ := NewMsg(3, 1, "000")
-	if msg.Code() != 3 {
-		t.Errorf("incorrect code %v", msg.Code())
+	msg := NewMsg(3, 1, "000")
+	if msg.Code != 3 {
+		t.Errorf("incorrect code %d, want %d", msg.Code)
 	}
-	data0 := msg.Data().Get(0).Uint()
-	data1 := string(msg.Data().Get(1).Bytes())
-	if data0 != 1 {
-		t.Errorf("incorrect data %v", data0)
+	if msg.Size != 5 {
+		t.Errorf("incorrect size %d, want %d", msg.Size, 5)
 	}
-	if data1 != "000" {
-		t.Errorf("incorrect data %v", data1)
+	pl, _ := ioutil.ReadAll(msg.Payload)
+	expect := []byte{0x01, 0x83, 0x30, 0x30, 0x30}
+	if !bytes.Equal(pl, expect) {
+		t.Errorf("incorrect payload content, got %x, want %x", pl, expect)
 	}
 }
 
 func TestEncodeDecodeMsg(t *testing.T) {
-	msg, _ := NewMsg(3, 1, "000")
-	encoded := msg.Encode(3)
-	msg, _ = NewMsgFromBytes(encoded)
-	msg.Decode(3)
-	if msg.Code() != 3 {
-		t.Errorf("incorrect code %v", msg.Code())
-	}
-	data0 := msg.Data().Get(0).Uint()
-	data1 := msg.Data().Get(1).Str()
-	if data0 != 1 {
-		t.Errorf("incorrect data %v", data0)
-	}
-	if data1 != "000" {
-		t.Errorf("incorrect data %v", data1)
+	msg := NewMsg(3, 1, "000")
+	buf := new(bytes.Buffer)
+	if err := writeMsg(buf, msg); err != nil {
+		t.Fatalf("encodeMsg error: %v", err)
+	}
+	// t.Logf("encoded: %x", buf.Bytes())
+
+	decmsg, err := readMsg(buf)
+	if err != nil {
+		t.Fatalf("readMsg error: %v", err)
+	}
+	if decmsg.Code != 3 {
+		t.Errorf("incorrect code %d, want %d", decmsg.Code, 3)
+	}
+	if decmsg.Size != 5 {
+		t.Errorf("incorrect size %d, want %d", decmsg.Size, 5)
+	}
+
+	var data struct {
+		I int
+		S string
+	}
+	if err := decmsg.Decode(&data); err != nil {
+		t.Fatalf("Decode error: %v", err)
+	}
+	if data.I != 1 {
+		t.Errorf("incorrect data.I: got %v, expected %d", data.I, 1)
+	}
+	if data.S != "000" {
+		t.Errorf("incorrect data.S: got %q, expected %q", data.S, "000")
+	}
+}
+
+func TestDecodeRealMsg(t *testing.T) {
+	data := ethutil.Hex2Bytes("2240089100000080f87e8002b5457468657265756d282b2b292f5065657220536572766572204f6e652f76302e372e382f52656c656173652f4c696e75782f672b2bc082765fb84086dd80b7aefd6a6d2e3b93f4f300a86bfb6ef7bdc97cb03f793db6bb")
+	msg, err := readMsg(bytes.NewReader(data))
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	if msg.Code != 0 {
+		t.Errorf("incorrect code %d, want %d", msg.Code, 0)
 	}
 }