From 9328fbaf8141f2ff31eda6feb38518ddeb79fe19 Mon Sep 17 00:00:00 2001 From: Jeromy Date: Wed, 17 Dec 2014 19:27:41 +0000 Subject: [PATCH] clean peerset constructor names --- exchange/bitswap/bitswap.go | 2 +- routing/dht/routing.go | 2 +- util/peerset/peerset.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/exchange/bitswap/bitswap.go b/exchange/bitswap/bitswap.go index 149996b3a..912ed1210 100644 --- a/exchange/bitswap/bitswap.go +++ b/exchange/bitswap/bitswap.go @@ -212,7 +212,7 @@ func (bs *bitswap) sendWantlistToProviders(ctx context.Context, wantlist *wantli message.AddEntry(e.Key, e.Priority) } - ps := pset.NewPeerSet() + ps := pset.New() // Get providers for all entries in wantlist (could take a while) wg := sync.WaitGroup{} diff --git a/routing/dht/routing.go b/routing/dht/routing.go index bfe38e200..51f15ff21 100644 --- a/routing/dht/routing.go +++ b/routing/dht/routing.go @@ -141,7 +141,7 @@ func (dht *IpfsDHT) FindProvidersAsync(ctx context.Context, key u.Key, count int func (dht *IpfsDHT) findProvidersAsyncRoutine(ctx context.Context, key u.Key, count int, peerOut chan peer.Peer) { defer close(peerOut) - ps := pset.NewLimitedPeerSet(count) + ps := pset.NewLimited(count) provs := dht.providers.GetProviders(ctx, key) for _, p := range provs { // NOTE: assuming that this list of peers is unique diff --git a/util/peerset/peerset.go b/util/peerset/peerset.go index 9b132b235..5dcf26682 100644 --- a/util/peerset/peerset.go +++ b/util/peerset/peerset.go @@ -12,14 +12,14 @@ type PeerSet struct { size int } -func NewPeerSet() *PeerSet { +func New() *PeerSet { ps := new(PeerSet) ps.ps = make(map[string]bool) ps.size = -1 return ps } -func NewLimitedPeerSet(size int) *PeerSet { +func NewLimited(size int) *PeerSet { ps := new(PeerSet) ps.ps = make(map[string]bool) ps.size = size