mirror of
https://github.com/ipfs/kubo.git
synced 2025-09-09 19:32:24 +08:00
92d08db7a5
- updated go-ctxgroup and goprocess ctxgroup: AddChildGroup was changed to AddChild. Used in two files: - p2p/net/mock/mock_net.go - routing/dht/dht.go - updated context from hg repo to git prev. commit in hg was ad01a6fcc8a19d3a4478c836895ffe883bd2ceab. (context: make parentCancelCtx iterative) represents commit 84f8955a887232b6308d79c68b8db44f64df455c in git repo - updated context to master (b6fdb7d8a4ccefede406f8fe0f017fb58265054c) Aaron Jacobs (2): net/context: Don't accept a context in the DoSomethingSlow example. context: Be clear that users must cancel the result of WithCancel. Andrew Gerrand (1): go.net: use golang.org/x/... import paths Bryan C. Mills (1): net/context: Don't leak goroutines in Done example. Damien Neil (1): context: fix removal of cancelled timer contexts from parent David Symonds (2): context: Fix WithValue example code. net: add import comments. Sameer Ajmani (1): context: fix TestAllocs to account for ints in interfaces
41 lines
1.1 KiB
Go
41 lines
1.1 KiB
Go
package bitswap
|
|
|
|
import (
|
|
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
|
|
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
|
|
bsnet "github.com/jbenet/go-ipfs/exchange/bitswap/network"
|
|
mockpeernet "github.com/jbenet/go-ipfs/p2p/net/mock"
|
|
peer "github.com/jbenet/go-ipfs/p2p/peer"
|
|
mockrouting "github.com/jbenet/go-ipfs/routing/mock"
|
|
testutil "github.com/jbenet/go-ipfs/util/testutil"
|
|
)
|
|
|
|
type peernet struct {
|
|
mockpeernet.Mocknet
|
|
routingserver mockrouting.Server
|
|
}
|
|
|
|
func StreamNet(ctx context.Context, net mockpeernet.Mocknet, rs mockrouting.Server) (Network, error) {
|
|
return &peernet{net, rs}, nil
|
|
}
|
|
|
|
func (pn *peernet) Adapter(p testutil.Identity) bsnet.BitSwapNetwork {
|
|
client, err := pn.Mocknet.AddPeer(p.PrivateKey(), p.Address())
|
|
if err != nil {
|
|
panic(err.Error())
|
|
}
|
|
routing := pn.routingserver.ClientWithDatastore(context.TODO(), p, ds.NewMapDatastore())
|
|
return bsnet.NewFromIpfsHost(client, routing)
|
|
}
|
|
|
|
func (pn *peernet) HasPeer(p peer.ID) bool {
|
|
for _, member := range pn.Mocknet.Peers() {
|
|
if p == member {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
|
|
var _ Network = &peernet{}
|