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

remove unnecessary return values.

Browse Source
This commit is contained in:
Raúl Kripalani 2018-09-14 15:21:53 +01:00
parent 7976022e14
commit 3a4d8096cf
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pstoreds/addr_book.go
View File

@ -424,8 +424,7 @@ func (mgr *dsAddrBook) ClearAddrs(p peer.ID) {
} }
} else { } else {
deleteFn = func() error { deleteFn = func() error {
_, err := mgr.dbDeleteIter(prefix) return mgr.dbDeleteIter(prefix)
return err
} }
} }
@ -466,7 +465,7 @@ func (mgr *dsAddrBook) dbDelete(keys []ds.Key) error {
// dbDeleteIter 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 // it returns a slice of the removed keys in case it's needed
func (mgr *dsAddrBook) dbDeleteIter(prefix ds.Key) ([]ds.Key, error) { func (mgr *dsAddrBook) dbDeleteIter(prefix ds.Key) error {
q := query.Query{Prefix: prefix.String(), KeysOnly: true} q := query.Query{Prefix: prefix.String(), KeysOnly: true}
txn := mgr.ds.NewTransaction(false) txn := mgr.ds.NewTransaction(false)
@ -475,7 +474,7 @@ func (mgr *dsAddrBook) dbDeleteIter(prefix ds.Key) ([]ds.Key, error) {
results, err := txn.Query(q) results, err := txn.Query(q)
if err != nil { if err != nil {
log.Errorf("failed to fetch all keys prefixed with: %s, cause: %v", prefix.String(), err) log.Errorf("failed to fetch all keys prefixed with: %s, cause: %v", prefix.String(), err)
return nil, err return err
} }
var keys = make([]ds.Key, 0, 4) // cap: 4 to reduce allocs var keys = make([]ds.Key, 0, 4) // cap: 4 to reduce allocs
@ -486,19 +485,19 @@ func (mgr *dsAddrBook) dbDeleteIter(prefix ds.Key) ([]ds.Key, error) {
if err = txn.Delete(key); err != nil { if err = txn.Delete(key); err != nil {
log.Errorf("failed to delete key: %s, cause: %v", key.String(), err) log.Errorf("failed to delete key: %s, cause: %v", key.String(), err)
return nil, err return err
} }
} }
if err = results.Close(); err != nil { if err = results.Close(); err != nil {
log.Errorf("failed to close cursor, cause: %v", err) log.Errorf("failed to close cursor, cause: %v", err)
return nil, err return err
} }
if err = txn.Commit(); err != nil { if err = txn.Commit(); err != nil {
log.Errorf("failed to commit transaction when deleting keys, cause: %v", err) log.Errorf("failed to commit transaction when deleting keys, cause: %v", err)
return nil, err return err
} }
return keys, nil return nil
} }