From 621ec7bac440ced3d69f92ed4faae51e1d181d81 Mon Sep 17 00:00:00 2001
From: Matt Joiner <anacrolix@gmail.com>
Date: Tue, 23 Feb 2016 23:52:30 +1100
Subject: [PATCH] dht: Misc trivial improvements

---
 dht/dht_test.go | 4 +++-
 dht/server.go   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dht/dht_test.go b/dht/dht_test.go
index e08c210d..a1870a7c 100644
--- 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 50dea091..9b9c7ca2 100644
--- 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) {
-- 
2.48.1