wire: Modify MsgSerializerTest

- Previously MsgSerializerTest tests were using the (En|De)codeMsg
  functions directly.

- But, after introducing wire serialization abstraction, these functions
  should be used directly, as they do not use the wire serializer.

- Modify the MsgSerializerTest function to use (En|De)codeEnvelope
  instead.

- Also, remove encode/decode test for envelope type. Because this is
  already done using MsgSerializerTest for each Message type.

Signed-off-by: Manoranjith <[email protected]>

wire/msg_test.go

@@ -22,7 +22,6 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"perun.network/go-perun/wire"
-	wiretest "perun.network/go-perun/wire/test"
 	"polycry.pt/poly-go/test"
 )
 
@@ -58,8 +57,3 @@ func TestRegisterExternalDecoder(t *testing.T) {
 		"registration of internal type should fail",
 	)
 }
-
-func TestEnvelope_EncodeDecode(t *testing.T) {
-	ping := wiretest.NewRandomEnvelope(test.Prng(t), wire.NewPingMsg())
-	wiretest.GenericSerializerTest(t, ping)
-}

wire/test/msgtest.go

@@ -16,26 +16,37 @@ package test
 
 import (
 	"io"
+	"math/rand"
 	"testing"
 
 	"perun.network/go-perun/wire"
+	pkgtest "polycry.pt/poly-go/test"
 )
 
-type serializerMsg struct {
-	Msg wire.Msg
+// serializableEnvelope implements perunio serializer for wire.Envelope, so
+// that generic serialzer tests can be run for envelopes.
+type serializableEnvelope struct {
+	env *wire.Envelope
 }
 
-func (msg *serializerMsg) Encode(writer io.Writer) error {
-	return wire.EncodeMsg(msg.Msg, writer)
+func (e *serializableEnvelope) Encode(writer io.Writer) error {
+	return wire.EncodeEnvelope(writer, e.env)
 }
 
-func (msg *serializerMsg) Decode(reader io.Reader) (err error) {
-	msg.Msg, err = wire.DecodeMsg(reader)
+func (e *serializableEnvelope) Decode(reader io.Reader) (err error) {
+	e.env, err = wire.DecodeEnvelope(reader)
 	return err
 }
 
+func newSerializableEnvelope(rng *rand.Rand, msg wire.Msg) *serializableEnvelope {
+	return &serializableEnvelope{env: NewRandomEnvelope(rng, msg)}
+}
+
 // MsgSerializerTest performs generic serializer tests on a wire.Msg object.
+// It tests the perunio encoder/decoder implementations on the individual types
+// and the registration of the corresponding decoders.
 func MsgSerializerTest(t *testing.T, msg wire.Msg) {
 	t.Helper()
-	GenericSerializerTest(t, &serializerMsg{msg})
+
+	GenericSerializerTest(t, newSerializableEnvelope(pkgtest.Prng(t), msg))
 }