wire: Move generic tests for perunio serializer

- Move from wire/test to wire/perunio/serializer/test. - Because these generic tests are specific to perunio serializer. Signed-off-by: Manoranjith <[email protected]>
perun-network · Jan 17, 2022 · 4313360 · 4313360
1 parent 71957fe
commit 4313360
Show file tree

Hide file tree

Showing 15 changed files with 58 additions and 44 deletions.
diff --git a/channel/allocation_test.go b/channel/allocation_test.go
@@ -25,7 +25,7 @@ import (
 	"perun.network/go-perun/channel"
 	"perun.network/go-perun/channel/test"
 	"perun.network/go-perun/wire/perunio"
-	wiretest "perun.network/go-perun/wire/test"
+	peruniotest "perun.network/go-perun/wire/perunio/test"
 	pkgbig "polycry.pt/poly-go/math/big"
 	pkgtest "polycry.pt/poly-go/test"
 )
@@ -234,7 +234,7 @@ func TestBalancesSerialization(t *testing.T) {
 	for n := 0; n < 10; n++ {
 		alloc := test.NewRandomAllocation(rng)
 		if alloc.Valid() == nil {
-			wiretest.GenericSerializerTest(t, alloc)
+			peruniotest.GenericSerializerTest(t, alloc)
 		}
 	}
 }
@@ -247,7 +247,7 @@ func TestAllocationSerialization(t *testing.T) {
 		test.NewRandomAllocation(rng, test.WithNumParts(3), test.WithNumAssets(2), test.WithNumLocked(1)),
 	}
 
-	wiretest.GenericSerializerTest(t, inputs...)
+	peruniotest.GenericSerializerTest(t, inputs...)
 }
 
 func TestAllocationValidLimits(t *testing.T) {
@@ -563,7 +563,7 @@ func TestSuballocSerialization(t *testing.T) {
 		channel.NewSubAlloc(channel.ID{4}, []channel.Bal{big.NewInt(5), big.NewInt(1 << 62)}, nil),
 	}
 
-	wiretest.GenericSerializerTest(t, ss...)
+	peruniotest.GenericSerializerTest(t, ss...)
 }
 
 func TestRemoveSubAlloc(t *testing.T) {

diff --git a/channel/params_test.go b/channel/params_test.go
@@ -20,7 +20,7 @@ import (
 	"perun.network/go-perun/channel"
 	"perun.network/go-perun/channel/test"
 	"perun.network/go-perun/wire/perunio"
-	wiretest "perun.network/go-perun/wire/test"
+	peruniotest "perun.network/go-perun/wire/perunio/test"
 	pkgtest "polycry.pt/poly-go/test"
 )
 
@@ -43,5 +43,5 @@ func TestParams_Serializer(t *testing.T) {
 		params[i] = p
 	}
 
-	wiretest.GenericSerializerTest(t, params...)
+	peruniotest.GenericSerializerTest(t, params...)
 }
diff --git a/channel/state_test.go b/channel/state_test.go
@@ -20,7 +20,7 @@ import (
 	_ "perun.network/go-perun/backend/sim" // backend init
 	"perun.network/go-perun/channel"
 	"perun.network/go-perun/channel/test"
-	wiretest "perun.network/go-perun/wire/test"
+	peruniotest "perun.network/go-perun/wire/perunio/test"
 	pkgtest "polycry.pt/poly-go/test"
 )
 
@@ -29,10 +29,10 @@ func TestStateSerialization(t *testing.T) {
 	state := test.NewRandomState(rng, test.WithNumLocked(int(rng.Int31n(4)+1)))
 	state2 := test.NewRandomState(rng, test.WithIsFinal(!state.IsFinal), test.WithNumLocked(int(rng.Int31n(4)+1)))
 
-	wiretest.GenericSerializerTest(t, state)
+	peruniotest.GenericSerializerTest(t, state)
 	test.GenericStateEqualTest(t, state, state2)
 
 	state.App = channel.NoApp()
 	state.Data = channel.NoData()
-	wiretest.GenericSerializerTest(t, state)
+	peruniotest.GenericSerializerTest(t, state)
 }
diff --git a/channel/transaction_test.go b/channel/transaction_test.go
@@ -19,7 +19,7 @@ import (
 
 	"perun.network/go-perun/channel"
 	"perun.network/go-perun/channel/test"
-	wiretest "perun.network/go-perun/wire/test"
+	peruniotest "perun.network/go-perun/wire/perunio/test"
 	pkgtest "polycry.pt/poly-go/test"
 )
 
