Merge pull request #36 from libp2p/txn-err

Adapt peerstore for ds.NewTransaction() now returning error

.gx/lastpubver

@@ -1 +1 @@
-2.0.1: QmfAQMFpgDU2U4BXG64qVr8HSiictfWvkSBz7Y2oDj65st
+2.0.2: QmSJ36wcYQyEViJUWUEhJU81tw1KdakTKqLLHbvYbA9zDv

README.md

@@ -1,8 +1,8 @@
-# go-libp2p-peer
+# go-libp2p-peerstore
 [![](https://img.shields.io/badge/made%20by-Protocol%20Labs-blue.svg?style=flat-square)](http://ipn.io)
 [![](https://img.shields.io/badge/project-IPFS-blue.svg?style=flat-square)](http://ipfs.io/)
 [![](https://img.shields.io/badge/freenode-%23ipfs-blue.svg?style=flat-square)](http://webchat.freenode.net/?channels=%23ipfs)
-[![GoDoc](https://godoc.org/github.com/libp2p/go-libp2p-peer?status.svg)](https://godoc.org/github.com/libp2p/go-libp2p-peerstore)
+[![GoDoc](https://godoc.org/github.com/libp2p/go-libp2p-peerstore?status.svg)](https://godoc.org/github.com/libp2p/go-libp2p-peerstore)
 [![Coverage Status](https://coveralls.io/repos/github/libp2p/go-libp2p-peerstore/badge.svg?branch=master)](https://coveralls.io/github/libp2p/go-libp2p-peerstore?branch=master)
 [![Build Status](https://travis-ci.org/libp2p/go-libp2p-peerstore.svg?branch=master)](https://travis-ci.org/libp2p/go-libp2p-peerstore)
 
@@ -20,7 +20,7 @@ Check out the [GoDocs](https://godoc.org/github.com/libp2p/go-libp2p-peerstore).
 
 ## Contribute
 
-Feel free to join in. All welcome. Open an [issue](https://github.com/ipfs/go-libp2p-peer/issues)!
+Feel free to join in. All welcome. Open an [issue](https://github.com/ipfs/go-libp2p-peerstore/issues)!
 
 This repository falls under the IPFS [Code of Conduct](https://github.com/ipfs/community/blob/master/code-of-conduct.md).
 

package.json

@@ -57,14 +57,14 @@
     },
     {
       "author": "magik6k",
-      "hash": "QmaUU1Hu8pbR2NiTJ1NHVBcNTQR499AJVMkkAoRqhdxbgz",
+      "hash": "Qmd1Zxnuj9puWCPS7DV1YVw1RM478NqyZmf1X5nsgjp6fQ",
       "name": "go-ds-badger",
-      "version": "1.8.0"
+      "version": "1.9.0"
     },
     {
-      "hash": "QmUyz7JTJzgegC6tiJrfby3mPhzcdswVtG4x58TQ6pq8jV",
+      "hash": "QmbQshXLNcCPRUGZv4sBGxnZNAHREA6MKeomkwihNXPZWP",
       "name": "go-datastore",
-      "version": "3.2.0"
+      "version": "3.3.0"
     },
     {
       "hash": "QmQjMHF8ptRgx4E57UFMiT4YM6kqaJeYxZ1MCDX23aw4rK",
@@ -77,6 +77,6 @@
   "license": "MIT",
   "name": "go-libp2p-peerstore",
   "releaseCmd": "git commit -a -m \"gx publish $VERSION\"",
-  "version": "2.0.1"
+  "version": "2.0.2"
 }
 

pstoreds/addr_book.go

@@ -213,7 +213,10 @@ func (mgr *dsAddrBook) dbInsert(keys []ds.Key, addrs []ma.Multiaddr, ttl time.Du
 		exp     = time.Now().Add(ttl)
 	)
 
-	txn := mgr.ds.NewTransaction(false)
+	txn, err := mgr.ds.NewTransaction(false)
+	if err != nil {
+		return nil, err
+	}
 	defer txn.Discard()
 
 	ttltxn := txn.(ds.TTLDatastore)
@@ -290,7 +293,10 @@ func (mgr *dsAddrBook) dbUpdateTTL(p peer.ID, oldTTL time.Duration, newTTL time.
 		err     error
 	)
 
-	txn := mgr.ds.NewTransaction(false)
+	txn, err := mgr.ds.NewTransaction(false)
+	if err != nil {
+		return err
+	}
 	defer txn.Discard()
 
 	if results, err = txn.Query(q); err != nil {
@@ -342,7 +348,10 @@ func (mgr *dsAddrBook) Addrs(p peer.ID) []ma.Multiaddr {
 		}
 	}
 
-	txn := mgr.ds.NewTransaction(true)
+	txn, err := mgr.ds.NewTransaction(true)
+	if err != nil {
+		return nil
+	}
 	defer txn.Discard()
 
 	if results, err = txn.Query(q); err != nil {
@@ -382,7 +391,11 @@ func (mgr *dsAddrBook) PeersWithAddrs() peer.IDSlice {
 		err     error
 	)
 
-	txn := mgr.ds.NewTransaction(true)
+	txn, err := mgr.ds.NewTransaction(true)
+	if err != nil {
+		log.Error(err)
+		return peer.IDSlice{}
+	}
 	defer txn.Discard()
 
 	if results, err = txn.Query(q); err != nil {
@@ -456,7 +469,10 @@ func (mgr *dsAddrBook) ClearAddrs(p peer.ID) {
 func (mgr *dsAddrBook) dbDelete(keys []ds.Key) error {
 	var err error
 
-	txn := mgr.ds.NewTransaction(false)
+	txn, err := mgr.ds.NewTransaction(false)
+	if err != nil {
+		return err
+	}
 	defer txn.Discard()
 
 	for _, key := range keys {
@@ -479,7 +495,10 @@ func (mgr *dsAddrBook) dbDelete(keys []ds.Key) error {
 func (mgr *dsAddrBook) dbDeleteIter(prefix ds.Key) error {
 	q := query.Query{Prefix: prefix.String(), KeysOnly: true}
 
-	txn := mgr.ds.NewTransaction(false)
+	txn, err := mgr.ds.NewTransaction(false)
+	if err != nil {
+		return err
+	}
 	defer txn.Discard()
 
 	results, err := txn.Query(q)

pstoreds/ds_test.go

@@ -23,7 +23,7 @@ func BenchmarkBaselineBadgerDatastorePutEntry(b *testing.B) {
 
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		txn := bds.NewTransaction(false)
+		txn, _ := bds.NewTransaction(false)
 
 		key := ds.RawKey(fmt.Sprintf("/key/%d", i))
 		txn.Put(key, []byte(fmt.Sprintf("/value/%d", i)))
@@ -37,7 +37,7 @@ func BenchmarkBaselineBadgerDatastoreGetEntry(b *testing.B) {
 	bds, closer := badgerStore(b)
 	defer closer()
 
-	txn := bds.NewTransaction(false)
+	txn, _ := bds.NewTransaction(false)
 	keys := make([]ds.Key, 1000)
 	for i := 0; i < 1000; i++ {
 		key := ds.RawKey(fmt.Sprintf("/key/%d", i))
@@ -50,7 +50,7 @@ func BenchmarkBaselineBadgerDatastoreGetEntry(b *testing.B) {
 
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		txn := bds.NewTransaction(true)
+		txn, _ := bds.NewTransaction(true)
 		if _, err := txn.Get(keys[i%1000]); err != nil {
 			b.Fatal(err)
 		}