From dacbe3cf89f3f50b47a0c53b42a0971eaaa0335c Mon Sep 17 00:00:00 2001
From: Juan Batiz-Benet <juan@benet.ai>
Date: Mon, 2 Feb 2015 11:30:00 -0800
Subject: [PATCH] AddrManager: use addr manager with smarter TTLs

This addr manager should seriously help with the addrsplosion
problem.
---
 dht_test.go | 14 +++++++-------
 handlers.go |  2 +-
 lookup.go   |  2 +-
 query.go    |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dht_test.go b/dht_test.go
index 00597b0..9d65a6f 100644
--- a/dht_test.go
+++ b/dht_test.go
@@ -55,7 +55,7 @@ func setupDHTS(ctx context.Context, n int, t *testing.T) ([]ma.Multiaddr, []peer
 	for i := 0; i < n; i++ {
 		dhts[i] = setupDHT(ctx, t)
 		peers[i] = dhts[i].self
-		addrs[i] = dhts[i].peerstore.Addresses(dhts[i].self)[0]
+		addrs[i] = dhts[i].peerstore.Addrs(dhts[i].self)[0]
 	}
 
 	return addrs, peers, dhts
@@ -64,12 +64,12 @@ func setupDHTS(ctx context.Context, n int, t *testing.T) ([]ma.Multiaddr, []peer
 func connect(t *testing.T, ctx context.Context, a, b *IpfsDHT) {
 
 	idB := b.self
-	addrB := b.peerstore.Addresses(idB)
+	addrB := b.peerstore.Addrs(idB)
 	if len(addrB) == 0 {
 		t.Fatal("peers setup incorrectly: no local address")
 	}
 
-	a.peerstore.AddAddresses(idB, addrB)
+	a.peerstore.AddAddrs(idB, addrB, peer.TempAddrTTL)
 	if err := a.Connect(ctx, idB); err != nil {
 		t.Fatal(err)
 	}
@@ -754,20 +754,20 @@ func TestConnectCollision(t *testing.T) {
 		dhtA := setupDHT(ctx, t)
 		dhtB := setupDHT(ctx, t)
 
-		addrA := dhtA.peerstore.Addresses(dhtA.self)[0]
-		addrB := dhtB.peerstore.Addresses(dhtB.self)[0]
+		addrA := dhtA.peerstore.Addrs(dhtA.self)[0]
+		addrB := dhtB.peerstore.Addrs(dhtB.self)[0]
 
 		peerA := dhtA.self
 		peerB := dhtB.self
 
 		errs := make(chan error)
 		go func() {
-			dhtA.peerstore.AddAddress(peerB, addrB)
+			dhtA.peerstore.AddAddr(peerB, addrB, peer.TempAddrTTL)
 			err := dhtA.Connect(ctx, peerB)
 			errs <- err
 		}()
 		go func() {
-			dhtB.peerstore.AddAddress(peerA, addrA)
+			dhtB.peerstore.AddAddr(peerA, addrA, peer.TempAddrTTL)
 			err := dhtB.Connect(ctx, peerA)
 			errs <- err
 		}()
diff --git a/handlers.go b/handlers.go
index 6376dbc..6974ad0 100644
--- a/handlers.go
+++ b/handlers.go
@@ -238,7 +238,7 @@ func (dht *IpfsDHT) handleAddProvider(ctx context.Context, p peer.ID, pmes *pb.M
 		log.Infof("received provider %s for %s (addrs: %s)", p, key, pi.Addrs)
 		if pi.ID != dht.self { // dont add own addrs.
 			// add the received addresses to our peerstore.
-			dht.peerstore.AddPeerInfo(pi)
+			dht.peerstore.AddAddrs(pi.ID, pi.Addrs, peer.ProviderAddrTTL)
 		}
 		dht.providers.AddProvider(key, p)
 	}
diff --git a/lookup.go b/lookup.go
index 6e0acd9..a713e55 100644
--- a/lookup.go
+++ b/lookup.go
@@ -100,7 +100,7 @@ func (dht *IpfsDHT) closerPeersSingle(ctx context.Context, key u.Key, p peer.ID)
 	for _, pbp := range pmes.GetCloserPeers() {
 		pid := peer.ID(pbp.GetId())
 		if pid != dht.self { // dont add self
-			dht.peerstore.AddAddresses(pid, pbp.Addresses())
+			dht.peerstore.AddAddrs(pid, pbp.Addresses(), peer.TempAddrTTL)
 			out = append(out, pid)
 		}
 	}
diff --git a/query.go b/query.go
index 8d6505b..293c0dd 100644
--- a/query.go
+++ b/query.go
@@ -253,7 +253,7 @@ func (r *dhtQueryRunner) queryPeer(cg ctxgroup.ContextGroup, p peer.ID) {
 			}
 
 			// add their addresses to the dialer's peerstore
-			r.query.dht.peerstore.AddPeerInfo(next)
+			r.query.dht.peerstore.AddAddrs(next.ID, next.Addrs, peer.TempAddrTTL)
 			r.addPeerToQuery(cg.Context(), next.ID)
 			log.Debugf("PEERS CLOSER -- worker for: %v added %v (%v)", p, next.ID, next.Addrs)
 		}