move generic packages to thirdparty (see thirdparty/README.md)
Brian Tiger Chow committed
Jan 18, 2015 at 12:31 UTC
884143bf9c3078c17f44b968351e023821907204
56 files changed
+49
-47
blocks/blockstore/blockstore.go
+1
-1
@@ -12,8 +12,8 @@ import (
12
mh "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multihash"
13
14
blocks "github.com/jbenet/go-ipfs/blocks"
15
+ eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
16
u "github.com/jbenet/go-ipfs/util"
16
- eventlog "github.com/jbenet/go-ipfs/util/eventlog"
17
)
18
19
var log = eventlog.Logger("blockstore")
blockservice/mock.go
+1
-1
@@ -6,7 +6,7 @@ import (
6
bitswap "github.com/jbenet/go-ipfs/exchange/bitswap"
7
tn "github.com/jbenet/go-ipfs/exchange/bitswap/testnet"
8
mockrouting "github.com/jbenet/go-ipfs/routing/mock"
9
- delay "github.com/jbenet/go-ipfs/util/delay"
9
+ delay "github.com/jbenet/go-ipfs/thirdparty/delay"
10
)
11
12
// Mocks returns |n| connected mock Blockservices
cmd/ipfs/main.go
+1
-1
@@ -23,10 +23,10 @@ import (
23
repo "github.com/jbenet/go-ipfs/repo"
24
config "github.com/jbenet/go-ipfs/repo/config"
25
fsrepo "github.com/jbenet/go-ipfs/repo/fsrepo"
26
+ eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
27
updates "github.com/jbenet/go-ipfs/updates"
28
u "github.com/jbenet/go-ipfs/util"
29
"github.com/jbenet/go-ipfs/util/debugerror"
29
- eventlog "github.com/jbenet/go-ipfs/util/eventlog"
30
)
31
32
// log is the command logger
cmd/seccat/util.go
+1
-1
@@ -5,7 +5,7 @@ import (
5
"io"
6
"os"
7
8
- eventlog "github.com/jbenet/go-ipfs/util/eventlog"
8
+ eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
9
)
10
11
var log = eventlog.Logger("seccat")
core/bootstrap.go
+1
-1
@@ -11,8 +11,8 @@ import (
11
peer "github.com/jbenet/go-ipfs/p2p/peer"
12
config "github.com/jbenet/go-ipfs/repo/config"
13
dht "github.com/jbenet/go-ipfs/routing/dht"
14
+ math2 "github.com/jbenet/go-ipfs/thirdparty/math2"
15
lgbl "github.com/jbenet/go-ipfs/util/eventlog/loggables"
15
- math2 "github.com/jbenet/go-ipfs/util/math2"
16
17
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
18
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
core/core.go
+1
-1
@@ -35,7 +35,7 @@ import (
35
util "github.com/jbenet/go-ipfs/util"
36
ds2 "github.com/jbenet/go-ipfs/util/datastore2"
37
debugerror "github.com/jbenet/go-ipfs/util/debugerror"
38
- eventlog "github.com/jbenet/go-ipfs/util/eventlog"
38
+ eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
39
lgbl "github.com/jbenet/go-ipfs/util/eventlog/loggables"
40
)
41
exchange/bitswap/bitswap.go
+2
-2
@@ -18,10 +18,10 @@ import (
18
notifications "github.com/jbenet/go-ipfs/exchange/bitswap/notifications"
19
wantlist "github.com/jbenet/go-ipfs/exchange/bitswap/wantlist"
20
peer "github.com/jbenet/go-ipfs/p2p/peer"
21
+ "github.com/jbenet/go-ipfs/thirdparty/delay"
22
+ eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
23
u "github.com/jbenet/go-ipfs/util"
24
errors "github.com/jbenet/go-ipfs/util/debugerror"
23
- "github.com/jbenet/go-ipfs/util/delay"
24
- eventlog "github.com/jbenet/go-ipfs/util/eventlog"
25
pset "github.com/jbenet/go-ipfs/util/peerset" // TODO move this to peerstore
26
)
27
exchange/bitswap/bitswap_test.go
+1
-1
@@ -13,8 +13,8 @@ import (
13
tn "github.com/jbenet/go-ipfs/exchange/bitswap/testnet"
14
p2ptestutil "github.com/jbenet/go-ipfs/p2p/test/util"
15
mockrouting "github.com/jbenet/go-ipfs/routing/mock"
16
+ delay "github.com/jbenet/go-ipfs/thirdparty/delay"
17
u "github.com/jbenet/go-ipfs/util"
17
- delay "github.com/jbenet/go-ipfs/util/delay"
18
)
19
20
// FIXME the tests are really sensitive to the network delay. fix them to work
exchange/bitswap/decision/engine.go
+1
-1
@@ -8,7 +8,7 @@ import (
8
bsmsg "github.com/jbenet/go-ipfs/exchange/bitswap/message"
9
wl "github.com/jbenet/go-ipfs/exchange/bitswap/wantlist"
10
peer "github.com/jbenet/go-ipfs/p2p/peer"
11
- eventlog "github.com/jbenet/go-ipfs/util/eventlog"
11
+ eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
12
)
13
14
// TODO consider taking responsibility for other types of requests. For
exchange/bitswap/network/ipfs_impl.go
+1
-1
@@ -8,8 +8,8 @@ import (
8
inet "github.com/jbenet/go-ipfs/p2p/net"
9
peer "github.com/jbenet/go-ipfs/p2p/peer"
10
routing "github.com/jbenet/go-ipfs/routing"
11
+ eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
12
util "github.com/jbenet/go-ipfs/util"
12
- eventlog "github.com/jbenet/go-ipfs/util/eventlog"
13
)
14
15
var log = eventlog.Logger("bitswap_network")
exchange/bitswap/testnet/network_test.go
+1
-1
@@ -10,7 +10,7 @@ import (
10
bsnet "github.com/jbenet/go-ipfs/exchange/bitswap/network"
11
peer "github.com/jbenet/go-ipfs/p2p/peer"
12
mockrouting "github.com/jbenet/go-ipfs/routing/mock"
13
- delay "github.com/jbenet/go-ipfs/util/delay"
13
+ delay "github.com/jbenet/go-ipfs/thirdparty/delay"
14
testutil "github.com/jbenet/go-ipfs/util/testutil"
15
)
16
exchange/bitswap/testnet/virtual.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
peer "github.com/jbenet/go-ipfs/p2p/peer"
10
routing "github.com/jbenet/go-ipfs/routing"
11
mockrouting "github.com/jbenet/go-ipfs/routing/mock"
12
+ delay "github.com/jbenet/go-ipfs/thirdparty/delay"
13
util "github.com/jbenet/go-ipfs/util"
13
- delay "github.com/jbenet/go-ipfs/util/delay"
14
testutil "github.com/jbenet/go-ipfs/util/testutil"
15
)
16
exchange/bitswap/testutils.go
+1
-1
@@ -11,8 +11,8 @@ import (
11
tn "github.com/jbenet/go-ipfs/exchange/bitswap/testnet"
12
peer "github.com/jbenet/go-ipfs/p2p/peer"
13
p2ptestutil "github.com/jbenet/go-ipfs/p2p/test/util"
14
+ delay "github.com/jbenet/go-ipfs/thirdparty/delay"
15
datastore2 "github.com/jbenet/go-ipfs/util/datastore2"
15
- delay "github.com/jbenet/go-ipfs/util/delay"
16
testutil "github.com/jbenet/go-ipfs/util/testutil"
17
)
18
exchange/reprovide/reprovide.go
+1
-1
@@ -8,8 +8,8 @@ import (
8
9
blocks "github.com/jbenet/go-ipfs/blocks/blockstore"
10
routing "github.com/jbenet/go-ipfs/routing"
11
+ eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
12
debugerror "github.com/jbenet/go-ipfs/util/debugerror"
12
- eventlog "github.com/jbenet/go-ipfs/util/eventlog"
13
)
14
15
var log = eventlog.Logger("reprovider")
p2p/crypto/secio/protocol.go
+1
-1
@@ -13,8 +13,8 @@ import (
13
ci "github.com/jbenet/go-ipfs/p2p/crypto"
14
pb "github.com/jbenet/go-ipfs/p2p/crypto/secio/internal/pb"
15
peer "github.com/jbenet/go-ipfs/p2p/peer"
16
+ eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
17
u "github.com/jbenet/go-ipfs/util"
17
- eventlog "github.com/jbenet/go-ipfs/util/eventlog"
18
)
19
20
var log = eventlog.Logger("secio")
p2p/host/basic/basic_host.go
+1
-1
@@ -3,7 +3,7 @@ package basichost
3
import (
4
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
5
6
- eventlog "github.com/jbenet/go-ipfs/util/eventlog"
6
+ eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
7
8
inet "github.com/jbenet/go-ipfs/p2p/net"
9
peer "github.com/jbenet/go-ipfs/p2p/peer"
p2p/host/host.go
+1
-2
@@ -3,11 +3,10 @@ package host
3
import (
4
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
5
6
- eventlog "github.com/jbenet/go-ipfs/util/eventlog"
7
-
6
inet "github.com/jbenet/go-ipfs/p2p/net"
7
peer "github.com/jbenet/go-ipfs/p2p/peer"
8
protocol "github.com/jbenet/go-ipfs/p2p/protocol"
9
+ eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
10
)
11
12
var log = eventlog.Logger("p2p/host")
p2p/net/conn/conn.go
+1
-1
@@ -13,8 +13,8 @@ import (
13
14
ic "github.com/jbenet/go-ipfs/p2p/crypto"
15
peer "github.com/jbenet/go-ipfs/p2p/peer"
16
+ eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
17
u "github.com/jbenet/go-ipfs/util"
17
- eventlog "github.com/jbenet/go-ipfs/util/eventlog"
18
)
19
20
var log = eventlog.Logger("conn")
p2p/net/mock/mock.go
+1
-1
@@ -1,7 +1,7 @@
1
package mocknet
2
3
import (
4
- eventlog "github.com/jbenet/go-ipfs/util/eventlog"
4
+ eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
5
6
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
7
)
p2p/net/swarm/addr/addr.go
+1
-1
@@ -3,7 +3,7 @@ package addrutil
3
import (
4
"fmt"
5
6
- eventlog "github.com/jbenet/go-ipfs/util/eventlog"
6
+ eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
7
8
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
9
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
p2p/net/swarm/swarm.go
+1
-1
@@ -9,7 +9,7 @@ import (
9
inet "github.com/jbenet/go-ipfs/p2p/net"
10
addrutil "github.com/jbenet/go-ipfs/p2p/net/swarm/addr"
11
peer "github.com/jbenet/go-ipfs/p2p/peer"
12
- eventlog "github.com/jbenet/go-ipfs/util/eventlog"
12
+ eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
13
14
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
15
ctxgroup "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup"
p2p/net/swarm/swarm_listen.go
+1
-1
@@ -10,7 +10,7 @@ import (
10
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
11
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
12
ps "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream"
13
- multierr "github.com/jbenet/go-ipfs/util/multierr"
13
+ multierr "github.com/jbenet/go-ipfs/thirdparty/multierr"
14
)
15
16
// Open listeners for each network the swarm should listen on
p2p/peer/queue/sync.go
+1
-1
@@ -4,7 +4,7 @@ import (
4
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
5
6
peer "github.com/jbenet/go-ipfs/p2p/peer"
7
- eventlog "github.com/jbenet/go-ipfs/util/eventlog"
7
+ eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
8
)
9
10
var log = eventlog.Logger("peerqueue")
p2p/protocol/identify/id.go
+2
-4
@@ -9,14 +9,12 @@ import (
9
semver "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/coreos/go-semver/semver"
10
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
11
12
- config "github.com/jbenet/go-ipfs/repo/config"
13
- eventlog "github.com/jbenet/go-ipfs/util/eventlog"
14
-
12
host "github.com/jbenet/go-ipfs/p2p/host"
13
inet "github.com/jbenet/go-ipfs/p2p/net"
14
protocol "github.com/jbenet/go-ipfs/p2p/protocol"
18
-
15
pb "github.com/jbenet/go-ipfs/p2p/protocol/identify/pb"
16
+ config "github.com/jbenet/go-ipfs/repo/config"
17
+ eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
18
)
19
20
var log = eventlog.Logger("net/identify")
p2p/protocol/mux.go
+1
-1
@@ -8,7 +8,7 @@ import (
8
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
9
10
inet "github.com/jbenet/go-ipfs/p2p/net"
11
- eventlog "github.com/jbenet/go-ipfs/util/eventlog"
11
+ eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
12
lgbl "github.com/jbenet/go-ipfs/util/eventlog/loggables"
13
)
14
p2p/protocol/relay/relay.go
+1
-1
@@ -10,7 +10,7 @@ import (
10
inet "github.com/jbenet/go-ipfs/p2p/net"
11
peer "github.com/jbenet/go-ipfs/p2p/peer"
12
protocol "github.com/jbenet/go-ipfs/p2p/protocol"
13
- eventlog "github.com/jbenet/go-ipfs/util/eventlog"
13
+ eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
14
)
15
16
var log = eventlog.Logger("p2p/protocol/relay")
p2p/protocol/relay/relay_test.go
+1
-1
@@ -8,7 +8,7 @@ import (
8
protocol "github.com/jbenet/go-ipfs/p2p/protocol"
9
relay "github.com/jbenet/go-ipfs/p2p/protocol/relay"
10
testutil "github.com/jbenet/go-ipfs/p2p/test/util"
11
- eventlog "github.com/jbenet/go-ipfs/util/eventlog"
11
+ eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
12
13
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
14
)
p2p/test/backpressure/backpressure_test.go
+1
-1
@@ -12,7 +12,7 @@ import (
12
peer "github.com/jbenet/go-ipfs/p2p/peer"
13
protocol "github.com/jbenet/go-ipfs/p2p/protocol"
14
testutil "github.com/jbenet/go-ipfs/p2p/test/util"
15
- eventlog "github.com/jbenet/go-ipfs/util/eventlog"
15
+ eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
16
17
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
18
)
p2p/test/reconnects/reconnect_test.go
+1
-1
@@ -13,7 +13,7 @@ import (
13
swarm "github.com/jbenet/go-ipfs/p2p/net/swarm"
14
protocol "github.com/jbenet/go-ipfs/p2p/protocol"
15
testutil "github.com/jbenet/go-ipfs/p2p/test/util"
16
- eventlog "github.com/jbenet/go-ipfs/util/eventlog"
16
+ eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
17
18
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
19
ps "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream"
p2p/test/util/key.go
+1
-1
@@ -5,8 +5,8 @@ import (
5
"io"
6
"testing"
7
8
+ eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
9
u "github.com/jbenet/go-ipfs/util"
9
- eventlog "github.com/jbenet/go-ipfs/util/eventlog"
10
testutil "github.com/jbenet/go-ipfs/util/testutil"
11
12
ic "github.com/jbenet/go-ipfs/p2p/crypto"
repo/fsrepo/component/datastore_test.go
+1
-1
@@ -5,7 +5,7 @@ import (
5
"path/filepath"
6
"testing"
7
8
- "github.com/jbenet/go-ipfs/repo/fsrepo/assert"
8
+ "github.com/jbenet/go-ipfs/thirdparty/assert"
9
)
10
11
// swap arg order
repo/fsrepo/fsrepo_test.go
+1
-1
@@ -7,7 +7,7 @@ import (
7
8
datastore "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
9
"github.com/jbenet/go-ipfs/repo/config"
10
- "github.com/jbenet/go-ipfs/repo/fsrepo/assert"
10
+ "github.com/jbenet/go-ipfs/thirdparty/assert"
11
)
12
13
// swap arg order
repo/logs.go
+1
-1
@@ -2,8 +2,8 @@ package repo
2
3
import (
4
config "github.com/jbenet/go-ipfs/repo/config"
5
+ eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
6
util "github.com/jbenet/go-ipfs/util"
6
- eventlog "github.com/jbenet/go-ipfs/util/eventlog"
7
)
8
9
func ConfigureEventLogger(config config.Logs) error {
routing/dht/dht.go
+1
-1
@@ -16,8 +16,8 @@ import (
16
routing "github.com/jbenet/go-ipfs/routing"
17
pb "github.com/jbenet/go-ipfs/routing/dht/pb"
18
kb "github.com/jbenet/go-ipfs/routing/kbucket"
19
+ "github.com/jbenet/go-ipfs/thirdparty/eventlog"
20
u "github.com/jbenet/go-ipfs/util"
20
- "github.com/jbenet/go-ipfs/util/eventlog"
21
22
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
23
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
routing/dht/pb/message.go
+1
-1
@@ -5,7 +5,7 @@ import (
5
6
inet "github.com/jbenet/go-ipfs/p2p/net"
7
peer "github.com/jbenet/go-ipfs/p2p/peer"
8
- eventlog "github.com/jbenet/go-ipfs/util/eventlog"
8
+ eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
9
)
10
11
var log = eventlog.Logger("dht.pb")
routing/dht/query.go
+1
-1
@@ -6,8 +6,8 @@ import (
6
peer "github.com/jbenet/go-ipfs/p2p/peer"
7
queue "github.com/jbenet/go-ipfs/p2p/peer/queue"
8
"github.com/jbenet/go-ipfs/routing"
9
+ eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
10
u "github.com/jbenet/go-ipfs/util"
10
- eventlog "github.com/jbenet/go-ipfs/util/eventlog"
11
pset "github.com/jbenet/go-ipfs/util/peerset"
12
todoctr "github.com/jbenet/go-ipfs/util/todocounter"
13
routing/mock/centralized_test.go
+1
-1
@@ -6,8 +6,8 @@ import (
6
7
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
8
peer "github.com/jbenet/go-ipfs/p2p/peer"
9
+ delay "github.com/jbenet/go-ipfs/thirdparty/delay"
10
u "github.com/jbenet/go-ipfs/util"
10
- delay "github.com/jbenet/go-ipfs/util/delay"
11
"github.com/jbenet/go-ipfs/util/testutil"
12
)
13
routing/mock/interface.go
+1
-1
@@ -9,8 +9,8 @@ import (
9
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
10
peer "github.com/jbenet/go-ipfs/p2p/peer"
11
routing "github.com/jbenet/go-ipfs/routing"
12
+ delay "github.com/jbenet/go-ipfs/thirdparty/delay"
13
u "github.com/jbenet/go-ipfs/util"
13
- delay "github.com/jbenet/go-ipfs/util/delay"
14
"github.com/jbenet/go-ipfs/util/testutil"
15
)
16
test/epictest/core.go
+2
-2
@@ -12,9 +12,9 @@ import (
12
host "github.com/jbenet/go-ipfs/p2p/host"
13
peer "github.com/jbenet/go-ipfs/p2p/peer"
14
dht "github.com/jbenet/go-ipfs/routing/dht"
15
+ delay "github.com/jbenet/go-ipfs/thirdparty/delay"
16
+ eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
17
"github.com/jbenet/go-ipfs/util/datastore2"
16
- delay "github.com/jbenet/go-ipfs/util/delay"
17
- eventlog "github.com/jbenet/go-ipfs/util/eventlog"
18
testutil "github.com/jbenet/go-ipfs/util/testutil"
19
)
20
thirdparty/README.md
new
+5
@@ -0,0 +1,5 @@
1
+thirdparty consists of Golang packages that contain no go-ipfs dependencies and
2
+may be vendored jbenet/go-ipfs at a later date.
3
+
4
+packages in under this directory _must not_ import packages under
5
+`jbenet/go-ipfs` that are not also under `thirdparty`.
thirdparty/assert/assert.go
renamed
thirdparty/delay/delay.go
renamed
thirdparty/eventlog/context.go
renamed
thirdparty/eventlog/context_test.go
renamed
thirdparty/eventlog/entry.go
renamed
thirdparty/eventlog/example_test.go
renamed
thirdparty/eventlog/log.go
renamed
thirdparty/eventlog/loggable.go
renamed
thirdparty/eventlog/metadata.go
renamed
thirdparty/eventlog/metadata_test.go
renamed
thirdparty/eventlog/option.go
renamed
thirdparty/eventlog/polite_json_formatter.go
renamed
thirdparty/math2/math2.go
renamed
thirdparty/multierr/multierr.go
renamed
util/datastore2/delayed.go
+1
-1
@@ -4,7 +4,7 @@ import (
4
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
5
dsq "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/query"
6
7
- delay "github.com/jbenet/go-ipfs/util/delay"
7
+ delay "github.com/jbenet/go-ipfs/thirdparty/delay"
8
)
9
10
func WithDelay(ds ds.Datastore, delay delay.D) ds.Datastore {
util/eventlog/loggables/loggables.go
+1
-1
@@ -9,7 +9,7 @@ package loggables
9
import (
10
"net"
11
12
- log "github.com/jbenet/go-ipfs/util/eventlog"
12
+ log "github.com/jbenet/go-ipfs/thirdparty/eventlog"
13
)
14
15
// NetConn returns an eventlog.Metadata with the conn addresses