dht: Misc trivial improvements

diff --git a/dht/dht_test.go b/dht/dht_test.go
index e08c210d1ae1fa8d9f0903f864d9f4a8ea963983..a1870a7ced3e23169c40afd547f9c5320eeafbdb 100644 (file)
--- a/dht/dht_test.go
+++ b/dht/dht_test.go
@@ -2,6 +2,7 @@ package dht
 
 import (
        "encoding/hex"
+       "log"
        "math/big"
        "math/rand"
        "net"
@@ -48,6 +49,7 @@ const zeroID = "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00
 var testIDs []nodeID
 
 func init() {
+       log.SetFlags(log.Flags() | log.Lshortfile)
        for _, s := range []string{
                zeroID,
                "\x03" + zeroID[1:],
@@ -152,7 +154,7 @@ func TestServerCustomNodeId(t *testing.T) {
 
 func TestAnnounceTimeout(t *testing.T) {
        if testing.Short() {
-               t.Skip()
+               t.SkipNow()
        }
        s, err := NewServer(&ServerConfig{
                BootstrapNodes: []string{"1.2.3.4:5"},

diff --git a/dht/server.go b/dht/server.go
index 50dea0913b4aa5b0aa9813b47354126309cada2e..9b9c7ca229aff1d466f78ab3a909fb1aced8d80c 100644 (file)
--- a/dht/server.go
+++ b/dht/server.go
@@ -380,7 +380,7 @@ func (s *Server) writeToNode(b []byte, node dHTAddr) (err error) {
        }
        n, err := s.socket.WriteTo(b, node.UDPAddr())
        if err != nil {
-               err = fmt.Errorf("error writing %d bytes to %s: %#v", len(b), node, err)
+               err = fmt.Errorf("error writing %d bytes to %s: %s", len(b), node, err)
                return
        }
        if n != len(b) {