opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-30 01:52:26 +08:00
Code Issues Projects Releases Wiki Activity

fix(bitswap) keep interface the same

Browse Source 
changing the bitswap interace breaks tests and makes things a bit
difficult going forward. I think I have a temporary solution to replace
the async method.

this commit partially reverts changes from:

ec50703395098f75946f0bad01816cc54ab18a58

ec50703395
This commit is contained in:
Brian Tiger Chow
2014-09-21 22:00:43 -07:00
parent 2179b5d77b
commit 39ad222da9
2 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
exchange/bitswap/bitswap.go
View File

@ -2,7 +2,6 @@ package bitswap
import ( import (
"errors" "errors"
"fmt"
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" 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/datastore.go" ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go"
@ -66,17 +65,13 @@ func (bs *bitswap) Block(parent context.Context, k u.Key) (*blocks.Block, error)
// TODO add to wantlist // TODO add to wantlist
promise := bs.notifications.Subscribe(ctx, k) promise := bs.notifications.Subscribe(ctx, k)
// const maxProviders = 20 const maxProviders = 20
// using non-async version for now. peersToQuery := bs.routing.FindProvidersAsync(ctx, k, maxProviders)
peersToQuery, err := bs.routing.FindProviders(ctx, k)
if err != nil {
return nil, fmt.Errorf("No providers found for %d (%v)", k, err)
}
go func() { go func() {
message := bsmsg.New() message := bsmsg.New()
message.AppendWanted(k) message.AppendWanted(k)
for _, iiiii := range peersToQuery { for iiiii := range peersToQuery {
// u.DOut("bitswap got peersToQuery: %s\n", iiiii) // u.DOut("bitswap got peersToQuery: %s\n", iiiii)
go func(p *peer.Peer) { go func(p *peer.Peer) {
response, err := bs.sender.SendRequest(ctx, p, message) response, err := bs.sender.SendRequest(ctx, p, message)

6
exchange/bitswap/network/interface.go
View File

@ -46,11 +46,7 @@ type NetMessageService interface {
// TODO rename -> Router? // TODO rename -> Router?
type Routing interface { type Routing interface {
// FindProvidersAsync returns a channel of providers for the given key // FindProvidersAsync returns a channel of providers for the given key
// FindProvidersAsync(context.Context, u.Key, int) <-chan *peer.Peer FindProvidersAsync(context.Context, u.Key, int) <-chan *peer.Peer
// ^--- removed this for now because has some bugs apparently.
// FindProviders returns the providers for the given key
FindProviders(context.Context, u.Key) ([]*peer.Peer, error)
// Provide provides the key to the network // Provide provides the key to the network
Provide(context.Context, u.Key) error Provide(context.Context, u.Key) error