From 7ae26218037cd3d540759421c59b9eac8cfa169b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Kripalani?= <raulk@apache.org>
Date: Tue, 11 Sep 2018 14:34:26 +0100
Subject: [PATCH] small fixes.

---
 pstoreds/addr_book.go | 15 ++++++++-------
 test/utils.go         | 10 +---------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/pstoreds/addr_book.go b/pstoreds/addr_book.go
index 8f2da2b..53c3006 100644
--- a/pstoreds/addr_book.go
+++ b/pstoreds/addr_book.go
@@ -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
 	}
 
diff --git a/test/utils.go b/test/utils.go
index 8b7a86a..6649820 100644
--- a/test/utils.go
+++ b/test/utils.go
@@ -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 {