@@ -39,11 +39,11 @@ func TestTransactionSerialization(t *testing.T) {
 
 	for _, tt := range tests {
 		tx := test.NewRandomTransaction(rng, tt)
-		wiretest.GenericSerializerTest(t, tx)
+		peruniotest.GenericSerializerTest(t, tx)
 	}
 
 	tx := new(channel.Transaction)
-	wiretest.GenericSerializerTest(t, tx)
+	peruniotest.GenericSerializerTest(t, tx)
 }
 
 // newUniformBoolSlice generates a slice long size with all the elements set to choice.

diff --git a/client/proposalmsgs_test.go b/client/proposalmsgs_test.go
@@ -26,7 +26,7 @@ import (
 	clienttest "perun.network/go-perun/client/test"
 	wallettest "perun.network/go-perun/wallet/test"
 	"perun.network/go-perun/wire"
-	wiretest "perun.network/go-perun/wire/test"
+	peruniotest "perun.network/go-perun/wire/perunio/test"
 	pkgtest "polycry.pt/poly-go/test"
 )
 
@@ -71,7 +71,7 @@ func TestChannelProposalReqSerialization(t *testing.T) {
 			m, err = clienttest.NewRandomVirtualChannelProposal(rng, client.WithNonceFrom(rng), app)
 			require.NoError(t, err)
 		}
-		wiretest.MsgSerializerTest(t, m)
+		peruniotest.MsgSerializerTest(t, m)
 	}
 }
 
@@ -167,7 +167,7 @@ func TestChannelProposalAccSerialization(t *testing.T) {
 			m := proposal.Accept(
 				wallettest.NewRandomAddress(rng),
 				client.WithNonceFrom(rng))
-			wiretest.MsgSerializerTest(t, m)
+			peruniotest.MsgSerializerTest(t, m)
 		}
 	})
 	t.Run("sub channel", func(t *testing.T) {
@@ -176,7 +176,7 @@ func TestChannelProposalAccSerialization(t *testing.T) {
 			proposal, err := clienttest.NewRandomSubChannelProposal(rng)
 			require.NoError(t, err)
 			m := proposal.Accept(client.WithNonceFrom(rng))
-			wiretest.MsgSerializerTest(t, m)
+			peruniotest.MsgSerializerTest(t, m)
 		}
 	})
 	t.Run("virtual channel", func(t *testing.T) {
@@ -185,7 +185,7 @@ func TestChannelProposalAccSerialization(t *testing.T) {
 			proposal, err := clienttest.NewRandomVirtualChannelProposal(rng)
 			require.NoError(t, err)
 			m := proposal.Accept(wallettest.NewRandomAddress(rng))
-			wiretest.MsgSerializerTest(t, m)
+			peruniotest.MsgSerializerTest(t, m)
 		}
 	})
 }
@@ -197,7 +197,7 @@ func TestChannelProposalRejSerialization(t *testing.T) {
 			ProposalID: newRandomProposalID(rng),
 			Reason:     newRandomString(rng, 16, 16),
 		}
-		wiretest.MsgSerializerTest(t, m)
+		peruniotest.MsgSerializerTest(t, m)
 	}
 }
 
@@ -207,7 +207,7 @@ func TestSubChannelProposalSerialization(t *testing.T) {
 	for i := 0; i < repeatRandomizedTest; i++ {
 		prop, err := clienttest.NewRandomSubChannelProposal(rng)
 		require.NoError(t, err)
-		wiretest.MsgSerializerTest(t, prop)
+		peruniotest.MsgSerializerTest(t, prop)
 	}
 }
 

diff --git a/client/updatemsgs_internal_test.go b/client/updatemsgs_internal_test.go
@@ -22,15 +22,15 @@ import (
 	"perun.network/go-perun/channel/test"
 	"perun.network/go-perun/wallet"
 	wallettest "perun.network/go-perun/wallet/test"
-	wiretest "perun.network/go-perun/wire/test"
+	peruniotest "perun.network/go-perun/wire/perunio/test"
 	pkgtest "polycry.pt/poly-go/test"
 )
 
 func TestChannelUpdateSerialization(t *testing.T) {
 	rng := pkgtest.Prng(t)
 	for i := 0; i < 4; i++ {
 		m := newRandomMsgChannelUpdate(rng)
-		wiretest.MsgSerializerTest(t, m)
+		peruniotest.MsgSerializerTest(t, m)
 	}
 }
 
