Skip to content

Commit 7152288

Browse files
committed
Remove useless string conversion from int.
Int literals actually exist in Go.
1 parent a5603bd commit 7152288

File tree

1 file changed

+9
-12
lines changed

1 file changed

+9
-12
lines changed

tox_test.go

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"log"
1010
"reflect"
1111
"runtime"
12-
"strconv"
1312
"strings"
1413
"testing"
1514
"time"
@@ -22,10 +21,10 @@ const wantBootstrapTest = false
2221

2322
var bsnodes = []struct {
2423
host string
25-
port string
24+
port uint16
2625
key string
2726
}{
28-
{"tox.initramfs.io", "33445", "3F0A45A268367C1BEA652F258C85F4A66DA76BCAA667A49E770BCC4917AB6A25"},
27+
{"tox.initramfs.io", 33445, "3F0A45A268367C1BEA652F258C85F4A66DA76BCAA667A49E770BCC4917AB6A25"},
2928
}
3029

3130
func init() {
@@ -216,28 +215,27 @@ func TestBootstrap(t *testing.T) {
216215
bsnode := bsnodes[0]
217216
_t := NewTox(nil)
218217
defer _t.Kill()
219-
port, _ := strconv.Atoi(bsnode.port)
220218

221219
t.Run("success", func(t *testing.T) {
222-
if ok, err := _t.Bootstrap(bsnode.host, uint16(port), bsnode.key); !ok || err != nil {
220+
if ok, err := _t.Bootstrap(bsnode.host, bsnode.port, bsnode.key); !ok || err != nil {
223221
t.Error("must ok", ok, err)
224222
}
225223
})
226224
t.Run("failed", func(t *testing.T) {
227225
brkey := bsnode.key
228226
brkey = "XYZAB" + bsnode.key[3:]
229-
if ok, err := _t.Bootstrap(bsnode.host, uint16(port), brkey); ok || err == nil {
227+
if ok, err := _t.Bootstrap(bsnode.host, bsnode.port, brkey); ok || err == nil {
230228
t.Error("must failed", ok, err)
231229
}
232-
if ok, err := _t.Bootstrap("a.b.c.d", uint16(port), bsnode.key); ok || err == nil {
230+
if ok, err := _t.Bootstrap("a.b.c.d", bsnode.port, bsnode.key); ok || err == nil {
233231
t.Error("must failed", ok, err)
234232
}
235233
})
236234
t.Run("relay", func(t *testing.T) {
237-
if ok, err := _t.AddTcpRelay(bsnode.host, uint16(port), bsnode.key); !ok || err != nil {
235+
if ok, err := _t.AddTcpRelay(bsnode.host, bsnode.port, bsnode.key); !ok || err != nil {
238236
t.Error("must ok", ok, err)
239237
}
240-
if ok, err := _t.AddTcpRelay("a.b.c.d", uint16(port), bsnode.key); ok || err == nil {
238+
if ok, err := _t.AddTcpRelay("a.b.c.d", bsnode.port, bsnode.key); ok || err == nil {
241239
t.Error("must failed", ok, err)
242240
}
243241
})
@@ -272,11 +270,10 @@ func (minitox *MiniTox) Iterate() {
272270
func (minitox *MiniTox) bootstrap() {
273271
for idx := 0; idx < len(bsnodes)/3; idx++ {
274272
bsnode := bsnodes[idx]
275-
port, err := strconv.Atoi(bsnode.port)
276-
_, err = minitox.t.Bootstrap(bsnode.host, uint16(port), bsnode.key)
273+
_, err = minitox.t.Bootstrap(bsnode.host, bsnode.port, bsnode.key)
277274
if err != nil {
278275
}
279-
_, err = minitox.t.AddTcpRelay(bsnode.host, uint16(port), bsnode.key)
276+
_, err = minitox.t.AddTcpRelay(bsnode.host, bsnode.port, bsnode.key)
280277
if err != nil {
281278
}
282279
}

0 commit comments

Comments
 (0)