libp2p/go-libp2p-peerstore
1
0
Fork 0
mirror of https://github.com/libp2p/go-libp2p-peerstore.git synced 2024-12-27 23:40:16 +08:00
Code Issues Projects Releases Wiki Activity

small fixes.

Browse Source
This commit is contained in:
Raúl Kripalani 2018-09-11 14:34:26 +01:00
parent eb2575505d
commit 7ae2621803
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pstoreds/addr_book.go
View File

@ -294,10 +294,11 @@ func (mgr *dsAddrBook) PeersWithAddrs() peer.IDSlice {
return peer.IDSlice{}
}
ids := make(peer.IDSlice, 0, len(idset))
ids, i := make(peer.IDSlice, len(idset)), 0
for id := range idset {
i, _ := peer.IDB58Decode(id)
ids = append(ids, i)
pid, _ := peer.IDB58Decode(id)
ids[i] = pid
i++
}
return ids
}
@ -326,7 +327,7 @@ func (mgr *dsAddrBook) ClearAddrs(p peer.ID) {
}
} else {
deleteFn = func() error {
_, err := mgr.dbClearIterator(prefix)
_, err := mgr.dbDeleteIter(prefix)
return err
}
}
@ -367,9 +368,9 @@ func (mgr *dsAddrBook) dbDelete(keys []ds.Key) error {
return nil
}
// dbClearIterator removes all entries whose keys are prefixed with the argument.
// dbDeleteIter removes all entries whose keys are prefixed with the argument.
// it returns a slice of the removed keys in case it's needed
func (mgr *dsAddrBook) dbClearIterator(prefix ds.Key) ([]ds.Key, error) {
func (mgr *dsAddrBook) dbDeleteIter(prefix ds.Key) ([]ds.Key, error) {
q := query.Query{Prefix: prefix.String(), KeysOnly: true}
txn := mgr.ds.NewTransaction(false)
@ -393,7 +394,7 @@ func (mgr *dsAddrBook) dbClearIterator(prefix ds.Key) ([]ds.Key, error) {
}
if err := results.Close(); err != nil {
log.Errorf("failed to close cursor: %s, cause: %v", err)
log.Errorf("failed to close cursor, cause: %v", err)
return nil, err
}

10
test/utils.go
View File

@ -5,19 +5,11 @@ import (
"fmt"
"testing"
"github.com/libp2p/go-libp2p-peer"
peer "github.com/libp2p/go-libp2p-peer"
pt "github.com/libp2p/go-libp2p-peer/test"
ma "github.com/multiformats/go-multiaddr"
)
func peerId(ids string) peer.ID {
id, err := peer.IDB58Decode(ids)
if err != nil {
panic(err)
}
return id
}
func multiaddr(m string) ma.Multiaddr {
maddr, err := ma.NewMultiaddr(m)
if err != nil {