Commit af895a81 authored by Kevin Atkinson's avatar Kevin Atkinson
Browse files

Fix most "go vet" errors.

parent 9e3cf083
...@@ -54,7 +54,7 @@ func TestHostSimple(t *testing.T) { ...@@ -54,7 +54,7 @@ func TestHostSimple(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
if !bytes.Equal(buf1, buf2) { if !bytes.Equal(buf1, buf2) {
t.Fatal("buf1 != buf2 -- %x != %x", buf1, buf2) t.Fatalf("buf1 != buf2 -- %x != %x", buf1, buf2)
} }
// get it from the pipe (tee) // get it from the pipe (tee)
...@@ -63,7 +63,7 @@ func TestHostSimple(t *testing.T) { ...@@ -63,7 +63,7 @@ func TestHostSimple(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
if !bytes.Equal(buf1, buf3) { if !bytes.Equal(buf1, buf3) {
t.Fatal("buf1 != buf3 -- %x != %x", buf1, buf3) t.Fatalf("buf1 != buf3 -- %x != %x", buf1, buf3)
} }
} }
......
...@@ -205,7 +205,7 @@ func (pn *peernet) removeConn(c *conn) { ...@@ -205,7 +205,7 @@ func (pn *peernet) removeConn(c *conn) {
cs, found = pn.connsByPeer[c.remote] cs, found = pn.connsByPeer[c.remote]
if !found { if !found {
panic(fmt.Sprintf("attempting to remove a conn that doesnt exist %p", c.remote)) panic(fmt.Sprintf("attempting to remove a conn that doesnt exist %v", c.remote))
} }
delete(cs, c) delete(cs, c)
} }
......
...@@ -166,7 +166,7 @@ func TestNetworkSetup(t *testing.T) { ...@@ -166,7 +166,7 @@ func TestNetworkSetup(t *testing.T) {
links12 = mn.LinksBetweenPeers(p1, p2) links12 = mn.LinksBetweenPeers(p1, p2)
if len(links12) != 0 { if len(links12) != 0 {
t.Errorf("should be 0 now...", len(links12)) t.Error("should be 0 now...", len(links12))
} }
links11 = mn.LinksBetweenPeers(p1, p1) links11 = mn.LinksBetweenPeers(p1, p1)
...@@ -190,7 +190,7 @@ func TestNetworkSetup(t *testing.T) { ...@@ -190,7 +190,7 @@ func TestNetworkSetup(t *testing.T) {
// first, no conns // first, no conns
if len(n2.Conns()) > 0 || len(n3.Conns()) > 0 { if len(n2.Conns()) > 0 || len(n3.Conns()) > 0 {
t.Error("should have 0 conn. Got: (%d, %d)", len(n2.Conns()), len(n3.Conns())) t.Errorf("should have 0 conn. Got: (%d, %d)", len(n2.Conns()), len(n3.Conns()))
} }
// connect p2->p3 // connect p2->p3
......
...@@ -146,7 +146,7 @@ a problem. ...@@ -146,7 +146,7 @@ a problem.
h2pi := h2.Peerstore().PeerInfo(h2.ID()) h2pi := h2.Peerstore().PeerInfo(h2.ID())
log.Debugf("dialing %s", h2pi.Addrs) log.Debugf("dialing %s", h2pi.Addrs)
if err := h1.Connect(ctx, h2pi); err != nil { if err := h1.Connect(ctx, h2pi); err != nil {
t.Fatalf("Failed to connect:", err) t.Fatal("Failed to connect:", err)
} }
// launch sender! // launch sender!
...@@ -266,7 +266,7 @@ func TestStBackpressureStreamWrite(t *testing.T) { ...@@ -266,7 +266,7 @@ func TestStBackpressureStreamWrite(t *testing.T) {
t.Error("read failed:", err) t.Error("read failed:", err)
} }
if expect != n { if expect != n {
t.Error("read len differs: %d != %d", expect, n) t.Errorf("read len differs: %d != %d", expect, n)
} }
} }
...@@ -283,7 +283,7 @@ func TestStBackpressureStreamWrite(t *testing.T) { ...@@ -283,7 +283,7 @@ func TestStBackpressureStreamWrite(t *testing.T) {
h2pi := h2.Peerstore().PeerInfo(h2.ID()) h2pi := h2.Peerstore().PeerInfo(h2.ID())
log.Debugf("dialing %s", h2pi.Addrs) log.Debugf("dialing %s", h2pi.Addrs)
if err := h1.Connect(ctx, h2pi); err != nil { if err := h1.Connect(ctx, h2pi); err != nil {
t.Fatalf("Failed to connect:", err) t.Fatal("Failed to connect:", err)
} }
// open a stream, from 2->1, this is our reader // open a stream, from 2->1, this is our reader
......
...@@ -174,7 +174,7 @@ func SubtestConnSendDisc(t *testing.T, hosts []host.Host) { ...@@ -174,7 +174,7 @@ func SubtestConnSendDisc(t *testing.T, hosts []host.Host) {
h2pi := h2.Peerstore().PeerInfo(h2.ID()) h2pi := h2.Peerstore().PeerInfo(h2.ID())
log.Debugf("dialing %s", h2pi.Addrs) log.Debugf("dialing %s", h2pi.Addrs)
if err := h1.Connect(ctx, h2pi); err != nil { if err := h1.Connect(ctx, h2pi); err != nil {
t.Fatalf("Failed to connect:", err) t.Fatal("Failed to connect:", err)
} }
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment