Use gx vendored go-ipfs-utils where possible
For the rest of the packages in util, move them to thirdparty and update the references. util is gone! License: MIT Signed-off-by: Jeromy <jeromyj@gmail.com>
Jeromy committed
Feb 9, 2016 at 10:56 UTC
d7dab3afea5f67b941b0be9e2a4ced3672d610c9
131 files changed
+130
-555
Godeps/_workspace/src/github.com/jbenet/go-multiaddr/codec.go
+1
-1
@@ -8,7 +8,7 @@ import (
8
"strconv"
9
"strings"
10
11
- mh "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
11
+ mh "gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash"
12
)
13
14
func stringToBytes(s string) ([]byte, error) {
Godeps/_workspace/src/github.com/jbenet/go-multihash/multihash/main.go
+2
-2
@@ -6,8 +6,8 @@ import (
6
"io"
7
"os"
8
9
- mh "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
10
- mhopts "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash/opts"
9
+ mh "gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash"
10
+ mhopts "gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash/opts"
11
)
12
13
var usage = `usage: %s [options] [FILE]
Godeps/_workspace/src/github.com/jbenet/go-multihash/opts/coding.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
"fmt"
7
8
base58 "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-base58"
9
- mh "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
9
+ mh "gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash"
10
)
11
12
func Decode(encoding, digest string) (mh.Multihash, error) {
Godeps/_workspace/src/github.com/jbenet/go-multihash/opts/opts.go
+1
-1
@@ -11,7 +11,7 @@ import (
11
"io/ioutil"
12
"strings"
13
14
- mh "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
14
+ mh "gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash"
15
)
16
17
// package errors
blocks/blocks.go
+2
-2
@@ -6,9 +6,9 @@ import (
6
"errors"
7
"fmt"
8
9
- mh "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
9
key "github.com/ipfs/go-ipfs/blocks/key"
11
- u "github.com/ipfs/go-ipfs/util"
10
+ mh "gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash"
11
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
12
)
13
14
// Block is a singular block of data in ipfs
blocks/blockstore/blockstore.go
+1
-1
@@ -10,9 +10,9 @@ import (
10
ds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore"
11
dsns "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore/namespace"
12
dsq "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore/query"
13
- mh "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
13
blocks "github.com/ipfs/go-ipfs/blocks"
14
key "github.com/ipfs/go-ipfs/blocks/key"
15
+ mh "gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash"
16
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
17
logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
18
)
blocks/key/key.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
7
ds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore"
8
b58 "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-base58"
9
- mh "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
9
+ mh "gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash"
10
)
11
12
// Key is a string representation of multihash for use with maps.
blocks/key/key_test.go
+1
-1
@@ -4,7 +4,7 @@ import (
4
"bytes"
5
"testing"
6
7
- mh "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
7
+ mh "gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash"
8
)
9
10
func TestKey(t *testing.T) {
blockservice/test/blocks_test.go
+1
-1
@@ -13,7 +13,7 @@ import (
13
key "github.com/ipfs/go-ipfs/blocks/key"
14
. "github.com/ipfs/go-ipfs/blockservice"
15
offline "github.com/ipfs/go-ipfs/exchange/offline"
16
- u "github.com/ipfs/go-ipfs/util"
16
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
17
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
18
)
19
cmd/ipfs/daemon.go
+1
-1
@@ -23,7 +23,7 @@ import (
23
"github.com/ipfs/go-ipfs/core/corerouting"
24
nodeMount "github.com/ipfs/go-ipfs/fuse/node"
25
fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
26
- util "github.com/ipfs/go-ipfs/util"
26
+ util "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
27
conn "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/net/conn"
28
peer "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/peer"
29
)
cmd/ipfs/main.go
+1
-1
@@ -28,7 +28,7 @@ import (
28
repo "github.com/ipfs/go-ipfs/repo"
29
config "github.com/ipfs/go-ipfs/repo/config"
30
fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
31
- u "github.com/ipfs/go-ipfs/util"
31
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
32
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
33
logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
34
)
commands/cli/parse.go
+1
-1
@@ -12,7 +12,7 @@ import (
12
13
cmds "github.com/ipfs/go-ipfs/commands"
14
files "github.com/ipfs/go-ipfs/commands/files"
15
- u "github.com/ipfs/go-ipfs/util"
15
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
16
)
17
18
// Parse parses the input commandline string (cmd, flags, and args).
commands/option.go
+1
-1
@@ -3,7 +3,7 @@ package commands
3
import (
4
"reflect"
5
6
- "github.com/ipfs/go-ipfs/util"
6
+ "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
7
)
8
9
// Types of Command options
commands/request.go
+1
-1
@@ -12,7 +12,7 @@ import (
12
"github.com/ipfs/go-ipfs/commands/files"
13
"github.com/ipfs/go-ipfs/core"
14
"github.com/ipfs/go-ipfs/repo/config"
15
- u "github.com/ipfs/go-ipfs/util"
15
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
16
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
17
)
18
core/bootstrap.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
"time"
10
11
config "github.com/ipfs/go-ipfs/repo/config"
12
+ lgbl "github.com/ipfs/go-ipfs/thirdparty/loggables"
13
math2 "github.com/ipfs/go-ipfs/thirdparty/math2"
13
- lgbl "github.com/ipfs/go-ipfs/util/eventlog/loggables"
14
host "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/host"
15
inet "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/net"
16
peer "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/peer"
core/bootstrap_test.go
+1
-1
@@ -5,7 +5,7 @@ import (
5
"testing"
6
7
config "github.com/ipfs/go-ipfs/repo/config"
8
- testutil "github.com/ipfs/go-ipfs/util/testutil"
8
+ testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
9
peer "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/peer"
10
)
11
core/commands/add.go
+1
-1
@@ -10,7 +10,7 @@ import (
10
cmds "github.com/ipfs/go-ipfs/commands"
11
files "github.com/ipfs/go-ipfs/commands/files"
12
core "github.com/ipfs/go-ipfs/core"
13
- u "github.com/ipfs/go-ipfs/util"
13
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
14
)
15
16
// Error indicating the max depth has been exceded.
core/commands/bitswap.go
+1
-1
@@ -10,7 +10,7 @@ import (
10
key "github.com/ipfs/go-ipfs/blocks/key"
11
cmds "github.com/ipfs/go-ipfs/commands"
12
bitswap "github.com/ipfs/go-ipfs/exchange/bitswap"
13
- u "github.com/ipfs/go-ipfs/util"
13
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
14
peer "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/peer"
15
)
16
core/commands/block.go
+2
-2
@@ -8,11 +8,11 @@ import (
8
"io/ioutil"
9
"strings"
10
11
- mh "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
11
+ mh "gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash"
12
"github.com/ipfs/go-ipfs/blocks"
13
key "github.com/ipfs/go-ipfs/blocks/key"
14
cmds "github.com/ipfs/go-ipfs/commands"
15
- u "github.com/ipfs/go-ipfs/util"
15
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
16
)
17
18
type BlockStat struct {
core/commands/bootstrap.go
+1
-1
@@ -10,7 +10,7 @@ import (
10
repo "github.com/ipfs/go-ipfs/repo"
11
config "github.com/ipfs/go-ipfs/repo/config"
12
"github.com/ipfs/go-ipfs/repo/fsrepo"
13
- u "github.com/ipfs/go-ipfs/util"
13
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
14
)
15
16
type BootstrapOutput struct {
core/commands/config.go
+1
-1
@@ -14,7 +14,7 @@ import (
14
repo "github.com/ipfs/go-ipfs/repo"
15
config "github.com/ipfs/go-ipfs/repo/config"
16
fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
17
- u "github.com/ipfs/go-ipfs/util"
17
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
18
)
19
20
type ConfigField struct {
core/commands/dht.go
+1
-1
@@ -12,7 +12,7 @@ import (
12
notif "github.com/ipfs/go-ipfs/notifications"
13
path "github.com/ipfs/go-ipfs/path"
14
ipdht "github.com/ipfs/go-ipfs/routing/dht"
15
- u "github.com/ipfs/go-ipfs/util"
15
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
16
peer "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/peer"
17
)
18
core/commands/dns.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
7
cmds "github.com/ipfs/go-ipfs/commands"
8
namesys "github.com/ipfs/go-ipfs/namesys"
9
- util "github.com/ipfs/go-ipfs/util"
9
+ util "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
10
)
11
12
var DNSCmd = &cmds.Command{
core/commands/id.go
+1
-1
@@ -13,7 +13,7 @@ import (
13
cmds "github.com/ipfs/go-ipfs/commands"
14
core "github.com/ipfs/go-ipfs/core"
15
kb "github.com/ipfs/go-ipfs/routing/kbucket"
16
- u "github.com/ipfs/go-ipfs/util"
16
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
17
ic "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/crypto"
18
"gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/peer"
19
identify "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/protocol/identify"
core/commands/ipns.go
+1
-1
@@ -8,7 +8,7 @@ import (
8
cmds "github.com/ipfs/go-ipfs/commands"
9
namesys "github.com/ipfs/go-ipfs/namesys"
10
offline "github.com/ipfs/go-ipfs/routing/offline"
11
- u "github.com/ipfs/go-ipfs/util"
11
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
12
)
13
14
var IpnsCmd = &cmds.Command{
core/commands/object/object.go
+1
-1
@@ -11,7 +11,7 @@ import (
11
"strings"
12
"text/tabwriter"
13
14
- mh "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
14
+ mh "gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash"
15
16
cmds "github.com/ipfs/go-ipfs/commands"
17
core "github.com/ipfs/go-ipfs/core"
core/commands/object/patch.go
+1
-1
@@ -12,7 +12,7 @@ import (
12
dagutils "github.com/ipfs/go-ipfs/merkledag/utils"
13
path "github.com/ipfs/go-ipfs/path"
14
ft "github.com/ipfs/go-ipfs/unixfs"
15
- u "github.com/ipfs/go-ipfs/util"
15
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
16
)
17
18
var ObjectPatchCmd = &cmds.Command{
core/commands/pin.go
+1
-1
@@ -11,7 +11,7 @@ import (
11
corerepo "github.com/ipfs/go-ipfs/core/corerepo"
12
dag "github.com/ipfs/go-ipfs/merkledag"
13
path "github.com/ipfs/go-ipfs/path"
14
- u "github.com/ipfs/go-ipfs/util"
14
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
15
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
16
)
17
core/commands/ping.go
+1
-1
@@ -10,7 +10,7 @@ import (
10
11
cmds "github.com/ipfs/go-ipfs/commands"
12
core "github.com/ipfs/go-ipfs/core"
13
- u "github.com/ipfs/go-ipfs/util"
13
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
14
peer "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/peer"
15
16
ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
core/commands/refs.go
+1
-1
@@ -12,7 +12,7 @@ import (
12
"github.com/ipfs/go-ipfs/core"
13
dag "github.com/ipfs/go-ipfs/merkledag"
14
path "github.com/ipfs/go-ipfs/path"
15
- u "github.com/ipfs/go-ipfs/util"
15
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
16
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
17
)
18
core/commands/repo.go
+1
-1
@@ -7,7 +7,7 @@ import (
7
8
cmds "github.com/ipfs/go-ipfs/commands"
9
corerepo "github.com/ipfs/go-ipfs/core/corerepo"
10
- u "github.com/ipfs/go-ipfs/util"
10
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
11
)
12
13
var RepoCmd = &cmds.Command{
core/commands/resolve.go
+1
-1
@@ -7,7 +7,7 @@ import (
7
cmds "github.com/ipfs/go-ipfs/commands"
8
"github.com/ipfs/go-ipfs/core"
9
path "github.com/ipfs/go-ipfs/path"
10
- u "github.com/ipfs/go-ipfs/util"
10
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
11
)
12
13
type ResolvedPath struct {
core/commands/stat.go
+1
-1
@@ -10,7 +10,7 @@ import (
10
humanize "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/dustin/go-humanize"
11
12
cmds "github.com/ipfs/go-ipfs/commands"
13
- u "github.com/ipfs/go-ipfs/util"
13
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
14
metrics "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/metrics"
15
peer "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/peer"
16
protocol "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/protocol"
core/commands/swarm.go
+1
-1
@@ -9,7 +9,7 @@ import (
9
"sort"
10
11
cmds "github.com/ipfs/go-ipfs/commands"
12
- iaddr "github.com/ipfs/go-ipfs/util/ipfsaddr"
12
+ iaddr "github.com/ipfs/go-ipfs/thirdparty/ipfsaddr"
13
swarm "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/net/swarm"
14
peer "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/peer"
15
core/core.go
+1
-1
@@ -58,7 +58,7 @@ import (
58
repo "github.com/ipfs/go-ipfs/repo"
59
config "github.com/ipfs/go-ipfs/repo/config"
60
uio "github.com/ipfs/go-ipfs/unixfs/io"
61
- u "github.com/ipfs/go-ipfs/util"
61
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
62
)
63
64
const IpnsValidatorTag = "ipns"
core/core_test.go
+1
-1
@@ -5,7 +5,7 @@ import (
5
6
"github.com/ipfs/go-ipfs/repo"
7
config "github.com/ipfs/go-ipfs/repo/config"
8
- "github.com/ipfs/go-ipfs/util/testutil"
8
+ "github.com/ipfs/go-ipfs/thirdparty/testutil"
9
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
10
)
11
core/corehttp/gateway_test.go
+1
-1
@@ -15,7 +15,7 @@ import (
15
path "github.com/ipfs/go-ipfs/path"
16
repo "github.com/ipfs/go-ipfs/repo"
17
config "github.com/ipfs/go-ipfs/repo/config"
18
- testutil "github.com/ipfs/go-ipfs/util/testutil"
18
+ testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
19
ci "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/crypto"
20
id "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/protocol/identify"
21
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
core/coreunix/add_test.go
+1
-1
@@ -14,7 +14,7 @@ import (
14
"github.com/ipfs/go-ipfs/pin/gc"
15
"github.com/ipfs/go-ipfs/repo"
16
"github.com/ipfs/go-ipfs/repo/config"
17
- "github.com/ipfs/go-ipfs/util/testutil"
17
+ "github.com/ipfs/go-ipfs/thirdparty/testutil"
18
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
19
)
20
core/coreunix/metadata_test.go
+1
-1
@@ -19,7 +19,7 @@ import (
19
merkledag "github.com/ipfs/go-ipfs/merkledag"
20
ft "github.com/ipfs/go-ipfs/unixfs"
21
uio "github.com/ipfs/go-ipfs/unixfs/io"
22
- u "github.com/ipfs/go-ipfs/util"
22
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
23
)
24
25
func getDagserv(t *testing.T) merkledag.DAGService {
core/mock/mock.go
+2
-2
@@ -11,8 +11,8 @@ import (
11
core "github.com/ipfs/go-ipfs/core"
12
"github.com/ipfs/go-ipfs/repo"
13
config "github.com/ipfs/go-ipfs/repo/config"
14
- ds2 "github.com/ipfs/go-ipfs/util/datastore2"
15
- testutil "github.com/ipfs/go-ipfs/util/testutil"
14
+ ds2 "github.com/ipfs/go-ipfs/thirdparty/datastore2"
15
+ testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
16
host "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/host"
17
metrics "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/metrics"
18
mocknet "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/net/mock"
exchange/bitswap/bitswap_test.go
+1
-1
@@ -7,7 +7,7 @@ import (
7
"time"
8
9
detectrace "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-detect-race"
10
- travis "github.com/ipfs/go-ipfs/util/testutil/ci/travis"
10
+ travis "github.com/ipfs/go-ipfs/thirdparty/testutil/ci/travis"
11
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
12
13
blocks "github.com/ipfs/go-ipfs/blocks"
exchange/bitswap/decision/bench_test.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
7
key "github.com/ipfs/go-ipfs/blocks/key"
8
"github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
9
- "github.com/ipfs/go-ipfs/util/testutil"
9
+ "github.com/ipfs/go-ipfs/thirdparty/testutil"
10
"gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/peer"
11
)
12
exchange/bitswap/decision/engine_test.go
+1
-1
@@ -13,7 +13,7 @@ import (
13
blocks "github.com/ipfs/go-ipfs/blocks"
14
blockstore "github.com/ipfs/go-ipfs/blocks/blockstore"
15
message "github.com/ipfs/go-ipfs/exchange/bitswap/message"
16
- testutil "github.com/ipfs/go-ipfs/util/testutil"
16
+ testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
17
peer "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/peer"
18
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
19
)
exchange/bitswap/decision/peer_request_queue_test.go
+1
-1
@@ -9,7 +9,7 @@ import (
9
10
key "github.com/ipfs/go-ipfs/blocks/key"
11
"github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
12
- "github.com/ipfs/go-ipfs/util/testutil"
12
+ "github.com/ipfs/go-ipfs/thirdparty/testutil"
13
)
14
15
func TestPushPop(t *testing.T) {
exchange/bitswap/testnet/interface.go
+1
-1
@@ -2,7 +2,7 @@ package bitswap
2
3
import (
4
bsnet "github.com/ipfs/go-ipfs/exchange/bitswap/network"
5
- "github.com/ipfs/go-ipfs/util/testutil"
5
+ "github.com/ipfs/go-ipfs/thirdparty/testutil"
6
peer "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/peer"
7
)
8
exchange/bitswap/testnet/network_test.go
+1
-1
@@ -9,7 +9,7 @@ import (
9
bsnet "github.com/ipfs/go-ipfs/exchange/bitswap/network"
10
mockrouting "github.com/ipfs/go-ipfs/routing/mock"
11
delay "github.com/ipfs/go-ipfs/thirdparty/delay"
12
- testutil "github.com/ipfs/go-ipfs/util/testutil"
12
+ testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
13
peer "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/peer"
14
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
15
)
exchange/bitswap/testnet/peernet.go
+1
-1
@@ -4,7 +4,7 @@ import (
4
ds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore"
5
bsnet "github.com/ipfs/go-ipfs/exchange/bitswap/network"
6
mockrouting "github.com/ipfs/go-ipfs/routing/mock"
7
- testutil "github.com/ipfs/go-ipfs/util/testutil"
7
+ testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
8
mockpeernet "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/net/mock"
9
peer "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/peer"
10
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
exchange/bitswap/testnet/virtual.go
+1
-1
@@ -9,7 +9,7 @@ import (
9
routing "github.com/ipfs/go-ipfs/routing"
10
mockrouting "github.com/ipfs/go-ipfs/routing/mock"
11
delay "github.com/ipfs/go-ipfs/thirdparty/delay"
12
- testutil "github.com/ipfs/go-ipfs/util/testutil"
12
+ testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
13
peer "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/peer"
14
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
15
)
exchange/bitswap/testutils.go
+2
-2
@@ -7,9 +7,9 @@ import (
7
ds_sync "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore/sync"
8
blockstore "github.com/ipfs/go-ipfs/blocks/blockstore"
9
tn "github.com/ipfs/go-ipfs/exchange/bitswap/testnet"
10
+ datastore2 "github.com/ipfs/go-ipfs/thirdparty/datastore2"
11
delay "github.com/ipfs/go-ipfs/thirdparty/delay"
11
- datastore2 "github.com/ipfs/go-ipfs/util/datastore2"
12
- testutil "github.com/ipfs/go-ipfs/util/testutil"
12
+ testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
13
peer "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/peer"
14
p2ptestutil "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/test/util"
15
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
exchange/reprovide/reprovide_test.go
+1
-1
@@ -8,7 +8,7 @@ import (
8
blocks "github.com/ipfs/go-ipfs/blocks"
9
blockstore "github.com/ipfs/go-ipfs/blocks/blockstore"
10
mock "github.com/ipfs/go-ipfs/routing/mock"
11
- testutil "github.com/ipfs/go-ipfs/util/testutil"
11
+ testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
12
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
13
14
. "github.com/ipfs/go-ipfs/exchange/reprovide"
fuse/ipns/ipns_test.go
+2
-2
@@ -17,8 +17,8 @@ import (
17
core "github.com/ipfs/go-ipfs/core"
18
namesys "github.com/ipfs/go-ipfs/namesys"
19
offroute "github.com/ipfs/go-ipfs/routing/offline"
20
- u "github.com/ipfs/go-ipfs/util"
21
- ci "github.com/ipfs/go-ipfs/util/testutil/ci"
20
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
21
+ ci "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util/testutil/ci"
22
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
23
)
24
fuse/node/mount_test.go
+1
-1
@@ -15,7 +15,7 @@ import (
15
mount "github.com/ipfs/go-ipfs/fuse/mount"
16
namesys "github.com/ipfs/go-ipfs/namesys"
17
offroute "github.com/ipfs/go-ipfs/routing/offline"
18
- ci "github.com/ipfs/go-ipfs/util/testutil/ci"
18
+ ci "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util/testutil/ci"
19
)
20
21
func maybeSkipFuseTests(t *testing.T) {
fuse/readonly/ipfs_test.go
+2
-2
@@ -23,8 +23,8 @@ import (
23
chunk "github.com/ipfs/go-ipfs/importer/chunk"
24
dag "github.com/ipfs/go-ipfs/merkledag"
25
uio "github.com/ipfs/go-ipfs/unixfs/io"
26
- u "github.com/ipfs/go-ipfs/util"
27
- ci "github.com/ipfs/go-ipfs/util/testutil/ci"
26
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
27
+ ci "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util/testutil/ci"
28
)
29
30
func maybeSkipFuseTests(t *testing.T) {
fuse/readonly/readonly_unix.go
+2
-2
@@ -11,13 +11,13 @@ import (
11
12
fuse "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
13
fs "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
14
- proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
14
core "github.com/ipfs/go-ipfs/core"
15
mdag "github.com/ipfs/go-ipfs/merkledag"
16
path "github.com/ipfs/go-ipfs/path"
17
+ lgbl "github.com/ipfs/go-ipfs/thirdparty/loggables"
18
uio "github.com/ipfs/go-ipfs/unixfs/io"
19
ftpb "github.com/ipfs/go-ipfs/unixfs/pb"
20
- lgbl "github.com/ipfs/go-ipfs/util/eventlog/loggables"
20
+ proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
21
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
22
logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
23
)
importer/balanced/balanced_test.go
+1
-1
@@ -15,7 +15,7 @@ import (
15
mdtest "github.com/ipfs/go-ipfs/merkledag/test"
16
pin "github.com/ipfs/go-ipfs/pin"
17
uio "github.com/ipfs/go-ipfs/unixfs/io"
18
- u "github.com/ipfs/go-ipfs/util"
18
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
19
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
20
)
21
importer/chunk/rabin_test.go
+1
-1
@@ -5,7 +5,7 @@ import (
5
"fmt"
6
"github.com/ipfs/go-ipfs/blocks"
7
"github.com/ipfs/go-ipfs/blocks/key"
8
- "github.com/ipfs/go-ipfs/util"
8
+ "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
9
"io"
10
"testing"
11
)
importer/chunk/splitting_test.go
+1
-1
@@ -5,7 +5,7 @@ import (
5
"io"
6
"testing"
7
8
- u "github.com/ipfs/go-ipfs/util"
8
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
9
)
10
11
func randBuf(t *testing.T, size int) []byte {
importer/importer_test.go
+1
-1
@@ -10,7 +10,7 @@ import (
10
dag "github.com/ipfs/go-ipfs/merkledag"
11
mdtest "github.com/ipfs/go-ipfs/merkledag/test"
12
uio "github.com/ipfs/go-ipfs/unixfs/io"
13
- u "github.com/ipfs/go-ipfs/util"
13
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
14
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
15
)
16
importer/trickle/trickle_test.go
+1
-1
@@ -16,7 +16,7 @@ import (
16
pin "github.com/ipfs/go-ipfs/pin"
17
ft "github.com/ipfs/go-ipfs/unixfs"
18
uio "github.com/ipfs/go-ipfs/unixfs/io"
19
- u "github.com/ipfs/go-ipfs/util"
19
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
20
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
21
)
22
merkledag/coding.go
+2
-2
@@ -4,10 +4,10 @@ import (
4
"fmt"
5
"sort"
6
7
- mh "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
7
+ mh "gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash"
8
9
pb "github.com/ipfs/go-ipfs/merkledag/pb"
10
- u "github.com/ipfs/go-ipfs/util"
10
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
11
)
12
13
// for now, we use a PBNode intermediate thing.
merkledag/merkledag_test.go
+1
-1
@@ -22,7 +22,7 @@ import (
22
. "github.com/ipfs/go-ipfs/merkledag"
23
"github.com/ipfs/go-ipfs/pin"
24
uio "github.com/ipfs/go-ipfs/unixfs/io"
25
- u "github.com/ipfs/go-ipfs/util"
25
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
26
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
27
)
28
merkledag/node.go
+1
-1
@@ -5,7 +5,7 @@ import (
5
6
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
7
8
- mh "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
8
+ mh "gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash"
9
key "github.com/ipfs/go-ipfs/blocks/key"
10
)
11
mfs/mfs_test.go
+1
-1
@@ -28,7 +28,7 @@ import (
28
dag "github.com/ipfs/go-ipfs/merkledag"
29
ft "github.com/ipfs/go-ipfs/unixfs"
30
uio "github.com/ipfs/go-ipfs/unixfs/io"
31
- u "github.com/ipfs/go-ipfs/util"
31
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
32
)
33
34
func getDagserv(t *testing.T) dag.DAGService {
mfs/repub_test.go
+1
-1
@@ -5,7 +5,7 @@ import (
5
"time"
6
7
key "github.com/ipfs/go-ipfs/blocks/key"
8
- ci "github.com/ipfs/go-ipfs/util/testutil/ci"
8
+ ci "github.com/ipfs/go-ipfs/thirdparty/testutil/ci"
9
10
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
11
)
namesys/ipns_select_test.go
+1
-1
@@ -10,7 +10,7 @@ import (
10
11
pb "github.com/ipfs/go-ipfs/namesys/pb"
12
path "github.com/ipfs/go-ipfs/path"
13
- u "github.com/ipfs/go-ipfs/util"
13
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
14
ci "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/crypto"
15
)
16
namesys/publisher.go
+1
-1
@@ -19,7 +19,7 @@ import (
19
dhtpb "github.com/ipfs/go-ipfs/routing/dht/pb"
20
record "github.com/ipfs/go-ipfs/routing/record"
21
ft "github.com/ipfs/go-ipfs/unixfs"
22
- u "github.com/ipfs/go-ipfs/util"
22
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
23
ci "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/crypto"
24
peer "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/peer"
25
)
namesys/resolve_test.go
+2
-2
@@ -10,9 +10,9 @@ import (
10
key "github.com/ipfs/go-ipfs/blocks/key"
11
path "github.com/ipfs/go-ipfs/path"
12
mockrouting "github.com/ipfs/go-ipfs/routing/mock"
13
- u "github.com/ipfs/go-ipfs/util"
14
- testutil "github.com/ipfs/go-ipfs/util/testutil"
13
+ testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
14
peer "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/peer"
15
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
16
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
17
)
18
namesys/routing.go
+2
-2
@@ -6,14 +6,14 @@ import (
6
7
proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
8
lru "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/hashicorp/golang-lru"
9
- mh "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
9
+ mh "gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash"
10
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
11
12
key "github.com/ipfs/go-ipfs/blocks/key"
13
pb "github.com/ipfs/go-ipfs/namesys/pb"
14
path "github.com/ipfs/go-ipfs/path"
15
routing "github.com/ipfs/go-ipfs/routing"
16
- u "github.com/ipfs/go-ipfs/util"
16
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
17
ci "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/crypto"
18
logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
19
)
path/path.go
+1
-1
@@ -8,7 +8,7 @@ import (
8
key "github.com/ipfs/go-ipfs/blocks/key"
9
10
b58 "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-base58"
11
- mh "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
11
+ mh "gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash"
12
)
13
14
// ErrBadPath is returned when a given path is incorrectly formatted
path/resolver.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
"fmt"
7
"time"
8
9
- mh "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
9
+ mh "gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash"
10
"gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
11
12
key "github.com/ipfs/go-ipfs/blocks/key"
path/resolver_test.go
+1
-1
@@ -10,7 +10,7 @@ import (
10
merkledag "github.com/ipfs/go-ipfs/merkledag"
11
dagmock "github.com/ipfs/go-ipfs/merkledag/test"
12
path "github.com/ipfs/go-ipfs/path"
13
- util "github.com/ipfs/go-ipfs/util"
13
+ util "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
14
)
15
16
func randNode() (*merkledag.Node, key.Key) {
pin/pin_test.go
+1
-1
@@ -13,7 +13,7 @@ import (
13
bs "github.com/ipfs/go-ipfs/blockservice"
14
"github.com/ipfs/go-ipfs/exchange/offline"
15
mdag "github.com/ipfs/go-ipfs/merkledag"
16
- "github.com/ipfs/go-ipfs/util"
16
+ "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
17
)
18
19
func randNode() (*mdag.Node, key.Key) {
repo/config/bootstrap_peers.go
+1
-1
@@ -4,7 +4,7 @@ import (
4
"errors"
5
"fmt"
6
7
- iaddr "github.com/ipfs/go-ipfs/util/ipfsaddr"
7
+ iaddr "github.com/ipfs/go-ipfs/thirdparty/ipfsaddr"
8
)
9
10
// DefaultBootstrapAddresses are the hardcoded bootstrap addresses
repo/config/config.go
+2
-2
@@ -9,7 +9,7 @@ import (
9
"path/filepath"
10
"strings"
11
12
- u "github.com/ipfs/go-ipfs/util"
12
+ "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/mitchellh/go-homedir"
13
logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
14
)
15
@@ -48,7 +48,7 @@ func PathRoot() (string, error) {
48
dir := os.Getenv(EnvDir)
49
var err error
50
if len(dir) == 0 {
51
- dir, err = u.TildeExpansion(DefaultPathRoot)
51
+ dir, err = homedir.Expand(DefaultPathRoot)
52
}
53
return dir, err
54
}
repo/config/supernode.go
+1
-1
@@ -1,6 +1,6 @@
1
package config
2
3
-import "github.com/ipfs/go-ipfs/util/ipfsaddr"
3
+import "github.com/ipfs/go-ipfs/thirdparty/ipfsaddr"
4
5
// TODO replace with final servers before merge
6
repo/fsrepo/fsrepo.go
+3
-2
@@ -12,6 +12,7 @@ import (
12
"sync"
13
14
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore/measure"
15
+ "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/mitchellh/go-homedir"
16
repo "github.com/ipfs/go-ipfs/repo"
17
"github.com/ipfs/go-ipfs/repo/common"
18
config "github.com/ipfs/go-ipfs/repo/config"
@@ -19,7 +20,7 @@ import (
20
mfsr "github.com/ipfs/go-ipfs/repo/fsrepo/migrations"
21
serialize "github.com/ipfs/go-ipfs/repo/fsrepo/serialize"
22
dir "github.com/ipfs/go-ipfs/thirdparty/dir"
22
- util "github.com/ipfs/go-ipfs/util"
23
+ util "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
24
logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
25
)
26
@@ -156,7 +157,7 @@ func open(repoPath string) (repo.Repo, error) {
157
}
158
159
func newFSRepo(rpath string) (*FSRepo, error) {
159
- expPath, err := util.TildeExpansion(filepath.Clean(rpath))
160
+ expPath, err := homedir.Expand(filepath.Clean(rpath))
161
if err != nil {
162
return nil, err
163
}
repo/fsrepo/lock/lock.go
+1
-1
@@ -9,7 +9,7 @@ import (
9
"syscall"
10
11
lock "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/camlistore/lock"
12
- "github.com/ipfs/go-ipfs/util"
12
+ "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
13
)
14
15
// LockFile is the filename of the repo lock, relative to config dir
repo/fsrepo/serialize/serialize.go
+1
-1
@@ -10,7 +10,7 @@ import (
10
11
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/facebookgo/atomicfile"
12
"github.com/ipfs/go-ipfs/repo/config"
13
- "github.com/ipfs/go-ipfs/util"
13
+ "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
14
logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
15
)
16
routing/dht/dht_bootstrap.go
+1
-1
@@ -9,7 +9,7 @@ import (
9
"time"
10
11
routing "github.com/ipfs/go-ipfs/routing"
12
- u "github.com/ipfs/go-ipfs/util"
12
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
13
peer "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/peer"
14
15
goprocess "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
routing/dht/dht_test.go
+3
-3
@@ -17,12 +17,12 @@ import (
17
key "github.com/ipfs/go-ipfs/blocks/key"
18
routing "github.com/ipfs/go-ipfs/routing"
19
record "github.com/ipfs/go-ipfs/routing/record"
20
- u "github.com/ipfs/go-ipfs/util"
20
peer "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/peer"
21
netutil "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/test/util"
22
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
23
24
- ci "github.com/ipfs/go-ipfs/util/testutil/ci"
25
- travisci "github.com/ipfs/go-ipfs/util/testutil/ci/travis"
24
+ ci "github.com/ipfs/go-ipfs/thirdparty/testutil/ci"
25
+ travisci "github.com/ipfs/go-ipfs/thirdparty/testutil/ci/travis"
26
)
27
28
var testCaseValues = map[key.Key][]byte{}
routing/dht/ext_test.go
+1
-1
@@ -16,7 +16,7 @@ import (
16
routing "github.com/ipfs/go-ipfs/routing"
17
pb "github.com/ipfs/go-ipfs/routing/dht/pb"
18
record "github.com/ipfs/go-ipfs/routing/record"
19
- u "github.com/ipfs/go-ipfs/util"
19
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
20
inet "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/net"
21
mocknet "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/net/mock"
22
peer "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/peer"
routing/dht/handlers.go
+3
-3
@@ -5,13 +5,13 @@ import (
5
"fmt"
6
"time"
7
8
- proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
8
ds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore"
9
key "github.com/ipfs/go-ipfs/blocks/key"
10
pb "github.com/ipfs/go-ipfs/routing/dht/pb"
12
- u "github.com/ipfs/go-ipfs/util"
13
- lgbl "github.com/ipfs/go-ipfs/util/eventlog/loggables"
11
+ lgbl "github.com/ipfs/go-ipfs/thirdparty/loggables"
12
peer "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/peer"
13
+ proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
14
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
15
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
16
)
17
routing/dht/lookup.go
+1
-1
@@ -4,7 +4,7 @@ import (
4
key "github.com/ipfs/go-ipfs/blocks/key"
5
notif "github.com/ipfs/go-ipfs/notifications"
6
kb "github.com/ipfs/go-ipfs/routing/kbucket"
7
- pset "github.com/ipfs/go-ipfs/util/peerset"
7
+ pset "github.com/ipfs/go-ipfs/thirdparty/peerset"
8
peer "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/peer"
9
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
10
)
routing/dht/query.go
+3
-3
@@ -6,11 +6,11 @@ import (
6
key "github.com/ipfs/go-ipfs/blocks/key"
7
notif "github.com/ipfs/go-ipfs/notifications"
8
"github.com/ipfs/go-ipfs/routing"
9
- u "github.com/ipfs/go-ipfs/util"
10
- pset "github.com/ipfs/go-ipfs/util/peerset"
11
- todoctr "github.com/ipfs/go-ipfs/util/todocounter"
9
+ pset "github.com/ipfs/go-ipfs/thirdparty/peerset"
10
+ todoctr "github.com/ipfs/go-ipfs/thirdparty/todocounter"
11
peer "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/peer"
12
queue "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/peer/queue"
13
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
14
logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
15
16
process "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
routing/dht/routing.go
+1
-1
@@ -11,7 +11,7 @@ import (
11
pb "github.com/ipfs/go-ipfs/routing/dht/pb"
12
kb "github.com/ipfs/go-ipfs/routing/kbucket"
13
record "github.com/ipfs/go-ipfs/routing/record"
14
- pset "github.com/ipfs/go-ipfs/util/peerset"
14
+ pset "github.com/ipfs/go-ipfs/thirdparty/peerset"
15
inet "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/net"
16
peer "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/peer"
17
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
routing/kbucket/table_test.go
+1
-1
@@ -5,7 +5,7 @@ import (
5
"testing"
6
"time"
7
8
- tu "github.com/ipfs/go-ipfs/util/testutil"
8
+ tu "github.com/ipfs/go-ipfs/thirdparty/testutil"
9
10
peer "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/peer"
11
)
routing/kbucket/util.go
+1
-1
@@ -7,7 +7,7 @@ import (
7
8
key "github.com/ipfs/go-ipfs/blocks/key"
9
ks "github.com/ipfs/go-ipfs/routing/keyspace"
10
- u "github.com/ipfs/go-ipfs/util"
10
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
11
peer "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/peer"
12
)
13
routing/keyspace/xor.go
+1
-1
@@ -5,7 +5,7 @@ import (
5
"crypto/sha256"
6
"math/big"
7
8
- u "github.com/ipfs/go-ipfs/util"
8
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
9
)
10
11
// XORKeySpace is a KeySpace which:
routing/keyspace/xor_test.go
+1
-1
@@ -5,7 +5,7 @@ import (
5
"math/big"
6
"testing"
7
8
- u "github.com/ipfs/go-ipfs/util"
8
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
9
)
10
11
func TestPrefixLen(t *testing.T) {
routing/mock/centralized_client.go
+3
-3
@@ -4,15 +4,15 @@ import (
4
"errors"
5
"time"
6
7
- proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
7
ds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore"
8
key "github.com/ipfs/go-ipfs/blocks/key"
9
routing "github.com/ipfs/go-ipfs/routing"
10
dhtpb "github.com/ipfs/go-ipfs/routing/dht/pb"
12
- u "github.com/ipfs/go-ipfs/util"
13
- "github.com/ipfs/go-ipfs/util/testutil"
11
+ "github.com/ipfs/go-ipfs/thirdparty/testutil"
12
ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
13
peer "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/peer"
14
+ proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
15
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
16
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
17
logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
18
)
routing/mock/centralized_server.go
+1
-1
@@ -8,7 +8,7 @@ import (
8
ds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore"
9
dssync "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore/sync"
10
key "github.com/ipfs/go-ipfs/blocks/key"
11
- "github.com/ipfs/go-ipfs/util/testutil"
11
+ "github.com/ipfs/go-ipfs/thirdparty/testutil"
12
peer "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/peer"
13
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
14
)
routing/mock/centralized_test.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
7
key "github.com/ipfs/go-ipfs/blocks/key"
8
delay "github.com/ipfs/go-ipfs/thirdparty/delay"
9
- "github.com/ipfs/go-ipfs/util/testutil"
9
+ "github.com/ipfs/go-ipfs/thirdparty/testutil"
10
peer "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/peer"
11
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
12
)
routing/mock/dht.go
+1
-1
@@ -4,7 +4,7 @@ import (
4
ds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore"
5
sync "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore/sync"
6
dht "github.com/ipfs/go-ipfs/routing/dht"
7
- "github.com/ipfs/go-ipfs/util/testutil"
7
+ "github.com/ipfs/go-ipfs/thirdparty/testutil"
8
mocknet "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/net/mock"
9
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
10
)
routing/mock/interface.go
+1
-1
@@ -9,7 +9,7 @@ import (
9
key "github.com/ipfs/go-ipfs/blocks/key"
10
routing "github.com/ipfs/go-ipfs/routing"
11
delay "github.com/ipfs/go-ipfs/thirdparty/delay"
12
- "github.com/ipfs/go-ipfs/util/testutil"
12
+ "github.com/ipfs/go-ipfs/thirdparty/testutil"
13
peer "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/peer"
14
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
15
)
routing/record/validation.go
+1
-1
@@ -7,7 +7,7 @@ import (
7
key "github.com/ipfs/go-ipfs/blocks/key"
8
path "github.com/ipfs/go-ipfs/path"
9
pb "github.com/ipfs/go-ipfs/routing/dht/pb"
10
- u "github.com/ipfs/go-ipfs/util"
10
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
11
ci "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/crypto"
12
)
13
test/integration/addcat_test.go
+1
-1
@@ -16,8 +16,8 @@ import (
16
"github.com/ipfs/go-ipfs/core"
17
coreunix "github.com/ipfs/go-ipfs/core/coreunix"
18
mock "github.com/ipfs/go-ipfs/core/mock"
19
+ testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
20
"github.com/ipfs/go-ipfs/thirdparty/unit"
20
- testutil "github.com/ipfs/go-ipfs/util/testutil"
21
mocknet "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/net/mock"
22
"gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/peer"
23
logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
test/integration/bench_cat_test.go
+1
-1
@@ -10,8 +10,8 @@ import (
10
"github.com/ipfs/go-ipfs/core"
11
coreunix "github.com/ipfs/go-ipfs/core/coreunix"
12
mock "github.com/ipfs/go-ipfs/core/mock"
13
+ testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
14
"github.com/ipfs/go-ipfs/thirdparty/unit"
14
- testutil "github.com/ipfs/go-ipfs/util/testutil"
15
mocknet "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/net/mock"
16
"gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/peer"
17
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
test/integration/bench_test.go
+1
-1
@@ -3,8 +3,8 @@ package integrationtest
3
import (
4
"testing"
5
6
+ testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
7
"github.com/ipfs/go-ipfs/thirdparty/unit"
7
- testutil "github.com/ipfs/go-ipfs/util/testutil"
8
)
9
10
func benchmarkAddCat(numBytes int64, conf testutil.LatencyConfig, b *testing.B) {
test/integration/grandcentral_test.go
+2
-2
@@ -17,9 +17,9 @@ import (
17
"github.com/ipfs/go-ipfs/core/corerouting"
18
"github.com/ipfs/go-ipfs/core/coreunix"
19
mock "github.com/ipfs/go-ipfs/core/mock"
20
+ ds2 "github.com/ipfs/go-ipfs/thirdparty/datastore2"
21
+ testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
22
"github.com/ipfs/go-ipfs/thirdparty/unit"
21
- ds2 "github.com/ipfs/go-ipfs/util/datastore2"
22
- testutil "github.com/ipfs/go-ipfs/util/testutil"
23
mocknet "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/net/mock"
24
"gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/peer"
25
)
test/integration/three_legged_cat_test.go
+1
-1
@@ -13,8 +13,8 @@ import (
13
core "github.com/ipfs/go-ipfs/core"
14
coreunix "github.com/ipfs/go-ipfs/core/coreunix"
15
mock "github.com/ipfs/go-ipfs/core/mock"
16
+ testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
17
"github.com/ipfs/go-ipfs/thirdparty/unit"
17
- testutil "github.com/ipfs/go-ipfs/util/testutil"
18
mocknet "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/net/mock"
19
"gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/peer"
20
)
test/supernode_client/main.go
+2
-2
@@ -13,7 +13,7 @@ import (
13
"time"
14
15
random "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-random"
16
- "github.com/ipfs/go-ipfs/util/ipfsaddr"
16
+ "github.com/ipfs/go-ipfs/thirdparty/ipfsaddr"
17
ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
18
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
19
@@ -27,8 +27,8 @@ import (
27
"github.com/ipfs/go-ipfs/repo"
28
config "github.com/ipfs/go-ipfs/repo/config"
29
fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
30
+ ds2 "github.com/ipfs/go-ipfs/thirdparty/datastore2"
31
unit "github.com/ipfs/go-ipfs/thirdparty/unit"
31
- ds2 "github.com/ipfs/go-ipfs/util/datastore2"
32
peer "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/peer"
33
logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log"
34
)
thirdparty/datastore2/datastore_closer.go
renamed
thirdparty/datastore2/delayed.go
renamed
thirdparty/datastore2/threadsafe.go
renamed
thirdparty/ipfsaddr/ipfsaddr.go
renamed
thirdparty/ipfsaddr/ipfsaddr_test.go
renamed
thirdparty/loggables/loggables.go
renamed
thirdparty/peerset/peerset.go
renamed
thirdparty/testutil/ci/ci.go
renamed
+1
-1
@@ -6,7 +6,7 @@ package ci
6
import (
7
"os"
8
9
- travis "github.com/ipfs/go-ipfs/util/testutil/ci/travis"
9
+ travis "github.com/ipfs/go-ipfs/thirdparty/testutil/ci/travis"
10
)
11
12
// EnvVar is a type to use travis-only env var names with
thirdparty/testutil/ci/travis/travis.go
renamed
thirdparty/testutil/ci/travis/travis_test.go
renamed
thirdparty/testutil/datastore.go
renamed
+1
-1
@@ -3,7 +3,7 @@ package testutil
3
import (
4
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore"
5
syncds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore/sync"
6
- ds2 "github.com/ipfs/go-ipfs/util/datastore2"
6
+ ds2 "github.com/ipfs/go-ipfs/thirdparty/datastore2"
7
)
8
9
func ThreadSafeCloserMapDatastore() ds2.ThreadSafeDatastoreCloser {
thirdparty/testutil/gen.go
renamed
+1
-1
@@ -8,7 +8,7 @@ import (
8
"sync"
9
"testing"
10
11
- u "github.com/ipfs/go-ipfs/util"
11
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
12
ci "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/crypto"
13
peer "gx/ipfs/QmUBogf4nUefBjmYjn6jfsfPJRkmDGSeMhNj4usRKq69f4/go-libp2p/p2p/peer"
14
thirdparty/testutil/identity.go
renamed
thirdparty/testutil/latency_config.go
renamed
thirdparty/testutil/rand.go
renamed
thirdparty/todocounter/counter.go
renamed
unixfs/mod/dagmodifier.go
+1
-1
@@ -7,7 +7,7 @@ import (
7
"os"
8
9
proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
10
- mh "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
10
+ mh "gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash"
11
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
12
13
key "github.com/ipfs/go-ipfs/blocks/key"
unixfs/mod/dagmodifier_test.go
+1
-1
@@ -18,7 +18,7 @@ import (
18
mdag "github.com/ipfs/go-ipfs/merkledag"
19
ft "github.com/ipfs/go-ipfs/unixfs"
20
uio "github.com/ipfs/go-ipfs/unixfs/io"
21
- u "github.com/ipfs/go-ipfs/util"
21
+ u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
22
23
ds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore"
24
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
util/context.go
deleted
-35
@@ -1,35 +0,0 @@
1
-package util
2
-
3
-import (
4
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
5
-)
6
-
7
-// privateChanType protects the channel. Since this is a package-private type,
8
-// only methods defined in this package can get the error value from the
9
-// context.
10
-type privateChanType chan error
11
-
12
-const errLogKey = "the key used to extract the error log from the context"
13
-
14
-// ContextWithErrorLog returns a copy of parent and an error channel that can
15
-// be used to receive errors sent with the LogError method.
16
-func ContextWithErrorLog(parent context.Context) (context.Context, <-chan error) {
17
- errs := make(privateChanType)
18
- ctx := context.WithValue(parent, errLogKey, errs)
19
- return ctx, errs
20
-}
21
-
22
-// LogError logs the error to the owner of the context.
23
-//
24
-// If this context was created with ContextWithErrorLog, then this method
25
-// passes the error to context creator over an unbuffered channel.
26
-//
27
-// If this context was created by other means, this method is a no-op.
28
-func LogError(ctx context.Context, err error) {
29
- v := ctx.Value(errLogKey)
30
- errs, ok := v.(privateChanType)
31
- if !ok {
32
- return
33
- }
34
- errs <- err
35
-}
util/context_test.go
deleted
-28
@@ -1,28 +0,0 @@
1
-package util
2
-
3
-import (
4
- "errors"
5
- "testing"
6
-
7
- context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
8
-)
9
-
10
-func TestLogErrorDoesNotBlockWhenCtxIsNotSetUpForLogging(t *testing.T) {
11
- ctx := context.Background()
12
- LogError(ctx, errors.New("ignore me"))
13
-}
14
-
15
-func TestLogErrorReceivedByParent(t *testing.T) {
16
-
17
- expected := errors.New("From child to parent")
18
-
19
- ctx, errs := ContextWithErrorLog(context.Background())
20
-
21
- go func() {
22
- LogError(ctx, expected)
23
- }()
24
-
25
- if err := <-errs; err != expected {
26
- t.Fatal("didn't receive the expected error")
27
- }
28
-}
util/do.go
deleted
-22
@@ -1,22 +0,0 @@
1
-package util
2
-
3
-import "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
4
-
5
-func ContextDo(ctx context.Context, f func() error) error {
6
-
7
- ch := make(chan error)
8
-
9
- go func() {
10
- select {
11
- case <-ctx.Done():
12
- case ch <- f():
13
- }
14
- }()
15
- select {
16
- case <-ctx.Done():
17
- return ctx.Err()
18
- case val := <-ch:
19
- return val
20
- }
21
- return nil
22
-}
util/do_test.go
deleted
-42
@@ -1,42 +0,0 @@
1
-package util
2
-
3
-import (
4
- "errors"
5
- "testing"
6
-
7
- "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
8
-)
9
-
10
-func TestDoReturnsContextErr(t *testing.T) {
11
- ctx, cancel := context.WithCancel(context.Background())
12
- ch := make(chan struct{})
13
- err := ContextDo(ctx, func() error {
14
- cancel()
15
- ch <- struct{}{} // won't return
16
- return nil
17
- })
18
- if err != ctx.Err() {
19
- t.Fail()
20
- }
21
-}
22
-
23
-func TestDoReturnsFuncError(t *testing.T) {
24
- ctx := context.Background()
25
- expected := errors.New("expected to be returned by ContextDo")
26
- err := ContextDo(ctx, func() error {
27
- return expected
28
- })
29
- if err != expected {
30
- t.Fail()
31
- }
32
-}
33
-
34
-func TestDoReturnsNil(t *testing.T) {
35
- ctx := context.Background()
36
- err := ContextDo(ctx, func() error {
37
- return nil
38
- })
39
- if err != nil {
40
- t.Fail()
41
- }
42
-}
util/file.go
deleted
-11
@@ -1,11 +0,0 @@
1
-package util
2
-
3
-import "os"
4
-
5
-func FileExists(filename string) bool {
6
- fi, err := os.Lstat(filename)
7
- if fi != nil || (err != nil && !os.IsNotExist(err)) {
8
- return true
9
- }
10
- return false
11
-}
util/file_test.go
deleted
-10
@@ -1,10 +0,0 @@
1
-package util
2
-
3
-import "testing"
4
-
5
-func TestFileDoesNotExist(t *testing.T) {
6
- t.Parallel()
7
- if FileExists("i would be surprised to discover that this file exists") {
8
- t.Fail()
9
- }
10
-}
util/pipes/duplex.go
deleted
-14
@@ -1,14 +0,0 @@
1
-package pipes
2
-
3
-// Duplex is a simple duplex channel
4
-type Duplex struct {
5
- In chan []byte
6
- Out chan []byte
7
-}
8
-
9
-func NewDuplex(bufsize int) Duplex {
10
- return Duplex{
11
- In: make(chan []byte, bufsize),
12
- Out: make(chan []byte, bufsize),
13
- }
14
-}
util/sadhack/godep.go
deleted
-9
@@ -1,9 +0,0 @@
1
-package util
2
-
3
-// FIXME: we need the go-random/random utility for our sharness test wich depends on go-humanize
4
-// Godep will drop it if we dont use it in ipfs. There should be a better way to do this.
5
-import _ "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/dustin/go-humanize"
6
-
7
-// imported by chegga/pb on windows, this is here so running godeps on non-windows doesnt
8
-// drop it from our vendoring
9
-import _ "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/olekukonko/ts"
util/time.go
deleted
-17
@@ -1,17 +0,0 @@
1
-package util
2
-
3
-import "time"
4
-
5
-var TimeFormatIpfs = time.RFC3339Nano
6
-
7
-func ParseRFC3339(s string) (time.Time, error) {
8
- t, err := time.Parse(TimeFormatIpfs, s)
9
- if err != nil {
10
- return time.Time{}, err
11
- }
12
- return t.UTC(), nil
13
-}
14
-
15
-func FormatRFC3339(t time.Time) string {
16
- return t.UTC().Format(TimeFormatIpfs)
17
-}
util/time_test.go
deleted
-16
@@ -1,16 +0,0 @@
1
-package util
2
-
3
-import (
4
- "testing"
5
- "time"
6
-)
7
-
8
-func TestTimeFormatParseInversion(t *testing.T) {
9
- v, err := ParseRFC3339(FormatRFC3339(time.Now()))
10
- if err != nil {
11
- t.Fatal(err)
12
- }
13
- if v.Location() != time.UTC {
14
- t.Fatal("Time should be UTC")
15
- }
16
-}
util/util.go
deleted
-159
@@ -1,159 +0,0 @@
1
-// Package util implements various utility functions used within ipfs
2
-// that do not currently have a better place to live.
3
-package util
4
-
5
-import (
6
- "errors"
7
- "io"
8
- "math/rand"
9
- "os"
10
- "path/filepath"
11
- "runtime/debug"
12
- "strings"
13
- "time"
14
-
15
- ds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/ipfs/go-datastore"
16
- b58 "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-base58"
17
- mh "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
18
-
19
- "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/mitchellh/go-homedir"
20
-)
21
-
22
-// Debug is a global flag for debugging.
23
-var Debug bool
24
-
25
-// ErrNotImplemented signifies a function has not been implemented yet.
26
-var ErrNotImplemented = errors.New("Error: not implemented yet.")
27
-
28
-// ErrTimeout implies that a timeout has been triggered
29
-var ErrTimeout = errors.New("Error: Call timed out.")
30
-
31
-// ErrSeErrSearchIncomplete implies that a search type operation didnt
32
-// find the expected node, but did find 'a' node.
33
-var ErrSearchIncomplete = errors.New("Error: Search Incomplete.")
34
-
35
-// ErrNotFound is returned when a search fails to find anything
36
-var ErrNotFound = ds.ErrNotFound
37
-
38
-// TildeExpansion expands a filename, which may begin with a tilde.
39
-func TildeExpansion(filename string) (string, error) {
40
- return homedir.Expand(filename)
41
-}
42
-
43
-// ErrCast is returned when a cast fails AND the program should not panic.
44
-func ErrCast() error {
45
- debug.PrintStack()
46
- return errCast
47
-}
48
-
49
-var errCast = errors.New("cast error")
50
-
51
-// ExpandPathnames takes a set of paths and turns them into absolute paths
52
-func ExpandPathnames(paths []string) ([]string, error) {
53
- var out []string
54
- for _, p := range paths {
55
- abspath, err := filepath.Abs(p)
56
- if err != nil {
57
- return nil, err
58
- }
59
- out = append(out, abspath)
60
- }
61
- return out, nil
62
-}
63
-
64
-type randGen struct {
65
- rand.Rand
66
-}
67
-
68
-func NewTimeSeededRand() io.Reader {
69
- src := rand.NewSource(time.Now().UnixNano())
70
- return &randGen{
71
- Rand: *rand.New(src),
72
- }
73
-}
74
-
75
-func NewSeededRand(seed int64) io.Reader {
76
- src := rand.NewSource(seed)
77
- return &randGen{
78
- Rand: *rand.New(src),
79
- }
80
-}
81
-
82
-func (r *randGen) Read(p []byte) (n int, err error) {
83
- for i := 0; i < len(p); i++ {
84
- p[i] = byte(r.Rand.Intn(255))
85
- }
86
- return len(p), nil
87
-}
88
-
89
-// GetenvBool is the way to check an env var as a boolean
90
-func GetenvBool(name string) bool {
91
- v := strings.ToLower(os.Getenv(name))
92
- return v == "true" || v == "t" || v == "1"
93
-}
94
-
95
-// MultiErr is a util to return multiple errors
96
-type MultiErr []error
97
-
98
-func (m MultiErr) Error() string {
99
- if len(m) == 0 {
100
- return "no errors"
101
- }
102
-
103
- s := "Multiple errors: "
104
- for i, e := range m {
105
- if i != 0 {
106
- s += ", "
107
- }
108
- s += e.Error()
109
- }
110
- return s
111
-}
112
-
113
-func Partition(subject string, sep string) (string, string, string) {
114
- if i := strings.Index(subject, sep); i != -1 {
115
- return subject[:i], subject[i : i+len(sep)], subject[i+len(sep):]
116
- }
117
- return subject, "", ""
118
-}
119
-
120
-func RPartition(subject string, sep string) (string, string, string) {
121
- if i := strings.LastIndex(subject, sep); i != -1 {
122
- return subject[:i], subject[i : i+len(sep)], subject[i+len(sep):]
123
- }
124
- return subject, "", ""
125
-}
126
-
127
-// Hash is the global IPFS hash function. uses multihash SHA2_256, 256 bits
128
-func Hash(data []byte) mh.Multihash {
129
- h, err := mh.Sum(data, mh.SHA2_256, -1)
130
- if err != nil {
131
- // this error can be safely ignored (panic) because multihash only fails
132
- // from the selection of hash function. If the fn + length are valid, it
133
- // won't error.
134
- panic("multihash failed to hash using SHA2_256.")
135
- }
136
- return h
137
-}
138
-
139
-// IsValidHash checks whether a given hash is valid (b58 decodable, len > 0)
140
-func IsValidHash(s string) bool {
141
- out := b58.Decode(s)
142
- if out == nil || len(out) == 0 {
143
- return false
144
- }
145
- _, err := mh.Cast(out)
146
- if err != nil {
147
- return false
148
- }
149
- return true
150
-}
151
-
152
-// XOR takes two byte slices, XORs them together, returns the resulting slice.
153
-func XOR(a, b []byte) []byte {
154
- c := make([]byte, len(a))
155
- for i := 0; i < len(a); i++ {
156
- c[i] = a[i] ^ b[i]
157
- }
158
- return c
159
-}
util/util_test.go
deleted
-63
@@ -1,63 +0,0 @@
1
-package util
2
-
3
-import (
4
- "bytes"
5
- "testing"
6
-)
7
-
8
-func TestXOR(t *testing.T) {
9
- cases := [][3][]byte{
10
- {
11
- {0xFF, 0xFF, 0xFF},
12
- {0xFF, 0xFF, 0xFF},
13
- {0x00, 0x00, 0x00},
14
- },
15
- {
16
- {0x00, 0xFF, 0x00},
17
- {0xFF, 0xFF, 0xFF},
18
- {0xFF, 0x00, 0xFF},
19
- },
20
- {
21
- {0x55, 0x55, 0x55},
22
- {0x55, 0xFF, 0xAA},
23
- {0x00, 0xAA, 0xFF},
24
- },
25
- }
26
-
27
- for _, c := range cases {
28
- r := XOR(c[0], c[1])
29
- if !bytes.Equal(r, c[2]) {
30
- t.Error("XOR failed")
31
- }
32
- }
33
-}
34
-
35
-func BenchmarkHash256K(b *testing.B) {
36
- buf := make([]byte, 256*1024)
37
- NewTimeSeededRand().Read(buf)
38
- b.SetBytes(int64(256 * 1024))
39
- b.ResetTimer()
40
- for i := 0; i < b.N; i++ {
41
- Hash(buf)
42
- }
43
-}
44
-
45
-func BenchmarkHash512K(b *testing.B) {
46
- buf := make([]byte, 512*1024)
47
- NewTimeSeededRand().Read(buf)
48
- b.SetBytes(int64(512 * 1024))
49
- b.ResetTimer()
50
- for i := 0; i < b.N; i++ {
51
- Hash(buf)
52
- }
53
-}
54
-
55
-func BenchmarkHash1M(b *testing.B) {
56
- buf := make([]byte, 1024*1024)
57
- NewTimeSeededRand().Read(buf)
58
- b.SetBytes(int64(1024 * 1024))
59
- b.ResetTimer()
60
- for i := 0; i < b.N; i++ {
61
- Hash(buf)
62
- }
63
-}