@@ -60,7 +60,7 @@ func TestSerialization_VirtualChannelFundingProposal(t *testing.T) {
 			},
 			IndexMap: test.NewRandomIndexMap(rng, state.NumParts(), msgUp.State.NumParts()),
 		}
-		wiretest.MsgSerializerTest(t, m)
+		peruniotest.MsgSerializerTest(t, m)
 	}
 }
 
@@ -77,7 +77,7 @@ func TestSerialization_VirtualChannelSettlementProposal(t *testing.T) {
 				Sigs:   newRandomSigs(rng, state.NumParts()),
 			},
 		}
-		wiretest.MsgSerializerTest(t, m)
+		peruniotest.MsgSerializerTest(t, m)
 	}
 }
 
@@ -90,7 +90,7 @@ func TestChannelUpdateAccSerialization(t *testing.T) {
 			Version:   uint64(rng.Int63()),
 			Sig:       sig,
 		}
-		wiretest.MsgSerializerTest(t, m)
+		peruniotest.MsgSerializerTest(t, m)
 	}
 }
 
@@ -102,7 +102,7 @@ func TestChannelUpdateRejSerialization(t *testing.T) {
 			Version:   uint64(rng.Int63()),
 			Reason:    newRandomString(rng, 16, 16),
 		}
-		wiretest.MsgSerializerTest(t, m)
+		peruniotest.MsgSerializerTest(t, m)
 	}
 }
 

diff --git a/wallet/address_test.go b/wallet/address_test.go
@@ -23,7 +23,7 @@ import (
 	_ "perun.network/go-perun/backend/sim/wallet"
 	"perun.network/go-perun/wallet"
 	wallettest "perun.network/go-perun/wallet/test"
-	wiretest "perun.network/go-perun/wire/test"
+	peruniotest "perun.network/go-perun/wire/perunio/test"
 	pkgtest "polycry.pt/poly-go/test"
 )
 
@@ -43,13 +43,13 @@ func TestAddresses_Serializer(t *testing.T) {
 	rng := pkgtest.Prng(t)
 
 	addrs := wallettest.NewRandomAddresses(rng, 0)
-	wiretest.GenericSerializerTest(t, &testAddresses{addrs})
+	peruniotest.GenericSerializerTest(t, &testAddresses{addrs})
 
 	addrs = wallettest.NewRandomAddresses(rng, 1)
-	wiretest.GenericSerializerTest(t, &testAddresses{addrs})
+	peruniotest.GenericSerializerTest(t, &testAddresses{addrs})
 
 	addrs = wallettest.NewRandomAddresses(rng, 5)
-	wiretest.GenericSerializerTest(t, &testAddresses{addrs})
+	peruniotest.GenericSerializerTest(t, &testAddresses{addrs})
 }
 
 func TestAddrKey_Equal(t *testing.T) {

diff --git a/wire/account_test.go b/wire/account_test.go
@@ -20,11 +20,11 @@ import (
 	_ "perun.network/go-perun/backend/ethereum/wallet/test" // random init
 	wallettest "perun.network/go-perun/wallet/test"
 	"perun.network/go-perun/wire"
-	wiretest "perun.network/go-perun/wire/test"
+	peruniotest "perun.network/go-perun/wire/perunio/test"
 	pkgtest "polycry.pt/poly-go/test"
 )
 
 func TestAuthResponseMsg(t *testing.T) {
 	rng := pkgtest.Prng(t)
-	wiretest.MsgSerializerTest(t, wire.NewAuthResponseMsg(wallettest.NewRandomAccount(rng)))
+	peruniotest.MsgSerializerTest(t, wire.NewAuthResponseMsg(wallettest.NewRandomAccount(rng)))
 }
diff --git a/wire/controlmsgs_test.go b/wire/controlmsgs_test.go
@@ -18,17 +18,17 @@ import (
 	"testing"
 
 	"perun.network/go-perun/wire"
-	wiretest "perun.network/go-perun/wire/test"
+	peruniotest "perun.network/go-perun/wire/perunio/test"
 )
 
 func TestPingMsg(t *testing.T) {
-	wiretest.MsgSerializerTest(t, wire.NewPingMsg())
+	peruniotest.MsgSerializerTest(t, wire.NewPingMsg())
 }
 
 func TestPongMsg(t *testing.T) {
-	wiretest.MsgSerializerTest(t, wire.NewPongMsg())
+	peruniotest.MsgSerializerTest(t, wire.NewPongMsg())
 }
 
 func TestShutdownMsg(t *testing.T) {
-	wiretest.MsgSerializerTest(t, &wire.ShutdownMsg{"m2384ordkln fb30954390582"})
+	peruniotest.MsgSerializerTest(t, &wire.ShutdownMsg{"m2384ordkln fb30954390582"})
 }
diff --git a/wire/perunio/bigint_external_test.go b/wire/perunio/bigint_external_test.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"perun.network/go-perun/wire/perunio"
-	"perun.network/go-perun/wire/test"
+	peruniotest "perun.network/go-perun/wire/perunio/test"
 )
 
 func TestBigInt_Generic(t *testing.T) {
@@ -31,7 +31,7 @@ func TestBigInt_Generic(t *testing.T) {
 		&perunio.BigInt{Int: big.NewInt(123456)},
 		&perunio.BigInt{Int: new(big.Int).SetBytes([]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10})}, // larger than uint64
 	}
