From: Matt Joiner <anacrolix@gmail.com>
Date: Thu, 12 Apr 2018 07:28:13 +0000 (+1000)
Subject: Merge branch 'circleci'
X-Git-Tag: v1.0.0~149
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=0290a1610ae2ffa374dcb76b5bf24578a2236935;p=btrtrc.git

Merge branch 'circleci'

# Conflicts:
#	client.go
---

0290a1610ae2ffa374dcb76b5bf24578a2236935
diff --cc client.go
index 43c79f5c,db9c9b07..eec8ad63
--- a/client.go
+++ b/client.go
@@@ -102,9 -102,10 +102,9 @@@ func (cl *Client) LocalPort() (port int
  
  func writeDhtServerStatus(w io.Writer, s *dht.Server) {
  	dhtStats := s.Stats()
 -	fmt.Fprintf(w, "\tDHT nodes: %d (%d good, %d banned)\n", dhtStats.Nodes, dhtStats.GoodNodes, dhtStats.BadNodes)
 -	fmt.Fprintf(w, "\tDHT Server ID: %x\n", s.ID())
 -	fmt.Fprintf(w, "\tDHT port: %d\n", missinggo.AddrPort(s.Addr()))
 -	fmt.Fprintf(w, "\tDHT announces: %d\n", dhtStats.SuccessfulOutboundAnnouncePeerQueries)
 +	fmt.Fprintf(w, "\t# Nodes: %d (%d good, %d banned)\n", dhtStats.Nodes, dhtStats.GoodNodes, dhtStats.BadNodes)
 +	fmt.Fprintf(w, "\tServer ID: %x\n", s.ID())
- 	fmt.Fprintf(w, "\tAnnounces: %d\n", dhtStats.ConfirmedAnnounces)
++	fmt.Fprintf(w, "\tAnnounces: %d\n", dhtStats.SuccessfulOutboundAnnouncePeerQueries)
  	fmt.Fprintf(w, "\tOutstanding transactions: %d\n", dhtStats.OutstandingTransactions)
  }