extract update go-testutil
License: MIT Signed-off-by: Steven Allen <steven@stebalien.com>
Steven Allen committed
Aug 16, 2017 at 16:51 UTC
19c3bd82a34c15777ab83a4e92e6bc9293d75580
64 files changed
+122
-542
core/bootstrap.go
+1
-1
@@ -14,10 +14,10 @@ import (
14
15
context "context"
16
pstore "gx/ipfs/QmPgDWmTmuzvP7QE5zwo1TmjbJme9pmZHNujB2453jkCTr/go-libp2p-peerstore"
17
- host "gx/ipfs/QmRNyPNJGNCaZyYonJj7owciWTsMd9gRfEKmZY3o6xwN3h/go-libp2p-host"
17
goprocess "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess"
18
procctx "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess/context"
19
periodicproc "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess/periodic"
20
+ host "gx/ipfs/QmW8Rgju5JrSMHP7RDNdiwwXyenRqAbtSaPfdQKQC7ZdH6/go-libp2p-host"
21
peer "gx/ipfs/QmXYjuNuxVzXKJCfWasQk1RqkhVLDM9jtUKhqc2WPQmFSB/go-libp2p-peer"
22
inet "gx/ipfs/QmahYsGWry85Y7WUe2SX5G4JkH2zifEQAUtJVLZ24aC9DF/go-libp2p-net"
23
)
core/bootstrap_test.go
+1
-1
@@ -5,8 +5,8 @@ import (
5
"testing"
6
7
config "github.com/ipfs/go-ipfs/repo/config"
8
- testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
8
pstore "gx/ipfs/QmPgDWmTmuzvP7QE5zwo1TmjbJme9pmZHNujB2453jkCTr/go-libp2p-peerstore"
9
+ testutil "gx/ipfs/QmZJD56ZWLViJAVkvLc7xbbDerHzUMLr2X4fLRYfbxZWDN/go-testutil"
10
)
11
12
func TestSubsetWhenMaxIsGreaterThanLengthOfSlice(t *testing.T) {
core/commands/dht.go
+1
-1
@@ -15,11 +15,11 @@ import (
15
pstore "gx/ipfs/QmPgDWmTmuzvP7QE5zwo1TmjbJme9pmZHNujB2453jkCTr/go-libp2p-peerstore"
16
routing "gx/ipfs/QmPjTrrSfE6TzLv6ya6VWhGcCgPrUAdcgrDcQyRDX2VyW1/go-libp2p-routing"
17
notif "gx/ipfs/QmPjTrrSfE6TzLv6ya6VWhGcCgPrUAdcgrDcQyRDX2VyW1/go-libp2p-routing/notifications"
18
+ ipdht "gx/ipfs/QmSFNexSqAnJKGfDwKnGx2sGB1EtLwsNQ586u18UkVLjAy/go-libp2p-kad-dht"
19
u "gx/ipfs/QmSU6eubNdhXjFBJBSksTp8kv8YRub8mGAPv8tVJHmL2EU/go-ipfs-util"
20
b58 "gx/ipfs/QmT8rehPR3F6bmwL6zjUN8XpiDBFFpMP2myPdC6ApsWfJf/go-base58"
21
cid "gx/ipfs/QmTprEaAA2A9bst5XH7exuyi5KzNMK3SEDNN8rBDnKWcUS/go-cid"
22
peer "gx/ipfs/QmXYjuNuxVzXKJCfWasQk1RqkhVLDM9jtUKhqc2WPQmFSB/go-libp2p-peer"
22
- ipdht "gx/ipfs/QmcKxeQomXUjo54VwisTiXeic5FFBknwUPtT7yRWvmPD1D/go-libp2p-kad-dht"
23
)
24
25
var ErrNotDHT = errors.New("routing service is not a DHT")
core/commands/dht_test.go
+1
-1
@@ -4,7 +4,7 @@ import (
4
"testing"
5
6
"github.com/ipfs/go-ipfs/namesys"
7
- tu "github.com/ipfs/go-ipfs/thirdparty/testutil"
7
+ tu "gx/ipfs/QmZJD56ZWLViJAVkvLc7xbbDerHzUMLr2X4fLRYfbxZWDN/go-testutil"
8
)
9
10
func TestKeyTranslation(t *testing.T) {
core/commands/id.go
+2
-2
@@ -12,12 +12,12 @@ import (
12
13
cmds "github.com/ipfs/go-ipfs/commands"
14
core "github.com/ipfs/go-ipfs/core"
15
- kb "gx/ipfs/QmbiCMdwmmhif5axuGSHzYbPFGeKjLAuMY6JrGpVteHFsy/go-libp2p-kbucket"
15
+ kb "gx/ipfs/QmVU26BGUSt3LkbWmoH7dP16mNz5VVRg4hDmWZBHAkq97w/go-libp2p-kbucket"
16
17
pstore "gx/ipfs/QmPgDWmTmuzvP7QE5zwo1TmjbJme9pmZHNujB2453jkCTr/go-libp2p-peerstore"
18
u "gx/ipfs/QmSU6eubNdhXjFBJBSksTp8kv8YRub8mGAPv8tVJHmL2EU/go-ipfs-util"
19
"gx/ipfs/QmXYjuNuxVzXKJCfWasQk1RqkhVLDM9jtUKhqc2WPQmFSB/go-libp2p-peer"
20
- identify "gx/ipfs/QmZPBrKq6S1fdYaRAzYZivJL12QkUqHwnNzF9wC8VXC4bo/go-libp2p/p2p/protocol/identify"
20
+ identify "gx/ipfs/QmXZ6XetFwaDNmszPCux9DaKqMykEJGDtWHSqprn94UXzM/go-libp2p/p2p/protocol/identify"
21
ic "gx/ipfs/QmaPbCnUMBohSGo3KnxEa2bHqyJVVeEEcwtqJAYxerieBo/go-libp2p-crypto"
22
)
23
core/commands/pubsub.go
+1
-1
@@ -15,9 +15,9 @@ import (
15
blocks "gx/ipfs/QmVA4mafxbfH5aEvNz8fyoxC6J1xhAtw88B4GerPznSZBg/go-block-format"
16
17
pstore "gx/ipfs/QmPgDWmTmuzvP7QE5zwo1TmjbJme9pmZHNujB2453jkCTr/go-libp2p-peerstore"
18
- floodsub "gx/ipfs/QmQCm4CY8hXwYnaEZ5E2iRWFmWWX9xGCTABySyLbfyqXNh/floodsub"
18
u "gx/ipfs/QmSU6eubNdhXjFBJBSksTp8kv8YRub8mGAPv8tVJHmL2EU/go-ipfs-util"
19
cid "gx/ipfs/QmTprEaAA2A9bst5XH7exuyi5KzNMK3SEDNN8rBDnKWcUS/go-cid"
20
+ floodsub "gx/ipfs/Qmar7ei5yhwt1oCExdR1QZQgQxYUuPFV5tsqvPNzaBpGjM/floodsub"
21
)
22
23
var PubsubCmd = &cmds.Command{
core/commands/swarm.go
+1
-1
@@ -15,7 +15,7 @@ import (
15
"github.com/ipfs/go-ipfs/repo/fsrepo"
16
iaddr "github.com/ipfs/go-ipfs/thirdparty/ipfsaddr"
17
pstore "gx/ipfs/QmPgDWmTmuzvP7QE5zwo1TmjbJme9pmZHNujB2453jkCTr/go-libp2p-peerstore"
18
- swarm "gx/ipfs/Qmb9GA1fMGfXdLBwJA9h3SRpr7C4AXUhpWgZzVmqcDJi1P/go-libp2p-swarm"
18
+ swarm "gx/ipfs/QmfGXKgqQmaPHDHPSG3Y9vCVtFZtFeRZJW7N1anXB5biRu/go-libp2p-swarm"
19
20
mafilter "gx/ipfs/QmSMZwvs3n4GBikZ7hKzT17c3bk65FmyZo2JqtJ16swqCv/multiaddr-filter"
21
ma "gx/ipfs/QmXY77cVe7rVRQXZZQRioukUM7aRW3BTcAgJe12MCtb3Ji/go-multiaddr"
core/core.go
+10
-10
@@ -46,12 +46,10 @@ import (
46
pstore "gx/ipfs/QmPgDWmTmuzvP7QE5zwo1TmjbJme9pmZHNujB2453jkCTr/go-libp2p-peerstore"
47
routing "gx/ipfs/QmPjTrrSfE6TzLv6ya6VWhGcCgPrUAdcgrDcQyRDX2VyW1/go-libp2p-routing"
48
mafilter "gx/ipfs/QmQBB2dQLmQHJgs2gqZ3iqL2XiuCtUCvXzWt5kMXDf5Zcr/go-maddr-filter"
49
- floodsub "gx/ipfs/QmQCm4CY8hXwYnaEZ5E2iRWFmWWX9xGCTABySyLbfyqXNh/floodsub"
49
ipnet "gx/ipfs/QmQq9YzmdFdWNTDdArueGyD7L5yyiRQigrRHJnTGkxcEjT/go-libp2p-interface-pnet"
51
- p2phost "gx/ipfs/QmRNyPNJGNCaZyYonJj7owciWTsMd9gRfEKmZY3o6xwN3h/go-libp2p-host"
50
mssmux "gx/ipfs/QmRVYfZ7tWNHPBzWiG6KWGzvT2hcGems8srihsQE29x1U5/go-smux-multistream"
53
- circuit "gx/ipfs/QmSC7288aesJAC3BQ4Duy6Pk2CMfQWL7cr5t9SV4HBmKFT/go-libp2p-circuit"
51
goprocess "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess"
52
+ dht "gx/ipfs/QmSFNexSqAnJKGfDwKnGx2sGB1EtLwsNQ586u18UkVLjAy/go-libp2p-kad-dht"
53
mamask "gx/ipfs/QmSMZwvs3n4GBikZ7hKzT17c3bk65FmyZo2JqtJ16swqCv/multiaddr-filter"
54
u "gx/ipfs/QmSU6eubNdhXjFBJBSksTp8kv8YRub8mGAPv8tVJHmL2EU/go-ipfs-util"
55
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
@@ -59,20 +57,22 @@ import (
57
cid "gx/ipfs/QmTprEaAA2A9bst5XH7exuyi5KzNMK3SEDNN8rBDnKWcUS/go-cid"
58
ds "gx/ipfs/QmVSase1JP7cq9QkPT46oNwdp9pT6kBkG3oqS14y3QcZjG/go-datastore"
59
metrics "gx/ipfs/QmVjRAPfRtResCMCE4eBqr4Beoa6A89P1YweG9wUS6RqUL/go-libp2p-metrics"
60
+ p2phost "gx/ipfs/QmW8Rgju5JrSMHP7RDNdiwwXyenRqAbtSaPfdQKQC7ZdH6/go-libp2p-host"
61
ma "gx/ipfs/QmXY77cVe7rVRQXZZQRioukUM7aRW3BTcAgJe12MCtb3Ji/go-multiaddr"
62
peer "gx/ipfs/QmXYjuNuxVzXKJCfWasQk1RqkhVLDM9jtUKhqc2WPQmFSB/go-libp2p-peer"
63
+ discovery "gx/ipfs/QmXZ6XetFwaDNmszPCux9DaKqMykEJGDtWHSqprn94UXzM/go-libp2p/p2p/discovery"
64
+ p2pbhost "gx/ipfs/QmXZ6XetFwaDNmszPCux9DaKqMykEJGDtWHSqprn94UXzM/go-libp2p/p2p/host/basic"
65
+ rhost "gx/ipfs/QmXZ6XetFwaDNmszPCux9DaKqMykEJGDtWHSqprn94UXzM/go-libp2p/p2p/host/routed"
66
+ identify "gx/ipfs/QmXZ6XetFwaDNmszPCux9DaKqMykEJGDtWHSqprn94UXzM/go-libp2p/p2p/protocol/identify"
67
+ ping "gx/ipfs/QmXZ6XetFwaDNmszPCux9DaKqMykEJGDtWHSqprn94UXzM/go-libp2p/p2p/protocol/ping"
68
mplex "gx/ipfs/QmYBCDHS74pfbhMhtLeDpZyBa4Z9X76JLyACSKum1K39eP/go-smux-multiplex"
65
- discovery "gx/ipfs/QmZPBrKq6S1fdYaRAzYZivJL12QkUqHwnNzF9wC8VXC4bo/go-libp2p/p2p/discovery"
66
- p2pbhost "gx/ipfs/QmZPBrKq6S1fdYaRAzYZivJL12QkUqHwnNzF9wC8VXC4bo/go-libp2p/p2p/host/basic"
67
- rhost "gx/ipfs/QmZPBrKq6S1fdYaRAzYZivJL12QkUqHwnNzF9wC8VXC4bo/go-libp2p/p2p/host/routed"
68
- identify "gx/ipfs/QmZPBrKq6S1fdYaRAzYZivJL12QkUqHwnNzF9wC8VXC4bo/go-libp2p/p2p/protocol/identify"
69
- ping "gx/ipfs/QmZPBrKq6S1fdYaRAzYZivJL12QkUqHwnNzF9wC8VXC4bo/go-libp2p/p2p/protocol/ping"
69
ic "gx/ipfs/QmaPbCnUMBohSGo3KnxEa2bHqyJVVeEEcwtqJAYxerieBo/go-libp2p-crypto"
71
- swarm "gx/ipfs/Qmb9GA1fMGfXdLBwJA9h3SRpr7C4AXUhpWgZzVmqcDJi1P/go-libp2p-swarm"
70
+ floodsub "gx/ipfs/Qmar7ei5yhwt1oCExdR1QZQgQxYUuPFV5tsqvPNzaBpGjM/floodsub"
71
+ circuit "gx/ipfs/QmbVTkb8ihJNudRL4Vf9wjxMAapWxYdehrS7XBij31AGKM/go-libp2p-circuit"
72
yamux "gx/ipfs/Qmbn7RYyWzBVXiUp9jZ1dA4VADHy9DtS7iZLwfhEUQvm3U/go-smux-yamux"
73
- dht "gx/ipfs/QmcKxeQomXUjo54VwisTiXeic5FFBknwUPtT7yRWvmPD1D/go-libp2p-kad-dht"
73
addrutil "gx/ipfs/Qmcx4KoZ91XS6izLjdkujAMAunAS1YuTgfgASgYaZF5GkR/go-addr-util"
74
smux "gx/ipfs/QmeZBgYBHvxMukGK5ojg28BCNLB9SeXqT7XXg6o7r2GbJy/go-stream-muxer"
75
+ swarm "gx/ipfs/QmfGXKgqQmaPHDHPSG3Y9vCVtFZtFeRZJW7N1anXB5biRu/go-libp2p-swarm"
76
)
77
78
const IpnsValidatorTag = "ipns"
core/core_test.go
+3
-3
@@ -6,7 +6,7 @@ import (
6
context "context"
7
"github.com/ipfs/go-ipfs/repo"
8
config "github.com/ipfs/go-ipfs/repo/config"
9
- "github.com/ipfs/go-ipfs/thirdparty/testutil"
9
+ ds2 "github.com/ipfs/go-ipfs/thirdparty/datastore2"
10
)
11
12
func TestInitialization(t *testing.T) {
@@ -38,7 +38,7 @@ func TestInitialization(t *testing.T) {
38
for i, c := range good {
39
r := &repo.Mock{
40
C: *c,
41
- D: testutil.ThreadSafeCloserMapDatastore(),
41
+ D: ds2.ThreadSafeCloserMapDatastore(),
42
}
43
n, err := NewNode(ctx, &BuildCfg{Repo: r})
44
if n == nil || err != nil {
@@ -49,7 +49,7 @@ func TestInitialization(t *testing.T) {
49
for i, c := range bad {
50
r := &repo.Mock{
51
C: *c,
52
- D: testutil.ThreadSafeCloserMapDatastore(),
52
+ D: ds2.ThreadSafeCloserMapDatastore(),
53
}
54
n, err := NewNode(ctx, &BuildCfg{Repo: r})
55
if n != nil || err == nil {
core/coreapi/unixfs_test.go
+2
-2
@@ -15,7 +15,7 @@ import (
15
mdag "github.com/ipfs/go-ipfs/merkledag"
16
repo "github.com/ipfs/go-ipfs/repo"
17
config "github.com/ipfs/go-ipfs/repo/config"
18
- testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
18
+ ds2 "github.com/ipfs/go-ipfs/thirdparty/datastore2"
19
unixfs "github.com/ipfs/go-ipfs/unixfs"
20
cbor "gx/ipfs/QmeebqVZeEXBqJ2B4urQWfdhwRRPm84ajnCo8x8pfwbsPM/go-ipld-cbor"
21
)
@@ -37,7 +37,7 @@ func makeAPI(ctx context.Context) (*core.IpfsNode, coreiface.UnixfsAPI, error) {
37
PeerID: "Qmfoo", // required by offline node
38
},
39
},
40
- D: testutil.ThreadSafeCloserMapDatastore(),
40
+ D: ds2.ThreadSafeCloserMapDatastore(),
41
}
42
node, err := core.NewNode(ctx, &core.BuildCfg{Repo: r})
43
if err != nil {
core/corehttp/gateway.go
+1
-1
@@ -8,7 +8,7 @@ import (
8
core "github.com/ipfs/go-ipfs/core"
9
coreapi "github.com/ipfs/go-ipfs/core/coreapi"
10
config "github.com/ipfs/go-ipfs/repo/config"
11
- id "gx/ipfs/QmZPBrKq6S1fdYaRAzYZivJL12QkUqHwnNzF9wC8VXC4bo/go-libp2p/p2p/protocol/identify"
11
+ id "gx/ipfs/QmXZ6XetFwaDNmszPCux9DaKqMykEJGDtWHSqprn94UXzM/go-libp2p/p2p/protocol/identify"
12
)
13
14
type GatewayConfig struct {
core/corehttp/gateway_test.go
+3
-3
@@ -17,9 +17,9 @@ import (
17
path "github.com/ipfs/go-ipfs/path"
18
repo "github.com/ipfs/go-ipfs/repo"
19
config "github.com/ipfs/go-ipfs/repo/config"
20
- testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
20
+ ds2 "github.com/ipfs/go-ipfs/thirdparty/datastore2"
21
22
- id "gx/ipfs/QmZPBrKq6S1fdYaRAzYZivJL12QkUqHwnNzF9wC8VXC4bo/go-libp2p/p2p/protocol/identify"
22
+ id "gx/ipfs/QmXZ6XetFwaDNmszPCux9DaKqMykEJGDtWHSqprn94UXzM/go-libp2p/p2p/protocol/identify"
23
ci "gx/ipfs/QmaPbCnUMBohSGo3KnxEa2bHqyJVVeEEcwtqJAYxerieBo/go-libp2p-crypto"
24
)
25
@@ -56,7 +56,7 @@ func newNodeWithMockNamesys(ns mockNamesys) (*core.IpfsNode, error) {
56
}
57
r := &repo.Mock{
58
C: c,
59
- D: testutil.ThreadSafeCloserMapDatastore(),
59
+ D: ds2.ThreadSafeCloserMapDatastore(),
60
}
61
n, err := core.NewNode(context.Background(), &core.BuildCfg{Repo: r})
62
if err != nil {
core/corehttp/metrics_test.go
+2
-2
@@ -7,8 +7,8 @@ import (
7
8
core "github.com/ipfs/go-ipfs/core"
9
10
- testutil "gx/ipfs/QmSTbByZ1rJVn8KANcoiLDiPH2pgDaz33uT6JW6B9nMBW5/go-libp2p-netutil"
11
- bhost "gx/ipfs/QmZPBrKq6S1fdYaRAzYZivJL12QkUqHwnNzF9wC8VXC4bo/go-libp2p/p2p/host/basic"
10
+ bhost "gx/ipfs/QmXZ6XetFwaDNmszPCux9DaKqMykEJGDtWHSqprn94UXzM/go-libp2p/p2p/host/basic"
11
+ testutil "gx/ipfs/QmZG4W8GR9FpC4z69Vab9ENtEoxKjDnTym5oa7Q3Yr7P4o/go-libp2p-netutil"
12
inet "gx/ipfs/QmahYsGWry85Y7WUe2SX5G4JkH2zifEQAUtJVLZ24aC9DF/go-libp2p-net"
13
)
14
core/corerouting/core.go
+1
-1
@@ -10,8 +10,8 @@ import (
10
gcproxy "github.com/ipfs/go-ipfs/routing/supernode/proxy"
11
pstore "gx/ipfs/QmPgDWmTmuzvP7QE5zwo1TmjbJme9pmZHNujB2453jkCTr/go-libp2p-peerstore"
12
routing "gx/ipfs/QmPjTrrSfE6TzLv6ya6VWhGcCgPrUAdcgrDcQyRDX2VyW1/go-libp2p-routing"
13
- "gx/ipfs/QmRNyPNJGNCaZyYonJj7owciWTsMd9gRfEKmZY3o6xwN3h/go-libp2p-host"
13
ds "gx/ipfs/QmVSase1JP7cq9QkPT46oNwdp9pT6kBkG3oqS14y3QcZjG/go-datastore"
14
+ "gx/ipfs/QmW8Rgju5JrSMHP7RDNdiwwXyenRqAbtSaPfdQKQC7ZdH6/go-libp2p-host"
15
)
16
17
// NB: DHT option is included in the core to avoid 1) because it's a sane
core/coreunix/add_test.go
+4
-4
@@ -18,8 +18,8 @@ import (
18
"github.com/ipfs/go-ipfs/pin/gc"
19
"github.com/ipfs/go-ipfs/repo"
20
"github.com/ipfs/go-ipfs/repo/config"
21
+ ds2 "github.com/ipfs/go-ipfs/thirdparty/datastore2"
22
pi "github.com/ipfs/go-ipfs/thirdparty/posinfo"
22
- "github.com/ipfs/go-ipfs/thirdparty/testutil"
23
"gx/ipfs/QmVA4mafxbfH5aEvNz8fyoxC6J1xhAtw88B4GerPznSZBg/go-block-format"
24
25
cid "gx/ipfs/QmTprEaAA2A9bst5XH7exuyi5KzNMK3SEDNN8rBDnKWcUS/go-cid"
@@ -32,7 +32,7 @@ func TestAddRecursive(t *testing.T) {
32
PeerID: "Qmfoo", // required by offline node
33
},
34
},
35
- D: testutil.ThreadSafeCloserMapDatastore(),
35
+ D: ds2.ThreadSafeCloserMapDatastore(),
36
}
37
node, err := core.NewNode(context.Background(), &core.BuildCfg{Repo: r})
38
if err != nil {
@@ -52,7 +52,7 @@ func TestAddGCLive(t *testing.T) {
52
PeerID: "Qmfoo", // required by offline node
53
},
54
},
55
- D: testutil.ThreadSafeCloserMapDatastore(),
55
+ D: ds2.ThreadSafeCloserMapDatastore(),
56
}
57
node, err := core.NewNode(context.Background(), &core.BuildCfg{Repo: r})
58
if err != nil {
@@ -161,7 +161,7 @@ func testAddWPosInfo(t *testing.T, rawLeaves bool) {
161
PeerID: "Qmfoo", // required by offline node
162
},
163
},
164
- D: testutil.ThreadSafeCloserMapDatastore(),
164
+ D: ds2.ThreadSafeCloserMapDatastore(),
165
}
166
node, err := core.NewNode(context.Background(), &core.BuildCfg{Repo: r})
167
if err != nil {
core/mock/mock.go
+4
-6
@@ -9,16 +9,14 @@ import (
9
"github.com/ipfs/go-ipfs/repo"
10
config "github.com/ipfs/go-ipfs/repo/config"
11
ds2 "github.com/ipfs/go-ipfs/thirdparty/datastore2"
12
- testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
12
+ testutil "gx/ipfs/QmZJD56ZWLViJAVkvLc7xbbDerHzUMLr2X4fLRYfbxZWDN/go-testutil"
13
14
pstore "gx/ipfs/QmPgDWmTmuzvP7QE5zwo1TmjbJme9pmZHNujB2453jkCTr/go-libp2p-peerstore"
15
ipnet "gx/ipfs/QmQq9YzmdFdWNTDdArueGyD7L5yyiRQigrRHJnTGkxcEjT/go-libp2p-interface-pnet"
16
- host "gx/ipfs/QmRNyPNJGNCaZyYonJj7owciWTsMd9gRfEKmZY3o6xwN3h/go-libp2p-host"
17
- "gx/ipfs/QmVSase1JP7cq9QkPT46oNwdp9pT6kBkG3oqS14y3QcZjG/go-datastore"
18
- syncds "gx/ipfs/QmVSase1JP7cq9QkPT46oNwdp9pT6kBkG3oqS14y3QcZjG/go-datastore/sync"
16
metrics "gx/ipfs/QmVjRAPfRtResCMCE4eBqr4Beoa6A89P1YweG9wUS6RqUL/go-libp2p-metrics"
17
+ host "gx/ipfs/QmW8Rgju5JrSMHP7RDNdiwwXyenRqAbtSaPfdQKQC7ZdH6/go-libp2p-host"
18
peer "gx/ipfs/QmXYjuNuxVzXKJCfWasQk1RqkhVLDM9jtUKhqc2WPQmFSB/go-libp2p-peer"
21
- mocknet "gx/ipfs/QmZPBrKq6S1fdYaRAzYZivJL12QkUqHwnNzF9wC8VXC4bo/go-libp2p/p2p/net/mock"
19
+ mocknet "gx/ipfs/QmXZ6XetFwaDNmszPCux9DaKqMykEJGDtWHSqprn94UXzM/go-libp2p/p2p/net/mock"
20
smux "gx/ipfs/QmeZBgYBHvxMukGK5ojg28BCNLB9SeXqT7XXg6o7r2GbJy/go-stream-muxer"
21
)
22
@@ -54,7 +52,7 @@ func MockCmdsCtx() (commands.Context, error) {
52
}
53
54
r := &repo.Mock{
57
- D: ds2.CloserWrap(syncds.MutexWrap(datastore.NewMapDatastore())),
55
+ D: ds2.ThreadSafeCloserMapDatastore(),
56
C: conf,
57
}
58
exchange/bitswap/bitswap_test.go
+2
-2
@@ -14,13 +14,13 @@ import (
14
tn "github.com/ipfs/go-ipfs/exchange/bitswap/testnet"
15
mockrouting "github.com/ipfs/go-ipfs/routing/mock"
16
delay "github.com/ipfs/go-ipfs/thirdparty/delay"
17
- travis "github.com/ipfs/go-ipfs/thirdparty/testutil/ci/travis"
17
blocks "gx/ipfs/QmVA4mafxbfH5aEvNz8fyoxC6J1xhAtw88B4GerPznSZBg/go-block-format"
18
+ travis "gx/ipfs/QmZJD56ZWLViJAVkvLc7xbbDerHzUMLr2X4fLRYfbxZWDN/go-testutil/ci/travis"
19
20
detectrace "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-detect-race"
21
22
- p2ptestutil "gx/ipfs/QmSTbByZ1rJVn8KANcoiLDiPH2pgDaz33uT6JW6B9nMBW5/go-libp2p-netutil"
22
cid "gx/ipfs/QmTprEaAA2A9bst5XH7exuyi5KzNMK3SEDNN8rBDnKWcUS/go-cid"
23
+ p2ptestutil "gx/ipfs/QmZG4W8GR9FpC4z69Vab9ENtEoxKjDnTym5oa7Q3Yr7P4o/go-libp2p-netutil"
24
)
25
26
// FIXME the tests are really sensitive to the network delay. fix them to work
exchange/bitswap/decision/bench_test.go
+1
-1
@@ -6,10 +6,10 @@ import (
6
"testing"
7
8
"github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
9
- "github.com/ipfs/go-ipfs/thirdparty/testutil"
9
u "gx/ipfs/QmSU6eubNdhXjFBJBSksTp8kv8YRub8mGAPv8tVJHmL2EU/go-ipfs-util"
10
cid "gx/ipfs/QmTprEaAA2A9bst5XH7exuyi5KzNMK3SEDNN8rBDnKWcUS/go-cid"
11
"gx/ipfs/QmXYjuNuxVzXKJCfWasQk1RqkhVLDM9jtUKhqc2WPQmFSB/go-libp2p-peer"
12
+ "gx/ipfs/QmZJD56ZWLViJAVkvLc7xbbDerHzUMLr2X4fLRYfbxZWDN/go-testutil"
13
)
14
15
// FWIW: At the time of this commit, including a timestamp in task increases
exchange/bitswap/decision/engine_test.go
+1
-1
@@ -11,11 +11,11 @@ import (
11
context "context"
12
blockstore "github.com/ipfs/go-ipfs/blocks/blockstore"
13
message "github.com/ipfs/go-ipfs/exchange/bitswap/message"
14
- testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
14
blocks "gx/ipfs/QmVA4mafxbfH5aEvNz8fyoxC6J1xhAtw88B4GerPznSZBg/go-block-format"
15
ds "gx/ipfs/QmVSase1JP7cq9QkPT46oNwdp9pT6kBkG3oqS14y3QcZjG/go-datastore"
16
dssync "gx/ipfs/QmVSase1JP7cq9QkPT46oNwdp9pT6kBkG3oqS14y3QcZjG/go-datastore/sync"
17
peer "gx/ipfs/QmXYjuNuxVzXKJCfWasQk1RqkhVLDM9jtUKhqc2WPQmFSB/go-libp2p-peer"
18
+ testutil "gx/ipfs/QmZJD56ZWLViJAVkvLc7xbbDerHzUMLr2X4fLRYfbxZWDN/go-testutil"
19
)
20
21
type peerAndEngine struct {
exchange/bitswap/decision/peer_request_queue_test.go
+1
-1
@@ -9,9 +9,9 @@ import (
9
"testing"
10
11
"github.com/ipfs/go-ipfs/exchange/bitswap/wantlist"
12
- "github.com/ipfs/go-ipfs/thirdparty/testutil"
12
u "gx/ipfs/QmSU6eubNdhXjFBJBSksTp8kv8YRub8mGAPv8tVJHmL2EU/go-ipfs-util"
13
cid "gx/ipfs/QmTprEaAA2A9bst5XH7exuyi5KzNMK3SEDNN8rBDnKWcUS/go-cid"
14
+ "gx/ipfs/QmZJD56ZWLViJAVkvLc7xbbDerHzUMLr2X4fLRYfbxZWDN/go-testutil"
15
)
16
17
func TestPushPop(t *testing.T) {
exchange/bitswap/network/ipfs_impl.go
+1
-1
@@ -10,9 +10,9 @@ import (
10
11
pstore "gx/ipfs/QmPgDWmTmuzvP7QE5zwo1TmjbJme9pmZHNujB2453jkCTr/go-libp2p-peerstore"
12
routing "gx/ipfs/QmPjTrrSfE6TzLv6ya6VWhGcCgPrUAdcgrDcQyRDX2VyW1/go-libp2p-routing"
13
- host "gx/ipfs/QmRNyPNJGNCaZyYonJj7owciWTsMd9gRfEKmZY3o6xwN3h/go-libp2p-host"
13
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
14
cid "gx/ipfs/QmTprEaAA2A9bst5XH7exuyi5KzNMK3SEDNN8rBDnKWcUS/go-cid"
15
+ host "gx/ipfs/QmW8Rgju5JrSMHP7RDNdiwwXyenRqAbtSaPfdQKQC7ZdH6/go-libp2p-host"
16
ma "gx/ipfs/QmXY77cVe7rVRQXZZQRioukUM7aRW3BTcAgJe12MCtb3Ji/go-multiaddr"
17
peer "gx/ipfs/QmXYjuNuxVzXKJCfWasQk1RqkhVLDM9jtUKhqc2WPQmFSB/go-libp2p-peer"
18
ggio "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/io"
exchange/bitswap/testnet/interface.go
+1
-1
@@ -2,8 +2,8 @@ package bitswap
2
3
import (
4
bsnet "github.com/ipfs/go-ipfs/exchange/bitswap/network"
5
- "github.com/ipfs/go-ipfs/thirdparty/testutil"
5
peer "gx/ipfs/QmXYjuNuxVzXKJCfWasQk1RqkhVLDM9jtUKhqc2WPQmFSB/go-libp2p-peer"
6
+ "gx/ipfs/QmZJD56ZWLViJAVkvLc7xbbDerHzUMLr2X4fLRYfbxZWDN/go-testutil"
7
)
8
9
type Network interface {
exchange/bitswap/testnet/network_test.go
+1
-1
@@ -9,9 +9,9 @@ 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/thirdparty/testutil"
12
blocks "gx/ipfs/QmVA4mafxbfH5aEvNz8fyoxC6J1xhAtw88B4GerPznSZBg/go-block-format"
13
peer "gx/ipfs/QmXYjuNuxVzXKJCfWasQk1RqkhVLDM9jtUKhqc2WPQmFSB/go-libp2p-peer"
14
+ testutil "gx/ipfs/QmZJD56ZWLViJAVkvLc7xbbDerHzUMLr2X4fLRYfbxZWDN/go-testutil"
15
)
16
17
func TestSendMessageAsyncButWaitForResponse(t *testing.T) {
exchange/bitswap/testnet/peernet.go
+2
-2
@@ -4,10 +4,10 @@ import (
4
"context"
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/thirdparty/testutil"
7
ds "gx/ipfs/QmVSase1JP7cq9QkPT46oNwdp9pT6kBkG3oqS14y3QcZjG/go-datastore"
8
peer "gx/ipfs/QmXYjuNuxVzXKJCfWasQk1RqkhVLDM9jtUKhqc2WPQmFSB/go-libp2p-peer"
10
- mockpeernet "gx/ipfs/QmZPBrKq6S1fdYaRAzYZivJL12QkUqHwnNzF9wC8VXC4bo/go-libp2p/p2p/net/mock"
9
+ mockpeernet "gx/ipfs/QmXZ6XetFwaDNmszPCux9DaKqMykEJGDtWHSqprn94UXzM/go-libp2p/p2p/net/mock"
10
+ testutil "gx/ipfs/QmZJD56ZWLViJAVkvLc7xbbDerHzUMLr2X4fLRYfbxZWDN/go-testutil"
11
)
12
13
type peernet struct {
exchange/bitswap/testnet/virtual.go
+1
-1
@@ -8,7 +8,7 @@ import (
8
bsnet "github.com/ipfs/go-ipfs/exchange/bitswap/network"
9
mockrouting "github.com/ipfs/go-ipfs/routing/mock"
10
delay "github.com/ipfs/go-ipfs/thirdparty/delay"
11
- testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
11
+ testutil "gx/ipfs/QmZJD56ZWLViJAVkvLc7xbbDerHzUMLr2X4fLRYfbxZWDN/go-testutil"
12
13
routing "gx/ipfs/QmPjTrrSfE6TzLv6ya6VWhGcCgPrUAdcgrDcQyRDX2VyW1/go-libp2p-routing"
14
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
exchange/bitswap/testutils.go
+2
-2
@@ -8,12 +8,12 @@ import (
8
tn "github.com/ipfs/go-ipfs/exchange/bitswap/testnet"
9
datastore2 "github.com/ipfs/go-ipfs/thirdparty/datastore2"
10
delay "github.com/ipfs/go-ipfs/thirdparty/delay"
11
- testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
11
+ testutil "gx/ipfs/QmZJD56ZWLViJAVkvLc7xbbDerHzUMLr2X4fLRYfbxZWDN/go-testutil"
12
13
- p2ptestutil "gx/ipfs/QmSTbByZ1rJVn8KANcoiLDiPH2pgDaz33uT6JW6B9nMBW5/go-libp2p-netutil"
13
ds "gx/ipfs/QmVSase1JP7cq9QkPT46oNwdp9pT6kBkG3oqS14y3QcZjG/go-datastore"
14
ds_sync "gx/ipfs/QmVSase1JP7cq9QkPT46oNwdp9pT6kBkG3oqS14y3QcZjG/go-datastore/sync"
15
peer "gx/ipfs/QmXYjuNuxVzXKJCfWasQk1RqkhVLDM9jtUKhqc2WPQmFSB/go-libp2p-peer"
16
+ p2ptestutil "gx/ipfs/QmZG4W8GR9FpC4z69Vab9ENtEoxKjDnTym5oa7Q3Yr7P4o/go-libp2p-netutil"
17
)
18
19
// WARNING: this uses RandTestBogusIdentity DO NOT USE for NON TESTS!
exchange/reprovide/reprovide_test.go
+1
-1
@@ -6,11 +6,11 @@ import (
6
context "context"
7
blockstore "github.com/ipfs/go-ipfs/blocks/blockstore"
8
mock "github.com/ipfs/go-ipfs/routing/mock"
9
- testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
9
pstore "gx/ipfs/QmPgDWmTmuzvP7QE5zwo1TmjbJme9pmZHNujB2453jkCTr/go-libp2p-peerstore"
10
blocks "gx/ipfs/QmVA4mafxbfH5aEvNz8fyoxC6J1xhAtw88B4GerPznSZBg/go-block-format"
11
ds "gx/ipfs/QmVSase1JP7cq9QkPT46oNwdp9pT6kBkG3oqS14y3QcZjG/go-datastore"
12
dssync "gx/ipfs/QmVSase1JP7cq9QkPT46oNwdp9pT6kBkG3oqS14y3QcZjG/go-datastore/sync"
13
+ testutil "gx/ipfs/QmZJD56ZWLViJAVkvLc7xbbDerHzUMLr2X4fLRYfbxZWDN/go-testutil"
14
15
. "github.com/ipfs/go-ipfs/exchange/reprovide"
16
)
fuse/ipns/ipns_test.go
+1
-1
@@ -15,7 +15,7 @@ import (
15
core "github.com/ipfs/go-ipfs/core"
16
namesys "github.com/ipfs/go-ipfs/namesys"
17
offroute "github.com/ipfs/go-ipfs/routing/offline"
18
- ci "github.com/ipfs/go-ipfs/thirdparty/testutil/ci"
18
+ ci "gx/ipfs/QmZJD56ZWLViJAVkvLc7xbbDerHzUMLr2X4fLRYfbxZWDN/go-testutil/ci"
19
20
racedet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-detect-race"
21
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/thirdparty/testutil/ci"
18
+ ci "gx/ipfs/QmZJD56ZWLViJAVkvLc7xbbDerHzUMLr2X4fLRYfbxZWDN/go-testutil/ci"
19
)
20
21
func maybeSkipFuseTests(t *testing.T) {
fuse/readonly/ipfs_test.go
+1
-1
@@ -19,8 +19,8 @@ import (
19
importer "github.com/ipfs/go-ipfs/importer"
20
chunk "github.com/ipfs/go-ipfs/importer/chunk"
21
dag "github.com/ipfs/go-ipfs/merkledag"
22
- ci "github.com/ipfs/go-ipfs/thirdparty/testutil/ci"
22
uio "github.com/ipfs/go-ipfs/unixfs/io"
23
+ ci "gx/ipfs/QmZJD56ZWLViJAVkvLc7xbbDerHzUMLr2X4fLRYfbxZWDN/go-testutil/ci"
24
25
u "gx/ipfs/QmSU6eubNdhXjFBJBSksTp8kv8YRub8mGAPv8tVJHmL2EU/go-ipfs-util"
26
node "gx/ipfs/QmYNyRZJBUYPNrLszFmrBrPJbsBh2vMsefz5gnDpB5M1P6/go-ipld-format"
mfs/repub_test.go
+1
-1
@@ -4,7 +4,7 @@ import (
4
"testing"
5
"time"
6
7
- ci "github.com/ipfs/go-ipfs/thirdparty/testutil/ci"
7
+ ci "gx/ipfs/QmZJD56ZWLViJAVkvLc7xbbDerHzUMLr2X4fLRYfbxZWDN/go-testutil/ci"
8
9
"context"
10
cid "gx/ipfs/QmTprEaAA2A9bst5XH7exuyi5KzNMK3SEDNN8rBDnKWcUS/go-cid"
namesys/republisher/repub_test.go
+1
-1
@@ -14,7 +14,7 @@ import (
14
. "github.com/ipfs/go-ipfs/namesys/republisher"
15
path "github.com/ipfs/go-ipfs/path"
16
pstore "gx/ipfs/QmPgDWmTmuzvP7QE5zwo1TmjbJme9pmZHNujB2453jkCTr/go-libp2p-peerstore"
17
- mocknet "gx/ipfs/QmZPBrKq6S1fdYaRAzYZivJL12QkUqHwnNzF9wC8VXC4bo/go-libp2p/p2p/net/mock"
17
+ mocknet "gx/ipfs/QmXZ6XetFwaDNmszPCux9DaKqMykEJGDtWHSqprn94UXzM/go-libp2p/p2p/net/mock"
18
)
19
20
func TestRepublish(t *testing.T) {
namesys/resolve_test.go
+1
-1
@@ -8,7 +8,7 @@ import (
8
9
path "github.com/ipfs/go-ipfs/path"
10
mockrouting "github.com/ipfs/go-ipfs/routing/mock"
11
- testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
11
+ testutil "gx/ipfs/QmZJD56ZWLViJAVkvLc7xbbDerHzUMLr2X4fLRYfbxZWDN/go-testutil"
12
13
ds "gx/ipfs/QmVSase1JP7cq9QkPT46oNwdp9pT6kBkG3oqS14y3QcZjG/go-datastore"
14
dssync "gx/ipfs/QmVSase1JP7cq9QkPT46oNwdp9pT6kBkG3oqS14y3QcZjG/go-datastore/sync"
p2p/p2p.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
"time"
7
8
pstore "gx/ipfs/QmPgDWmTmuzvP7QE5zwo1TmjbJme9pmZHNujB2453jkCTr/go-libp2p-peerstore"
9
- p2phost "gx/ipfs/QmRNyPNJGNCaZyYonJj7owciWTsMd9gRfEKmZY3o6xwN3h/go-libp2p-host"
9
+ p2phost "gx/ipfs/QmW8Rgju5JrSMHP7RDNdiwwXyenRqAbtSaPfdQKQC7ZdH6/go-libp2p-host"
10
manet "gx/ipfs/QmX3U3YXCQ6UYBxq2LVWF8dARS1hPUTEYLrSx654Qyxyw6/go-multiaddr-net"
11
ma "gx/ipfs/QmXY77cVe7rVRQXZZQRioukUM7aRW3BTcAgJe12MCtb3Ji/go-multiaddr"
12
peer "gx/ipfs/QmXYjuNuxVzXKJCfWasQk1RqkhVLDM9jtUKhqc2WPQmFSB/go-libp2p-peer"
package.json
+28
-16
@@ -190,9 +190,9 @@
190
},
191
{
192
"author": "whyrusleeping",
193
- "hash": "QmZPBrKq6S1fdYaRAzYZivJL12QkUqHwnNzF9wC8VXC4bo",
193
+ "hash": "QmXZ6XetFwaDNmszPCux9DaKqMykEJGDtWHSqprn94UXzM",
194
"name": "go-libp2p",
195
- "version": "4.4.4"
195
+ "version": "4.5.1"
196
},
197
{
198
"author": "whyrusleeping",
@@ -237,9 +237,9 @@
237
"version": "0.1.2"
238
},
239
{
240
- "hash": "QmcKxeQomXUjo54VwisTiXeic5FFBknwUPtT7yRWvmPD1D",
240
+ "hash": "QmSFNexSqAnJKGfDwKnGx2sGB1EtLwsNQ586u18UkVLjAy",
241
"name": "go-libp2p-kad-dht",
242
- "version": "2.5.8"
242
+ "version": "2.5.11"
243
},
244
{
245
"author": "whyrusleeping",
@@ -249,9 +249,9 @@
249
},
250
{
251
"author": "whyrusleeping",
252
- "hash": "QmQCm4CY8hXwYnaEZ5E2iRWFmWWX9xGCTABySyLbfyqXNh",
252
+ "hash": "Qmar7ei5yhwt1oCExdR1QZQgQxYUuPFV5tsqvPNzaBpGjM",
253
"name": "floodsub",
254
- "version": "0.8.18"
254
+ "version": "0.8.20"
255
},
256
{
257
"author": "whyrusleeping",
@@ -308,14 +308,14 @@
308
},
309
{
310
"author": "whyrusleeping",
311
- "hash": "QmSTbByZ1rJVn8KANcoiLDiPH2pgDaz33uT6JW6B9nMBW5",
311
+ "hash": "QmZG4W8GR9FpC4z69Vab9ENtEoxKjDnTym5oa7Q3Yr7P4o",
312
"name": "go-libp2p-netutil",
313
- "version": "0.2.19"
313
+ "version": "0.2.21"
314
},
315
{
316
- "hash": "QmbiCMdwmmhif5axuGSHzYbPFGeKjLAuMY6JrGpVteHFsy",
316
+ "hash": "QmVU26BGUSt3LkbWmoH7dP16mNz5VVRg4hDmWZBHAkq97w",
317
"name": "go-libp2p-kbucket",
318
- "version": "2.1.10"
318
+ "version": "2.1.12"
319
},
320
{
321
"author": "whyrusleeping",
@@ -403,15 +403,15 @@
403
},
404
{
405
"author": "whyrusleeping",
406
- "hash": "QmRNyPNJGNCaZyYonJj7owciWTsMd9gRfEKmZY3o6xwN3h",
406
+ "hash": "QmW8Rgju5JrSMHP7RDNdiwwXyenRqAbtSaPfdQKQC7ZdH6",
407
"name": "go-libp2p-host",
408
- "version": "1.3.16"
408
+ "version": "1.3.18"
409
},
410
{
411
"author": "whyrusleeping",
412
- "hash": "Qmb9GA1fMGfXdLBwJA9h3SRpr7C4AXUhpWgZzVmqcDJi1P",
412
+ "hash": "QmfGXKgqQmaPHDHPSG3Y9vCVtFZtFeRZJW7N1anXB5biRu",
413
"name": "go-libp2p-swarm",
414
- "version": "1.7.1"
414
+ "version": "1.7.3"
415
},
416
{
417
"author": "whyrusleeping",
@@ -454,9 +454,21 @@
454
},
455
{
456
"author": "vyzo",
457
- "hash": "QmSC7288aesJAC3BQ4Duy6Pk2CMfQWL7cr5t9SV4HBmKFT",
457
+ "hash": "QmbVTkb8ihJNudRL4Vf9wjxMAapWxYdehrS7XBij31AGKM",
458
"name": "go-libp2p-circuit",
459
- "version": "1.1.2"
459
+ "version": "1.1.4"
460
+ },
461
+ {
462
+ "author": "whyrusleeping",
463
+ "hash": "QmZJD56ZWLViJAVkvLc7xbbDerHzUMLr2X4fLRYfbxZWDN",
464
+ "name": "go-testutil",
465
+ "version": "1.1.10"
466
+ },
467
+ {
468
+ "author": "whyrusleeping",
469
+ "hash": "QmZJD56ZWLViJAVkvLc7xbbDerHzUMLr2X4fLRYfbxZWDN",
470
+ "name": "go-testutil",
471
+ "version": "1.1.10"
472
}
473
],
474
"gxVersion": "0.10.0",
routing/mock/centralized_client.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
"time"
7
8
dshelp "github.com/ipfs/go-ipfs/thirdparty/ds-help"
9
- "github.com/ipfs/go-ipfs/thirdparty/testutil"
9
+ "gx/ipfs/QmZJD56ZWLViJAVkvLc7xbbDerHzUMLr2X4fLRYfbxZWDN/go-testutil"
10
11
pstore "gx/ipfs/QmPgDWmTmuzvP7QE5zwo1TmjbJme9pmZHNujB2453jkCTr/go-libp2p-peerstore"
12
routing "gx/ipfs/QmPjTrrSfE6TzLv6ya6VWhGcCgPrUAdcgrDcQyRDX2VyW1/go-libp2p-routing"
routing/mock/centralized_server.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
"sync"
7
"time"
8
9
- "github.com/ipfs/go-ipfs/thirdparty/testutil"
9
+ "gx/ipfs/QmZJD56ZWLViJAVkvLc7xbbDerHzUMLr2X4fLRYfbxZWDN/go-testutil"
10
11
pstore "gx/ipfs/QmPgDWmTmuzvP7QE5zwo1TmjbJme9pmZHNujB2453jkCTr/go-libp2p-peerstore"
12
cid "gx/ipfs/QmTprEaAA2A9bst5XH7exuyi5KzNMK3SEDNN8rBDnKWcUS/go-cid"
routing/mock/centralized_test.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
"time"
7
8
delay "github.com/ipfs/go-ipfs/thirdparty/delay"
9
- "github.com/ipfs/go-ipfs/thirdparty/testutil"
9
+ "gx/ipfs/QmZJD56ZWLViJAVkvLc7xbbDerHzUMLr2X4fLRYfbxZWDN/go-testutil"
10
11
pstore "gx/ipfs/QmPgDWmTmuzvP7QE5zwo1TmjbJme9pmZHNujB2453jkCTr/go-libp2p-peerstore"
12
u "gx/ipfs/QmSU6eubNdhXjFBJBSksTp8kv8YRub8mGAPv8tVJHmL2EU/go-ipfs-util"
routing/mock/dht.go
+3
-3
@@ -2,11 +2,11 @@ package mockrouting
2
3
import (
4
context "context"
5
- "github.com/ipfs/go-ipfs/thirdparty/testutil"
5
+ dht "gx/ipfs/QmSFNexSqAnJKGfDwKnGx2sGB1EtLwsNQ586u18UkVLjAy/go-libp2p-kad-dht"
6
ds "gx/ipfs/QmVSase1JP7cq9QkPT46oNwdp9pT6kBkG3oqS14y3QcZjG/go-datastore"
7
sync "gx/ipfs/QmVSase1JP7cq9QkPT46oNwdp9pT6kBkG3oqS14y3QcZjG/go-datastore/sync"
8
- mocknet "gx/ipfs/QmZPBrKq6S1fdYaRAzYZivJL12QkUqHwnNzF9wC8VXC4bo/go-libp2p/p2p/net/mock"
9
- dht "gx/ipfs/QmcKxeQomXUjo54VwisTiXeic5FFBknwUPtT7yRWvmPD1D/go-libp2p-kad-dht"
8
+ mocknet "gx/ipfs/QmXZ6XetFwaDNmszPCux9DaKqMykEJGDtWHSqprn94UXzM/go-libp2p/p2p/net/mock"
9
+ "gx/ipfs/QmZJD56ZWLViJAVkvLc7xbbDerHzUMLr2X4fLRYfbxZWDN/go-testutil"
10
)
11
12
type mocknetserver struct {
routing/mock/interface.go
+1
-1
@@ -8,7 +8,7 @@ import (
8
"context"
9
10
delay "github.com/ipfs/go-ipfs/thirdparty/delay"
11
- "github.com/ipfs/go-ipfs/thirdparty/testutil"
11
+ "gx/ipfs/QmZJD56ZWLViJAVkvLc7xbbDerHzUMLr2X4fLRYfbxZWDN/go-testutil"
12
13
routing "gx/ipfs/QmPjTrrSfE6TzLv6ya6VWhGcCgPrUAdcgrDcQyRDX2VyW1/go-libp2p-routing"
14
ds "gx/ipfs/QmVSase1JP7cq9QkPT46oNwdp9pT6kBkG3oqS14y3QcZjG/go-datastore"
routing/none/none_client.go
+1
-1
@@ -8,8 +8,8 @@ import (
8
9
pstore "gx/ipfs/QmPgDWmTmuzvP7QE5zwo1TmjbJme9pmZHNujB2453jkCTr/go-libp2p-peerstore"
10
routing "gx/ipfs/QmPjTrrSfE6TzLv6ya6VWhGcCgPrUAdcgrDcQyRDX2VyW1/go-libp2p-routing"
11
- p2phost "gx/ipfs/QmRNyPNJGNCaZyYonJj7owciWTsMd9gRfEKmZY3o6xwN3h/go-libp2p-host"
11
cid "gx/ipfs/QmTprEaAA2A9bst5XH7exuyi5KzNMK3SEDNN8rBDnKWcUS/go-cid"
12
+ p2phost "gx/ipfs/QmW8Rgju5JrSMHP7RDNdiwwXyenRqAbtSaPfdQKQC7ZdH6/go-libp2p-host"
13
peer "gx/ipfs/QmXYjuNuxVzXKJCfWasQk1RqkhVLDM9jtUKhqc2WPQmFSB/go-libp2p-peer"
14
)
15
routing/offline/offline_test.go
+1
-1
@@ -3,8 +3,8 @@ package offline
3
import (
4
"bytes"
5
"context"
6
- "github.com/ipfs/go-ipfs/thirdparty/testutil"
6
ds "gx/ipfs/QmVSase1JP7cq9QkPT46oNwdp9pT6kBkG3oqS14y3QcZjG/go-datastore"
7
+ "gx/ipfs/QmZJD56ZWLViJAVkvLc7xbbDerHzUMLr2X4fLRYfbxZWDN/go-testutil"
8
"testing"
9
)
10
routing/supernode/client.go
+2
-2
@@ -10,14 +10,14 @@ import (
10
11
pstore "gx/ipfs/QmPgDWmTmuzvP7QE5zwo1TmjbJme9pmZHNujB2453jkCTr/go-libp2p-peerstore"
12
routing "gx/ipfs/QmPjTrrSfE6TzLv6ya6VWhGcCgPrUAdcgrDcQyRDX2VyW1/go-libp2p-routing"
13
- "gx/ipfs/QmRNyPNJGNCaZyYonJj7owciWTsMd9gRfEKmZY3o6xwN3h/go-libp2p-host"
13
+ dhtpb "gx/ipfs/QmSFNexSqAnJKGfDwKnGx2sGB1EtLwsNQ586u18UkVLjAy/go-libp2p-kad-dht/pb"
14
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
15
loggables "gx/ipfs/QmT4PgCNdv73hnFAqzHqwW44q7M9PWpykSswHDxndquZbc/go-libp2p-loggables"
16
cid "gx/ipfs/QmTprEaAA2A9bst5XH7exuyi5KzNMK3SEDNN8rBDnKWcUS/go-cid"
17
+ "gx/ipfs/QmW8Rgju5JrSMHP7RDNdiwwXyenRqAbtSaPfdQKQC7ZdH6/go-libp2p-host"
18
peer "gx/ipfs/QmXYjuNuxVzXKJCfWasQk1RqkhVLDM9jtUKhqc2WPQmFSB/go-libp2p-peer"
19
proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
20
pb "gx/ipfs/QmbxkgUceEcuSZ4ZdBA3x74VUDSSYjHYmmeEqkjxbtZ6Jg/go-libp2p-record/pb"
20
- dhtpb "gx/ipfs/QmcKxeQomXUjo54VwisTiXeic5FFBknwUPtT7yRWvmPD1D/go-libp2p-kad-dht/pb"
21
)
22
23
var log = logging.Logger("supernode")
routing/supernode/proxy/loopback.go
+1
-1
@@ -2,10 +2,10 @@ package proxy
2
3
import (
4
context "context"
5
+ dhtpb "gx/ipfs/QmSFNexSqAnJKGfDwKnGx2sGB1EtLwsNQ586u18UkVLjAy/go-libp2p-kad-dht/pb"
6
peer "gx/ipfs/QmXYjuNuxVzXKJCfWasQk1RqkhVLDM9jtUKhqc2WPQmFSB/go-libp2p-peer"
7
ggio "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/io"
8
inet "gx/ipfs/QmahYsGWry85Y7WUe2SX5G4JkH2zifEQAUtJVLZ24aC9DF/go-libp2p-net"
8
- dhtpb "gx/ipfs/QmcKxeQomXUjo54VwisTiXeic5FFBknwUPtT7yRWvmPD1D/go-libp2p-kad-dht/pb"
9
)
10
11
// RequestHandler handles routing requests locally
routing/supernode/proxy/standard.go
+3
-3
@@ -5,14 +5,14 @@ import (
5
"errors"
6
7
pstore "gx/ipfs/QmPgDWmTmuzvP7QE5zwo1TmjbJme9pmZHNujB2453jkCTr/go-libp2p-peerstore"
8
- host "gx/ipfs/QmRNyPNJGNCaZyYonJj7owciWTsMd9gRfEKmZY3o6xwN3h/go-libp2p-host"
8
+ dhtpb "gx/ipfs/QmSFNexSqAnJKGfDwKnGx2sGB1EtLwsNQ586u18UkVLjAy/go-libp2p-kad-dht/pb"
9
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
10
loggables "gx/ipfs/QmT4PgCNdv73hnFAqzHqwW44q7M9PWpykSswHDxndquZbc/go-libp2p-loggables"
11
+ kbucket "gx/ipfs/QmVU26BGUSt3LkbWmoH7dP16mNz5VVRg4hDmWZBHAkq97w/go-libp2p-kbucket"
12
+ host "gx/ipfs/QmW8Rgju5JrSMHP7RDNdiwwXyenRqAbtSaPfdQKQC7ZdH6/go-libp2p-host"
13
peer "gx/ipfs/QmXYjuNuxVzXKJCfWasQk1RqkhVLDM9jtUKhqc2WPQmFSB/go-libp2p-peer"
14
ggio "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/io"
15
inet "gx/ipfs/QmahYsGWry85Y7WUe2SX5G4JkH2zifEQAUtJVLZ24aC9DF/go-libp2p-net"
14
- kbucket "gx/ipfs/QmbiCMdwmmhif5axuGSHzYbPFGeKjLAuMY6JrGpVteHFsy/go-libp2p-kbucket"
15
- dhtpb "gx/ipfs/QmcKxeQomXUjo54VwisTiXeic5FFBknwUPtT7yRWvmPD1D/go-libp2p-kad-dht/pb"
16
)
17
18
const ProtocolSNR = "/ipfs/supernoderouting"
routing/supernode/server.go
+1
-1
@@ -9,11 +9,11 @@ import (
9
dshelp "github.com/ipfs/go-ipfs/thirdparty/ds-help"
10
11
pstore "gx/ipfs/QmPgDWmTmuzvP7QE5zwo1TmjbJme9pmZHNujB2453jkCTr/go-libp2p-peerstore"
12
+ dhtpb "gx/ipfs/QmSFNexSqAnJKGfDwKnGx2sGB1EtLwsNQ586u18UkVLjAy/go-libp2p-kad-dht/pb"
13
datastore "gx/ipfs/QmVSase1JP7cq9QkPT46oNwdp9pT6kBkG3oqS14y3QcZjG/go-datastore"
14
peer "gx/ipfs/QmXYjuNuxVzXKJCfWasQk1RqkhVLDM9jtUKhqc2WPQmFSB/go-libp2p-peer"
15
proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
16
pb "gx/ipfs/QmbxkgUceEcuSZ4ZdBA3x74VUDSSYjHYmmeEqkjxbtZ6Jg/go-libp2p-record/pb"
16
- dhtpb "gx/ipfs/QmcKxeQomXUjo54VwisTiXeic5FFBknwUPtT7yRWvmPD1D/go-libp2p-kad-dht/pb"
17
)
18
19
// Server handles routing queries using a database backend
routing/supernode/server_test.go
+1
-1
@@ -3,8 +3,8 @@ package supernode
3
import (
4
"testing"
5
6
+ dhtpb "gx/ipfs/QmSFNexSqAnJKGfDwKnGx2sGB1EtLwsNQ586u18UkVLjAy/go-libp2p-kad-dht/pb"
7
datastore "gx/ipfs/QmVSase1JP7cq9QkPT46oNwdp9pT6kBkG3oqS14y3QcZjG/go-datastore"
7
- dhtpb "gx/ipfs/QmcKxeQomXUjo54VwisTiXeic5FFBknwUPtT7yRWvmPD1D/go-libp2p-kad-dht/pb"
8
)
9
10
func TestPutProviderDoesntResultInDuplicates(t *testing.T) {
test/integration/addcat_test.go
+2
-2
@@ -16,11 +16,11 @@ 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"
19
"github.com/ipfs/go-ipfs/thirdparty/unit"
20
pstore "gx/ipfs/QmPgDWmTmuzvP7QE5zwo1TmjbJme9pmZHNujB2453jkCTr/go-libp2p-peerstore"
21
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
23
- mocknet "gx/ipfs/QmZPBrKq6S1fdYaRAzYZivJL12QkUqHwnNzF9wC8VXC4bo/go-libp2p/p2p/net/mock"
22
+ mocknet "gx/ipfs/QmXZ6XetFwaDNmszPCux9DaKqMykEJGDtWHSqprn94UXzM/go-libp2p/p2p/net/mock"
23
+ testutil "gx/ipfs/QmZJD56ZWLViJAVkvLc7xbbDerHzUMLr2X4fLRYfbxZWDN/go-testutil"
24
)
25
26
var log = logging.Logger("epictest")
test/integration/bench_cat_test.go
+2
-2
@@ -11,10 +11,10 @@ import (
11
"github.com/ipfs/go-ipfs/core"
12
coreunix "github.com/ipfs/go-ipfs/core/coreunix"
13
mock "github.com/ipfs/go-ipfs/core/mock"
14
- testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
14
"github.com/ipfs/go-ipfs/thirdparty/unit"
15
pstore "gx/ipfs/QmPgDWmTmuzvP7QE5zwo1TmjbJme9pmZHNujB2453jkCTr/go-libp2p-peerstore"
17
- mocknet "gx/ipfs/QmZPBrKq6S1fdYaRAzYZivJL12QkUqHwnNzF9wC8VXC4bo/go-libp2p/p2p/net/mock"
16
+ mocknet "gx/ipfs/QmXZ6XetFwaDNmszPCux9DaKqMykEJGDtWHSqprn94UXzM/go-libp2p/p2p/net/mock"
17
+ testutil "gx/ipfs/QmZJD56ZWLViJAVkvLc7xbbDerHzUMLr2X4fLRYfbxZWDN/go-testutil"
18
)
19
20
func BenchmarkCat1MB(b *testing.B) { benchmarkVarCat(b, unit.MB*1) }
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"
6
"github.com/ipfs/go-ipfs/thirdparty/unit"
7
+ testutil "gx/ipfs/QmZJD56ZWLViJAVkvLc7xbbDerHzUMLr2X4fLRYfbxZWDN/go-testutil"
8
)
9
10
func benchmarkAddCat(numBytes int64, conf testutil.LatencyConfig, b *testing.B) {
test/integration/bitswap_wo_routing_test.go
+1
-1
@@ -10,7 +10,7 @@ import (
10
11
context "context"
12
cid "gx/ipfs/QmTprEaAA2A9bst5XH7exuyi5KzNMK3SEDNN8rBDnKWcUS/go-cid"
13
- mocknet "gx/ipfs/QmZPBrKq6S1fdYaRAzYZivJL12QkUqHwnNzF9wC8VXC4bo/go-libp2p/p2p/net/mock"
13
+ mocknet "gx/ipfs/QmXZ6XetFwaDNmszPCux9DaKqMykEJGDtWHSqprn94UXzM/go-libp2p/p2p/net/mock"
14
)
15
16
func TestBitswapWithoutRouting(t *testing.T) {
test/integration/grandcentral_test.go
+3
-5
@@ -9,18 +9,16 @@ import (
9
"testing"
10
11
context "context"
12
- "gx/ipfs/QmVSase1JP7cq9QkPT46oNwdp9pT6kBkG3oqS14y3QcZjG/go-datastore"
13
- syncds "gx/ipfs/QmVSase1JP7cq9QkPT46oNwdp9pT6kBkG3oqS14y3QcZjG/go-datastore/sync"
12
13
core "github.com/ipfs/go-ipfs/core"
14
"github.com/ipfs/go-ipfs/core/corerouting"
15
"github.com/ipfs/go-ipfs/core/coreunix"
16
mock "github.com/ipfs/go-ipfs/core/mock"
17
ds2 "github.com/ipfs/go-ipfs/thirdparty/datastore2"
20
- testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
18
"github.com/ipfs/go-ipfs/thirdparty/unit"
19
pstore "gx/ipfs/QmPgDWmTmuzvP7QE5zwo1TmjbJme9pmZHNujB2453jkCTr/go-libp2p-peerstore"
23
- mocknet "gx/ipfs/QmZPBrKq6S1fdYaRAzYZivJL12QkUqHwnNzF9wC8VXC4bo/go-libp2p/p2p/net/mock"
20
+ mocknet "gx/ipfs/QmXZ6XetFwaDNmszPCux9DaKqMykEJGDtWHSqprn94UXzM/go-libp2p/p2p/net/mock"
21
+ testutil "gx/ipfs/QmZJD56ZWLViJAVkvLc7xbbDerHzUMLr2X4fLRYfbxZWDN/go-testutil"
22
)
23
24
func TestSupernodeBootstrappedAddCat(t *testing.T) {
@@ -89,7 +87,7 @@ func InitializeSupernodeNetwork(
87
Bandwidth: math.MaxInt32,
88
})
89
92
- routingDatastore := ds2.CloserWrap(syncds.MutexWrap(datastore.NewMapDatastore()))
90
+ routingDatastore := ds2.ThreadSafeCloserMapDatastore()
91
var servers []*core.IpfsNode
92
for i := 0; i < numServers; i++ {
93
bootstrap, err := core.NewNode(ctx, &core.BuildCfg{
test/integration/three_legged_cat_test.go
+2
-2
@@ -13,10 +13,10 @@ 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"
16
"github.com/ipfs/go-ipfs/thirdparty/unit"
17
pstore "gx/ipfs/QmPgDWmTmuzvP7QE5zwo1TmjbJme9pmZHNujB2453jkCTr/go-libp2p-peerstore"
19
- mocknet "gx/ipfs/QmZPBrKq6S1fdYaRAzYZivJL12QkUqHwnNzF9wC8VXC4bo/go-libp2p/p2p/net/mock"
18
+ mocknet "gx/ipfs/QmXZ6XetFwaDNmszPCux9DaKqMykEJGDtWHSqprn94UXzM/go-libp2p/p2p/net/mock"
19
+ testutil "gx/ipfs/QmZJD56ZWLViJAVkvLc7xbbDerHzUMLr2X4fLRYfbxZWDN/go-testutil"
20
)
21
22
func TestThreeLeggedCatTransfer(t *testing.T) {
test/supernode_client/main.go
+1
-3
@@ -24,8 +24,6 @@ import (
24
ds2 "github.com/ipfs/go-ipfs/thirdparty/datastore2"
25
"github.com/ipfs/go-ipfs/thirdparty/ipfsaddr"
26
unit "github.com/ipfs/go-ipfs/thirdparty/unit"
27
- "gx/ipfs/QmVSase1JP7cq9QkPT46oNwdp9pT6kBkG3oqS14y3QcZjG/go-datastore"
28
- syncds "gx/ipfs/QmVSase1JP7cq9QkPT46oNwdp9pT6kBkG3oqS14y3QcZjG/go-datastore/sync"
27
28
context "context"
29
pstore "gx/ipfs/QmPgDWmTmuzvP7QE5zwo1TmjbJme9pmZHNujB2453jkCTr/go-libp2p-peerstore"
@@ -180,7 +178,7 @@ func runFileCattingWorker(ctx context.Context, n *core.IpfsNode) error {
178
}
179
180
r := &repo.Mock{
183
- D: ds2.CloserWrap(syncds.MutexWrap(datastore.NewMapDatastore())),
181
+ D: ds2.ThreadSafeCloserMapDatastore(),
182
C: *conf,
183
}
184
dummy, err := core.NewNode(ctx, &core.BuildCfg{
thirdparty/datastore2/datastore_closer.go
+5
@@ -4,6 +4,7 @@ import (
4
"io"
5
6
"gx/ipfs/QmVSase1JP7cq9QkPT46oNwdp9pT6kBkG3oqS14y3QcZjG/go-datastore"
7
+ syncds "gx/ipfs/QmVSase1JP7cq9QkPT46oNwdp9pT6kBkG3oqS14y3QcZjG/go-datastore/sync"
8
)
9
10
type ThreadSafeDatastoreCloser interface {
@@ -17,6 +18,10 @@ func CloserWrap(ds datastore.ThreadSafeDatastore) ThreadSafeDatastoreCloser {
18
return &datastoreCloserWrapper{ds}
19
}
20
21
+func ThreadSafeCloserMapDatastore() ThreadSafeDatastoreCloser {
22
+ return CloserWrap(syncds.MutexWrap(datastore.NewMapDatastore()))
23
+}
24
+
25
type datastoreCloserWrapper struct {
26
datastore.ThreadSafeDatastore
27
}
thirdparty/ipfsaddr/ipfsaddr.go
+1
-1
@@ -6,9 +6,9 @@ import (
6
ma "gx/ipfs/QmXY77cVe7rVRQXZZQRioukUM7aRW3BTcAgJe12MCtb3Ji/go-multiaddr"
7
8
path "github.com/ipfs/go-ipfs/path"
9
- circuit "gx/ipfs/QmSC7288aesJAC3BQ4Duy6Pk2CMfQWL7cr5t9SV4HBmKFT/go-libp2p-circuit"
9
logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
10
peer "gx/ipfs/QmXYjuNuxVzXKJCfWasQk1RqkhVLDM9jtUKhqc2WPQmFSB/go-libp2p-peer"
11
+ circuit "gx/ipfs/QmbVTkb8ihJNudRL4Vf9wjxMAapWxYdehrS7XBij31AGKM/go-libp2p-circuit"
12
)
13
14
var log = logging.Logger("ipfsaddr")
thirdparty/testutil/ci/ci.go
deleted
-46
@@ -1,46 +0,0 @@
1
-// Package ci implements some helper functions to use during
2
-// tests. Many times certain facilities are not available, or tests
3
-// must run differently.
4
-package ci
5
-
6
-import (
7
- "os"
8
-
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
13
-// the type system.
14
-type EnvVar string
15
-
16
-// Environment variables that TravisCI uses.
17
-const (
18
- VarCI EnvVar = "CI"
19
- VarNoFuse EnvVar = "TEST_NO_FUSE"
20
- VarVerbose EnvVar = "TEST_VERBOSE"
21
-)
22
-
23
-// IsRunning attempts to determine whether this process is
24
-// running on CI. This is done by checking any of:
25
-//
26
-// CI=true
27
-// travis.IsRunning()
28
-//
29
-func IsRunning() bool {
30
- return os.Getenv(string(VarCI)) == "true" || travis.IsRunning()
31
-}
32
-
33
-// Env returns the value of a CI env variable.
34
-func Env(v EnvVar) string {
35
- return os.Getenv(string(v))
36
-}
37
-
38
-// Returns whether FUSE is explicitly disabled wiht TEST_NO_FUSE.
39
-func NoFuse() bool {
40
- return os.Getenv(string(VarNoFuse)) == "1"
41
-}
42
-
43
-// Returns whether TEST_VERBOSE is enabled.
44
-func Verbose() bool {
45
- return os.Getenv(string(VarVerbose)) == "1"
46
-}
thirdparty/testutil/ci/travis/travis.go
deleted
-57
@@ -1,57 +0,0 @@
1
-// Package travis implements some helper functions to use during
2
-// tests. Many times certain facilities are not available, or tests
3
-// must run differently.
4
-package travis
5
-
6
-import "os"
7
-
8
-// EnvVar is a type to use travis-only env var names with
9
-// the type system.
10
-type EnvVar string
11
-
12
-// Environment variables that TravisCI uses.
13
-const (
14
- VarCI EnvVar = "CI"
15
- VarTravis EnvVar = "TRAVIS"
16
- VarBranch EnvVar = "TRAVIS_BRANCH"
17
- VarBuildDir EnvVar = "TRAVIS_BUILD_DIR"
18
- VarBuildId EnvVar = "TRAVIS_BUILD_ID"
19
- VarBuildNumber EnvVar = "TRAVIS_BUILD_NUMBER"
20
- VarCommit EnvVar = "TRAVIS_COMMIT"
21
- VarCommitRange EnvVar = "TRAVIS_COMMIT_RANGE"
22
- VarJobId EnvVar = "TRAVIS_JOB_ID"
23
- VarJobNumber EnvVar = "TRAVIS_JOB_NUMBER"
24
- VarPullRequest EnvVar = "TRAVIS_PULL_REQUEST"
25
- VarSecureEnvVars EnvVar = "TRAVIS_SECURE_ENV_VARS"
26
- VarRepoSlug EnvVar = "TRAVIS_REPO_SLUG"
27
- VarOsName EnvVar = "TRAVIS_OS_NAME"
28
- VarTag EnvVar = "TRAVIS_TAG"
29
- VarGoVersion EnvVar = "TRAVIS_GO_VERSION"
30
-)
31
-
32
-// IsRunning attempts to determine whether this process is
33
-// running on Travis-CI. This is done by checking ALL of the
34
-// following env vars are set:
35
-//
36
-// CI=true
37
-// TRAVIS=true
38
-//
39
-// NOTE: cannot just check CI.
40
-func IsRunning() bool {
41
- return Env(VarCI) == "true" && Env(VarTravis) == "true"
42
-}
43
-
44
-// Env returns the value of a travis env variable.
45
-func Env(v EnvVar) string {
46
- return os.Getenv(string(v))
47
-}
48
-
49
-// JobId returns the travis JOB_ID of this build.
50
-func JobId() string {
51
- return Env(VarJobId)
52
-}
53
-
54
-// JobNumber returns the travis JOB_NUMBER of this build.
55
-func JobNumber() string {
56
- return Env(VarJobNumber)
57
-}
thirdparty/testutil/ci/travis/travis_test.go
deleted
-13
@@ -1,13 +0,0 @@
1
-package travis
2
-
3
-import (
4
- "os"
5
- "testing"
6
-)
7
-
8
-func TestIsRunning(t *testing.T) {
9
- tr := os.Getenv("TRAVIS") == "true" && os.Getenv("CI") == "true"
10
- if tr != IsRunning() {
11
- t.Error("IsRunning() does not match TRAVIS && CI env var check")
12
- }
13
-}
thirdparty/testutil/datastore.go
deleted
-11
@@ -1,11 +0,0 @@
1
-package testutil
2
-
3
-import (
4
- ds2 "github.com/ipfs/go-ipfs/thirdparty/datastore2"
5
- "gx/ipfs/QmVSase1JP7cq9QkPT46oNwdp9pT6kBkG3oqS14y3QcZjG/go-datastore"
6
- syncds "gx/ipfs/QmVSase1JP7cq9QkPT46oNwdp9pT6kBkG3oqS14y3QcZjG/go-datastore/sync"
7
-)
8
-
9
-func ThreadSafeCloserMapDatastore() ds2.ThreadSafeDatastoreCloser {
10
- return ds2.CloserWrap(syncds.MutexWrap(datastore.NewMapDatastore()))
11
-}
thirdparty/testutil/gen.go
deleted
-165
@@ -1,165 +0,0 @@
1
-package testutil
2
-
3
-import (
4
- "bytes"
5
- "errors"
6
- "fmt"
7
- "io"
8
- "sync"
9
- "testing"
10
-
11
- u "gx/ipfs/QmSU6eubNdhXjFBJBSksTp8kv8YRub8mGAPv8tVJHmL2EU/go-ipfs-util"
12
- cid "gx/ipfs/QmTprEaAA2A9bst5XH7exuyi5KzNMK3SEDNN8rBDnKWcUS/go-cid"
13
- peer "gx/ipfs/QmXYjuNuxVzXKJCfWasQk1RqkhVLDM9jtUKhqc2WPQmFSB/go-libp2p-peer"
14
- ci "gx/ipfs/QmaPbCnUMBohSGo3KnxEa2bHqyJVVeEEcwtqJAYxerieBo/go-libp2p-crypto"
15
-
16
- ma "gx/ipfs/QmXY77cVe7rVRQXZZQRioukUM7aRW3BTcAgJe12MCtb3Ji/go-multiaddr"
17
-)
18
-
19
-// ZeroLocalTCPAddress is the "zero" tcp local multiaddr. This means:
20
-// /ip4/127.0.0.1/tcp/0
21
-var ZeroLocalTCPAddress ma.Multiaddr
22
-
23
-func init() {
24
- // initialize ZeroLocalTCPAddress
25
- maddr, err := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/0")
26
- if err != nil {
27
- panic(err)
28
- }
29
- ZeroLocalTCPAddress = maddr
30
-}
31
-
32
-func RandTestKeyPair(bits int) (ci.PrivKey, ci.PubKey, error) {
33
- return ci.GenerateKeyPairWithReader(ci.RSA, bits, u.NewTimeSeededRand())
34
-}
35
-
36
-func SeededTestKeyPair(seed int64) (ci.PrivKey, ci.PubKey, error) {
37
- return ci.GenerateKeyPairWithReader(ci.RSA, 512, u.NewSeededRand(seed))
38
-}
39
-
40
-// RandPeerID generates random "valid" peer IDs. it does not NEED to generate
41
-// keys because it is as if we lost the key right away. fine to read randomness
42
-// and hash it. to generate proper keys and corresponding PeerID, use:
43
-// sk, pk, _ := testutil.RandKeyPair()
44
-// id, _ := peer.IDFromPublicKey(pk)
45
-func RandPeerID() (peer.ID, error) {
46
- buf := make([]byte, 16)
47
- if _, err := io.ReadFull(u.NewTimeSeededRand(), buf); err != nil {
48
- return "", err
49
- }
50
- h := u.Hash(buf)
51
- return peer.ID(h), nil
52
-}
53
-
54
-func RandCidV0() (*cid.Cid, error) {
55
- buf := make([]byte, 16)
56
- if _, err := io.ReadFull(u.NewTimeSeededRand(), buf); err != nil {
57
- return &cid.Cid{}, err
58
- }
59
- return cid.NewCidV0(buf), nil
60
-}
61
-
62
-func RandPeerIDFatal(t testing.TB) peer.ID {
63
- p, err := RandPeerID()
64
- if err != nil {
65
- t.Fatal(err)
66
- }
67
- return p
68
-}
69
-
70
-// RandLocalTCPAddress returns a random multiaddr. it suppresses errors
71
-// for nice composability-- do check the address isn't nil.
72
-//
73
-// NOTE: for real network tests, use ZeroLocalTCPAddress so the kernel
74
-// assigns an unused TCP port. otherwise you may get clashes. This
75
-// function remains here so that p2p/net/mock (which does not touch the
76
-// real network) can assign different addresses to peers.
77
-func RandLocalTCPAddress() ma.Multiaddr {
78
-
79
- // chances are it will work out, but it **might** fail if the port is in use
80
- // most ports above 10000 aren't in use by long running processes, so yay.
81
- // (maybe there should be a range of "loopback" ports that are guaranteed
82
- // to be open for the process, but naturally can only talk to self.)
83
-
84
- lastPort.Lock()
85
- if lastPort.port == 0 {
86
- lastPort.port = 10000 + SeededRand.Intn(50000)
87
- }
88
- port := lastPort.port
89
- lastPort.port++
90
- lastPort.Unlock()
91
-
92
- addr := fmt.Sprintf("/ip4/127.0.0.1/tcp/%d", port)
93
- maddr, _ := ma.NewMultiaddr(addr)
94
- return maddr
95
-}
96
-
97
-var lastPort = struct {
98
- port int
99
- sync.Mutex
100
-}{}
101
-
102
-// PeerNetParams is a struct to bundle together the four things
103
-// you need to run a connection with a peer: id, 2keys, and addr.
104
-type PeerNetParams struct {
105
- ID peer.ID
106
- PrivKey ci.PrivKey
107
- PubKey ci.PubKey
108
- Addr ma.Multiaddr
109
-}
110
-
111
-func (p *PeerNetParams) checkKeys() error {
112
- if !p.ID.MatchesPrivateKey(p.PrivKey) {
113
- return errors.New("p.ID does not match p.PrivKey")
114
- }
115
-
116
- if !p.ID.MatchesPublicKey(p.PubKey) {
117
- return errors.New("p.ID does not match p.PubKey")
118
- }
119
-
120
- buf := new(bytes.Buffer)
121
- buf.Write([]byte("hello world. this is me, I swear."))
122
- b := buf.Bytes()
123
-
124
- sig, err := p.PrivKey.Sign(b)
125
- if err != nil {
126
- return fmt.Errorf("sig signing failed: %s", err)
127
- }
128
-
129
- sigok, err := p.PubKey.Verify(b, sig)
130
- if err != nil {
131
- return fmt.Errorf("sig verify failed: %s", err)
132
- }
133
- if !sigok {
134
- return fmt.Errorf("sig verify failed: sig invalid")
135
- }
136
-
137
- return nil // ok. move along.
138
-}
139
-
140
-func RandPeerNetParamsOrFatal(t *testing.T) PeerNetParams {
141
- p, err := RandPeerNetParams()
142
- if err != nil {
143
- t.Fatal(err)
144
- return PeerNetParams{} // TODO return nil
145
- }
146
- return *p
147
-}
148
-
149
-func RandPeerNetParams() (*PeerNetParams, error) {
150
- var p PeerNetParams
151
- var err error
152
- p.Addr = ZeroLocalTCPAddress
153
- p.PrivKey, p.PubKey, err = RandTestKeyPair(512)
154
- if err != nil {
155
- return nil, err
156
- }
157
- p.ID, err = peer.IDFromPublicKey(p.PubKey)
158
- if err != nil {
159
- return nil, err
160
- }
161
- if err := p.checkKeys(); err != nil {
162
- return nil, err
163
- }
164
- return &p, nil
165
-}
thirdparty/testutil/identity.go
deleted
-55
@@ -1,55 +0,0 @@
1
-package testutil
2
-
3
-import (
4
- "testing"
5
-
6
- ma "gx/ipfs/QmXY77cVe7rVRQXZZQRioukUM7aRW3BTcAgJe12MCtb3Ji/go-multiaddr"
7
- peer "gx/ipfs/QmXYjuNuxVzXKJCfWasQk1RqkhVLDM9jtUKhqc2WPQmFSB/go-libp2p-peer"
8
- ci "gx/ipfs/QmaPbCnUMBohSGo3KnxEa2bHqyJVVeEEcwtqJAYxerieBo/go-libp2p-crypto"
9
-)
10
-
11
-type Identity interface {
12
- Address() ma.Multiaddr
13
- ID() peer.ID
14
- PrivateKey() ci.PrivKey
15
- PublicKey() ci.PubKey
16
-}
17
-
18
-// TODO add a cheaper way to generate identities
19
-
20
-func RandIdentity() (Identity, error) {
21
- p, err := RandPeerNetParams()
22
- if err != nil {
23
- return nil, err
24
- }
25
- return &identity{*p}, nil
26
-}
27
-
28
-func RandIdentityOrFatal(t *testing.T) Identity {
29
- p, err := RandPeerNetParams()
30
- if err != nil {
31
- t.Fatal(err)
32
- }
33
- return &identity{*p}
34
-}
35
-
36
-// identity is a temporary shim to delay binding of PeerNetParams.
37
-type identity struct {
38
- PeerNetParams
39
-}
40
-
41
-func (p *identity) ID() peer.ID {
42
- return p.PeerNetParams.ID
43
-}
44
-
45
-func (p *identity) Address() ma.Multiaddr {
46
- return p.Addr
47
-}
48
-
49
-func (p *identity) PrivateKey() ci.PrivKey {
50
- return p.PrivKey
51
-}
52
-
53
-func (p *identity) PublicKey() ci.PubKey {
54
- return p.PubKey
55
-}
thirdparty/testutil/latency_config.go
deleted
-48
@@ -1,48 +0,0 @@
1
-package testutil
2
-
3
-import "time"
4
-
5
-type LatencyConfig struct {
6
- BlockstoreLatency time.Duration
7
- NetworkLatency time.Duration
8
- RoutingLatency time.Duration
9
-}
10
-
11
-func (c LatencyConfig) AllInstantaneous() LatencyConfig {
12
- // Could use a zero value but whatever. Consistency of interface
13
- c.NetworkLatency = 0
14
- c.RoutingLatency = 0
15
- c.BlockstoreLatency = 0
16
- return c
17
-}
18
-
19
-func (c LatencyConfig) NetworkNYtoSF() LatencyConfig {
20
- c.NetworkLatency = 20 * time.Millisecond
21
- return c
22
-}
23
-
24
-func (c LatencyConfig) NetworkIntraDatacenter2014() LatencyConfig {
25
- c.NetworkLatency = 250 * time.Microsecond
26
- return c
27
-}
28
-
29
-func (c LatencyConfig) BlockstoreFastSSD2014() LatencyConfig {
30
- const iops = 100000
31
- c.BlockstoreLatency = (1 / iops) * time.Second
32
- return c
33
-}
34
-
35
-func (c LatencyConfig) BlockstoreSlowSSD2014() LatencyConfig {
36
- c.BlockstoreLatency = 150 * time.Microsecond
37
- return c
38
-}
39
-
40
-func (c LatencyConfig) Blockstore7200RPM() LatencyConfig {
41
- c.BlockstoreLatency = 8 * time.Millisecond
42
- return c
43
-}
44
-
45
-func (c LatencyConfig) RoutingSlow() LatencyConfig {
46
- c.RoutingLatency = 200 * time.Millisecond
47
- return c
48
-}
thirdparty/testutil/rand.go
deleted
-36
@@ -1,36 +0,0 @@
1
-package testutil
2
-
3
-import (
4
- "math/rand"
5
- "sync"
6
- "time"
7
-)
8
-
9
-var SeededRand *rand.Rand
10
-
11
-func init() {
12
- SeededRand = NewSeededRand(time.Now().UTC().UnixNano())
13
-}
14
-
15
-func NewSeededRand(seed int64) *rand.Rand {
16
- src := rand.NewSource(seed)
17
- return rand.New(&LockedRandSource{src: src})
18
-}
19
-
20
-type LockedRandSource struct {
21
- lk sync.Mutex
22
- src rand.Source
23
-}
24
-
25
-func (r *LockedRandSource) Int63() (n int64) {
26
- r.lk.Lock()
27
- n = r.src.Int63()
28
- r.lk.Unlock()
29
- return
30
-}
31
-
32
-func (r *LockedRandSource) Seed(seed int64) {
33
- r.lk.Lock()
34
- r.src.Seed(seed)
35
- r.lk.Unlock()
36
-}