Skip to content

Commit 973104e

Browse files
committed
fix: remove hard-coded TestBackend implementation
Signed-off-by: Minh Huy Tran <huy@perun.network>
1 parent 092ffbb commit 973104e

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

wire/account.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ type Account interface {
4040
Sign(msg []byte) ([]byte, error)
4141
}
4242

43-
const testBackendID = 0
44-
4543
var _ Msg = (*AuthResponseMsg)(nil)
4644

4745
// AuthResponseMsg is the response message in the peer authentication protocol.

wire/net/simple/address.go

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ import (
2828
"perun.network/go-perun/wire"
2929
)
3030

31-
// testBackendID is the identifier for the simulated Backend.
32-
const testBackendID = 0
33-
3431
// Address is a wire address.
3532
type Address struct {
3633
Name string
@@ -208,18 +205,22 @@ func NewRandomAddress(rng *rand.Rand) *Address {
208205
}
209206

210207
// NewRandomAddresses returns a new random peer address.
211-
func NewRandomAddresses(rng *rand.Rand) map[wallet.BackendID]wire.Address {
208+
func NewRandomAddresses(rng *rand.Rand, backendID []wallet.BackendID) map[wallet.BackendID]wire.Address {
212209
const addrLen = 32
213210
l := rng.Intn(addrLen)
214211
d := make([]byte, l)
215212
if _, err := rng.Read(d); err != nil {
216213
panic(err)
217214
}
218215

219-
a := Address{
220-
Name: string(d),
216+
addresses := make(map[wallet.BackendID]wire.Address)
217+
for _, id := range backendID {
218+
a := Address{
219+
Name: string(d),
220+
}
221+
addresses[id] = &a
221222
}
222-
return map[wallet.BackendID]wire.Address{testBackendID: &a}
223+
return addresses
223224
}
224225

225226
// Verify verifies a message signature.

wire/net/simple/dialer_internal_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ func TestDialer_Dial(t *testing.T) {
139139
})
140140

141141
t.Run("unknown host", func(t *testing.T) {
142-
noHostAddr := NewRandomAddresses(rng)
142+
noHostAddr := NewRandomAddresses(rng, []wallet.BackendID{wiretest.TestBackendID})
143143
d.Register(noHostAddr, "no such host")
144144

145145
ctxtest.AssertTerminates(t, timeout, func() {
@@ -151,7 +151,7 @@ func TestDialer_Dial(t *testing.T) {
151151

152152
t.Run("unknown address", func(t *testing.T) {
153153
ctxtest.AssertTerminates(t, timeout, func() {
154-
unkownAddr := NewRandomAddresses(rng)
154+
unkownAddr := NewRandomAddresses(rng, []wallet.BackendID{wiretest.TestBackendID})
155155
conn, err := d.Dial(context.Background(), unkownAddr, ser)
156156
assert.Error(t, err)
157157
assert.Nil(t, conn)

wire/net/simple/simple_exchange_addr_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
"time"
2828

2929
"perun.network/go-perun/channel"
30+
"perun.network/go-perun/wallet"
3031

3132
"github.com/stretchr/testify/assert"
3233

@@ -107,8 +108,8 @@ func newPipeConnPair() (a wirenet.Conn, b wirenet.Conn) {
107108
// recipient generated using randomness from rng.
108109
func newRandomEnvelope(rng *rand.Rand, m wire.Msg) *wire.Envelope {
109110
return &wire.Envelope{
110-
Sender: NewRandomAddresses(rng),
111-
Recipient: NewRandomAddresses(rng),
111+
Sender: NewRandomAddresses(rng, []wallet.BackendID{wiretest.TestBackendID}),
112+
Recipient: NewRandomAddresses(rng, []wallet.BackendID{wiretest.TestBackendID}),
112113
Msg: m,
113114
}
114115
}

0 commit comments

Comments
 (0)