Unverified Commit f7225934 authored by Steven Allen's avatar Steven Allen Committed by GitHub

Merge pull request #76 from libp2p/fix/use-duration

fix: use time.Duration for time, not floats
parents 6f708c1f e3c58ad9
...@@ -50,13 +50,13 @@ type RoutingTable struct { ...@@ -50,13 +50,13 @@ type RoutingTable struct {
PeerAdded func(peer.ID) PeerAdded func(peer.ID)
// usefulnessGracePeriod is the maximum grace period we will give to a // usefulnessGracePeriod is the maximum grace period we will give to a
// peer in the bucket to be useful to us, failing which, we will evict it to make place for a new peer if the bucket // peer in the bucket to be useful to us, failing which, we will evict
// is full // it to make place for a new peer if the bucket is full
usefulnessGracePeriod float64 usefulnessGracePeriod time.Duration
} }
// NewRoutingTable creates a new routing table with a given bucketsize, local ID, and latency tolerance. // NewRoutingTable creates a new routing table with a given bucketsize, local ID, and latency tolerance.
func NewRoutingTable(bucketsize int, localID ID, latency time.Duration, m peerstore.Metrics, usefulnessGracePeriod float64) (*RoutingTable, error) { func NewRoutingTable(bucketsize int, localID ID, latency time.Duration, m peerstore.Metrics, usefulnessGracePeriod time.Duration) (*RoutingTable, error) {
rt := &RoutingTable{ rt := &RoutingTable{
buckets: []*bucket{newBucket()}, buckets: []*bucket{newBucket()},
bucketsize: bucketsize, bucketsize: bucketsize,
...@@ -154,7 +154,7 @@ func (rt *RoutingTable) addPeer(p peer.ID, queryPeer bool) (bool, error) { ...@@ -154,7 +154,7 @@ func (rt *RoutingTable) addPeer(p peer.ID, queryPeer bool) (bool, error) {
// in that bucket with a LastSuccessfulOutboundQuery value above the maximum threshold and replace it. // in that bucket with a LastSuccessfulOutboundQuery value above the maximum threshold and replace it.
allPeers := bucket.peers() allPeers := bucket.peers()
for _, pc := range allPeers { for _, pc := range allPeers {
if float64(time.Since(pc.LastUsefulAt)) > rt.usefulnessGracePeriod { if time.Since(pc.LastUsefulAt) > rt.usefulnessGracePeriod {
// let's evict it and add the new peer // let's evict it and add the new peer
if bucket.remove(pc.Id) { if bucket.remove(pc.Id) {
bucket.pushFront(&PeerInfo{Id: p, LastUsefulAt: lastUsefulAt, LastSuccessfulOutboundQueryAt: time.Now(), bucket.pushFront(&PeerInfo{Id: p, LastUsefulAt: lastUsefulAt, LastSuccessfulOutboundQueryAt: time.Now(),
......
...@@ -12,7 +12,7 @@ import ( ...@@ -12,7 +12,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )
var NoOpThreshold = float64(100 * time.Hour) var NoOpThreshold = 100 * time.Hour
func TestPrint(t *testing.T) { func TestPrint(t *testing.T) {
t.Parallel() t.Parallel()
...@@ -248,7 +248,7 @@ func TestUpdateLastUsefulAt(t *testing.T) { ...@@ -248,7 +248,7 @@ func TestUpdateLastUsefulAt(t *testing.T) {
} }
func TestTryAddPeer(t *testing.T) { func TestTryAddPeer(t *testing.T) {
minThreshold := float64(24 * 1 * time.Hour) minThreshold := 24 * 1 * time.Hour
t.Parallel() t.Parallel()
local := test.RandPeerIDFatal(t) local := test.RandPeerIDFatal(t)
......
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