mirror of
https://github.com/ipfs/kubo.git
synced 2026-02-28 13:57:52 +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
39 lines
1.1 KiB
Go
39 lines
1.1 KiB
Go
package mockrouting
|
|
|
|
import (
|
|
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
|
|
sync "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"
|
|
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
|
|
mocknet "github.com/jbenet/go-ipfs/p2p/net/mock"
|
|
dht "github.com/jbenet/go-ipfs/routing/dht"
|
|
"github.com/jbenet/go-ipfs/util/testutil"
|
|
)
|
|
|
|
type mocknetserver struct {
|
|
mn mocknet.Mocknet
|
|
}
|
|
|
|
func NewDHTNetwork(mn mocknet.Mocknet) Server {
|
|
return &mocknetserver{
|
|
mn: mn,
|
|
}
|
|
}
|
|
|
|
func (rs *mocknetserver) Client(p testutil.Identity) Client {
|
|
return rs.ClientWithDatastore(context.TODO(), p, ds.NewMapDatastore())
|
|
}
|
|
|
|
func (rs *mocknetserver) ClientWithDatastore(ctx context.Context, p testutil.Identity, ds ds.Datastore) Client {
|
|
|
|
// FIXME AddPeer doesn't appear to be idempotent
|
|
|
|
host, err := rs.mn.AddPeer(p.PrivateKey(), p.Address())
|
|
if err != nil {
|
|
panic("FIXME")
|
|
// return nil, debugerror.Wrap(err)
|
|
}
|
|
return dht.NewDHT(ctx, host, sync.MutexWrap(ds))
|
|
}
|
|
|
|
var _ Server = &mocknetserver{}
|