Commit 725c73e3 authored by Jeromy's avatar Jeromy

using multistream muxer

* ID service stream
* make the relay service use msmux
* fix nc tests

Note from jbenet: Maybe we should remove the old protocol/muxer
and see what breaks. It shouldn't be used by anything now.

License: MIT
Signed-off-by: default avatarJeromy <jeromyj@gmail.com>
Signed-off-by: default avatarJuan Batiz-Benet <juan@benet.ai>
parent 49637f63
...@@ -5,6 +5,7 @@ package pin ...@@ -5,6 +5,7 @@ package pin
import ( import (
"fmt" "fmt"
"sync" "sync"
"time"
ds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" ds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context" context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
...@@ -242,7 +243,9 @@ func LoadPinner(d ds.ThreadSafeDatastore, dserv mdag.DAGService) (Pinner, error) ...@@ -242,7 +243,9 @@ func LoadPinner(d ds.ThreadSafeDatastore, dserv mdag.DAGService) (Pinner, error)
rootKey := key.Key(rootKeyBytes) rootKey := key.Key(rootKeyBytes)
ctx := context.TODO() ctx, cancel := context.WithTimeout(context.TODO(), time.Second*5)
defer cancel()
root, err := dserv.Get(ctx, rootKey) root, err := dserv.Get(ctx, rootKey)
if err != nil { if err != nil {
return nil, fmt.Errorf("cannot find pinning root object: %v", err) return nil, fmt.Errorf("cannot find pinning root object: %v", err)
......
...@@ -6,12 +6,12 @@ import ( ...@@ -6,12 +6,12 @@ import (
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore" "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
dssync "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync" dssync "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
"github.com/ipfs/go-ipfs/blocks/blockstore" "github.com/ipfs/go-ipfs/blocks/blockstore"
"github.com/ipfs/go-ipfs/blocks/key" "github.com/ipfs/go-ipfs/blocks/key"
"github.com/ipfs/go-ipfs/blockservice" "github.com/ipfs/go-ipfs/blockservice"
"github.com/ipfs/go-ipfs/exchange/offline" "github.com/ipfs/go-ipfs/exchange/offline"
"github.com/ipfs/go-ipfs/merkledag" "github.com/ipfs/go-ipfs/merkledag"
"golang.org/x/net/context"
) )
func ignoreKeys(key.Key) {} func ignoreKeys(key.Key) {}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment