Merge pull request #438 from jbenet/bitswap-rounds

Bitswap rounds
ipfs · Dec 18, 2014 · afd6680 · afd6680
2 parents 911b54e + 9fafec1
commit afd6680
Show file tree

Hide file tree

Showing 28 changed files with 1,001 additions and 652 deletions.
diff --git a/blocks/blockstore/blockstore.go b/blocks/blockstore/blockstore.go
@@ -6,14 +6,16 @@ import (
 	"errors"
 
 	ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
-
 	mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
+
 	blocks "github.com/jbenet/go-ipfs/blocks"
 	u "github.com/jbenet/go-ipfs/util"
 )
 
 var ValueTypeMismatch = errors.New("The retrieved value is not a Block")
 
+var ErrNotFound = errors.New("blockstore: block not found")
+
 // Blockstore wraps a ThreadSafeDatastore
 type Blockstore interface {
 	DeleteBlock(u.Key) error
@@ -34,6 +36,9 @@ type blockstore struct {
 
 func (bs *blockstore) Get(k u.Key) (*blocks.Block, error) {
 	maybeData, err := bs.datastore.Get(k.DsKey())
+	if err == ds.ErrNotFound {
+		return nil, ErrNotFound
+	}
 	if err != nil {
 		return nil, err
 	}

diff --git a/blockservice/blockservice.go b/blockservice/blockservice.go
@@ -8,8 +8,6 @@ import (
 	"fmt"
 
 	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
-	ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
-
 	blocks "github.com/jbenet/go-ipfs/blocks"
 	"github.com/jbenet/go-ipfs/blocks/blockstore"
 	exchange "github.com/jbenet/go-ipfs/exchange"
@@ -67,7 +65,7 @@ func (s *BlockService) GetBlock(ctx context.Context, k u.Key) (*blocks.Block, er
 		return block, nil
 		// TODO be careful checking ErrNotFound. If the underlying
 		// implementation changes, this will break.
-	} else if err == ds.ErrNotFound && s.Exchange != nil {
+	} else if err == blockstore.ErrNotFound && s.Exchange != nil {
 		log.Debug("Blockservice: Searching bitswap.")
 		blk, err := s.Exchange.GetBlock(ctx, k)
 		if err != nil {

diff --git a/epictest/addcat_test.go b/epictest/addcat_test.go
@@ -26,10 +26,6 @@ import (
 const kSeed = 1
 
 func Test100MBInstantaneous(t *testing.T) {
-	t.Log("a sanity check")
-
-	t.Parallel()
-
 	conf := Config{
 		NetworkLatency:    0,
 		RoutingLatency:    0,
@@ -41,43 +37,31 @@ func Test100MBInstantaneous(t *testing.T) {
 
 func TestDegenerateSlowBlockstore(t *testing.T) {
 	SkipUnlessEpic(t)
-	t.Parallel()
-
 	conf := Config{BlockstoreLatency: 50 * time.Millisecond}
-
 	if err := AddCatPowers(conf, 128); err != nil {
 		t.Fatal(err)
 	}
 }
 
 func TestDegenerateSlowNetwork(t *testing.T) {
 	SkipUnlessEpic(t)
-	t.Parallel()
-
 	conf := Config{NetworkLatency: 400 * time.Millisecond}
-
 	if err := AddCatPowers(conf, 128); err != nil {
 		t.Fatal(err)
 	}
 }
 
 func TestDegenerateSlowRouting(t *testing.T) {
 	SkipUnlessEpic(t)
-	t.Parallel()
-
 	conf := Config{RoutingLatency: 400 * time.Millisecond}
-
 	if err := AddCatPowers(conf, 128); err != nil {
 		t.Fatal(err)
 	}
 }
 
 func Test100MBMacbookCoastToCoast(t *testing.T) {
 	SkipUnlessEpic(t)
-	t.Parallel()
-
 	conf := Config{}.Network_NYtoSF().Blockstore_SlowSSD2014().Routing_Slow()
-
 	if err := AddCatBytes(RandomBytes(100*1024*1024), conf); err != nil {
 		t.Fatal(err)
 	}