fluencelabs/go-libp2p-kad-dht
1
0
Fork 0
mirror of https://github.com/fluencelabs/go-libp2p-kad-dht synced 2025-04-24 22:32:13 +00:00
Code Issues Projects Releases Wiki Activity

providers: use raw cids as map keys

Browse Source
This commit is contained in:
Steven Allen 2019-04-12 21:10:13 -07:00
parent b99a6ee931
commit 95a6c2509f
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dht_test.go
View File

@ -757,13 +757,13 @@ func TestProvidesMany(t *testing.T) {
}
}
providers := make(map[string]peer.ID)
providers := make(map[cid.Cid]peer.ID)
d := 0
for _, c := range testCaseCids {
d = (d + 1) % len(dhts)
dht := dhts[d]
providers[c.KeyString()] = dht.self
providers[c] = dht.self
t.Logf("announcing provider for %s", c)
if err := dht.Provide(ctx, c, true); err != nil {
@ -783,7 +783,7 @@ func TestProvidesMany(t *testing.T) {
getProvider := func(dht *IpfsDHT, k cid.Cid) {
defer wg.Done()
expected := providers[k.KeyString()]
expected := providers[k]
provchan := dht.FindProvidersAsync(ctxT, k, 1)
select {

10
providers/providers.go
View File

@ -92,7 +92,7 @@ func (pm *ProviderManager) providersForKey(k cid.Cid) ([]peer.ID, error) {
}
func (pm *ProviderManager) getProvSet(k cid.Cid) (*providerSet, error) {
cached, ok := pm.providers.Get(k.KeyString())
cached, ok := pm.providers.Get(k)
if ok {
return cached.(*providerSet), nil
}
@ -103,7 +103,7 @@ func (pm *ProviderManager) getProvSet(k cid.Cid) (*providerSet, error) {
}
if len(pset.providers) > 0 {
pm.providers.Add(k.KeyString(), pset)
pm.providers.Add(k, pset)
}
return pset, nil
@ -160,14 +160,14 @@ func readTimeValue(i interface{}) (time.Time, error) {
}
func (pm *ProviderManager) addProv(k cid.Cid, p peer.ID) error {
iprovs, ok := pm.providers.Get(k.KeyString())
iprovs, ok := pm.providers.Get(k)
if !ok {
stored, err := loadProvSet(pm.dstore, k)
if err != nil {
return err
}
iprovs = stored
pm.providers.Add(k.KeyString(), iprovs)
pm.providers.Add(k, iprovs)
}
provs := iprovs.(*providerSet)
now := time.Now()
@ -186,7 +186,7 @@ func writeProviderEntry(dstore ds.Datastore, k cid.Cid, p peer.ID, t time.Time)
}
func (pm *ProviderManager) deleteProvSet(k cid.Cid) error {
pm.providers.Remove(k.KeyString())
pm.providers.Remove(k)
res, err := pm.dstore.Query(dsq.Query{
KeysOnly: true,