-	test.GenericSerializerTest(t, vars...)
+	peruniotest.GenericSerializerTest(t, vars...)
 }
 
 func TestBigInt_DecodeZeroLength(t *testing.T) {

diff --git a/wire/perunio/byteslice_external_test.go b/wire/perunio/byteslice_external_test.go
@@ -22,14 +22,14 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"perun.network/go-perun/wire/perunio"
-	wiretest "perun.network/go-perun/wire/test"
+	peruniotest "perun.network/go-perun/wire/perunio/test"
 	ctxtest "polycry.pt/poly-go/context/test"
 )
 
 func TestByteSlice(t *testing.T) {
 	var v1, v2, v3, v4 perunio.ByteSlice = []byte{}, []byte{255}, []byte{1, 2, 3, 4, 5, 6}, make([]byte, 20000)
 	testByteSlices(t, v1, v2, v3, v4)
-	wiretest.GenericBrokenPipeTest(t, &v1, &v2, &v3, &v4)
+	peruniotest.GenericBrokenPipeTest(t, &v1, &v2, &v3, &v4)
 }
 
 // TestStutter tests what happens if the network stutters (split one message into several network packages).

diff --git a/wire/perunio/test/doc.go b/wire/perunio/test/doc.go
@@ -0,0 +1,17 @@
+// Copyright 2022 - See NOTICE file for copyright holders.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package test contains test helper functions for running generic tests for
+// types implementing perunio serializer.
+package test // import "perun.network/go-perun/wire/perunio/test"
diff --git a/wire/test/msgtest.go → wire/perunio/test/msgtest.go b/wire/test/msgtest.go → wire/perunio/test/msgtest.go
@@ -20,6 +20,7 @@ import (
 	"testing"
 
 	"perun.network/go-perun/wire"
+	wiretest "perun.network/go-perun/wire/test"
 	pkgtest "polycry.pt/poly-go/test"
 )
 
@@ -39,7 +40,7 @@ func (e *serializableEnvelope) Decode(reader io.Reader) (err error) {
 }
 
 func newSerializableEnvelope(rng *rand.Rand, msg wire.Msg) *serializableEnvelope {
-	return &serializableEnvelope{env: NewRandomEnvelope(rng, msg)}
+	return &serializableEnvelope{env: wiretest.NewRandomEnvelope(rng, msg)}
 }
 
 // MsgSerializerTest performs generic serializer tests on a wire.Msg object.

diff --git a/wire/test/serializertest.go → wire/perunio/test/serializertest.go b/wire/test/serializertest.go → wire/perunio/test/serializertest.go
diff --git a/wire/test/doc.go b/wire/test/doc.go
@@ -14,8 +14,4 @@
 
 // Package test contains implementations of the peer interfaces that are useful
 // for testing.
-
-// Package test contains implementations of peer interfaces that are useful for
-// testing and test helper functions for running generic tests for different
-// wire protocol implementations.
 package test // import "perun.network/go-perun/wire/test"