From f54e0c74ab71c7ad8ce33acadb1f36b2b3df7fd4 Mon Sep 17 00:00:00 2001 From: Brian Tiger Chow Date: Sun, 18 Jan 2015 12:31:12 -0800 Subject: [PATCH] move generic packages to thirdparty (see thirdparty/README.md) --- crypto/secio/protocol.go | 2 +- host/basic/basic_host.go | 2 +- host/host.go | 3 +-- net/conn/conn.go | 2 +- net/mock/mock.go | 2 +- net/swarm/addr/addr.go | 2 +- net/swarm/swarm.go | 2 +- net/swarm/swarm_listen.go | 2 +- peer/queue/sync.go | 2 +- protocol/identify/id.go | 6 ++---- protocol/mux.go | 2 +- protocol/relay/relay.go | 2 +- protocol/relay/relay_test.go | 2 +- test/backpressure/backpressure_test.go | 2 +- test/reconnects/reconnect_test.go | 2 +- test/util/key.go | 2 +- 16 files changed, 17 insertions(+), 20 deletions(-) diff --git a/crypto/secio/protocol.go b/crypto/secio/protocol.go index 998e55913..5cbdc9d68 100644 --- a/crypto/secio/protocol.go +++ b/crypto/secio/protocol.go @@ -13,8 +13,8 @@ import ( ci "github.com/jbenet/go-ipfs/p2p/crypto" pb "github.com/jbenet/go-ipfs/p2p/crypto/secio/internal/pb" peer "github.com/jbenet/go-ipfs/p2p/peer" + eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog" u "github.com/jbenet/go-ipfs/util" - eventlog "github.com/jbenet/go-ipfs/util/eventlog" ) var log = eventlog.Logger("secio") diff --git a/host/basic/basic_host.go b/host/basic/basic_host.go index 6256ea2bd..944e9d6e1 100644 --- a/host/basic/basic_host.go +++ b/host/basic/basic_host.go @@ -3,7 +3,7 @@ package basichost import ( context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" - eventlog "github.com/jbenet/go-ipfs/util/eventlog" + eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog" inet "github.com/jbenet/go-ipfs/p2p/net" peer "github.com/jbenet/go-ipfs/p2p/peer" diff --git a/host/host.go b/host/host.go index 020322116..b98ada53c 100644 --- a/host/host.go +++ b/host/host.go @@ -3,11 +3,10 @@ package host import ( context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" - eventlog "github.com/jbenet/go-ipfs/util/eventlog" - inet "github.com/jbenet/go-ipfs/p2p/net" peer "github.com/jbenet/go-ipfs/p2p/peer" protocol "github.com/jbenet/go-ipfs/p2p/protocol" + eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog" ) var log = eventlog.Logger("p2p/host") diff --git a/net/conn/conn.go b/net/conn/conn.go index 65b12f23e..4692b1309 100644 --- a/net/conn/conn.go +++ b/net/conn/conn.go @@ -13,8 +13,8 @@ import ( ic "github.com/jbenet/go-ipfs/p2p/crypto" peer "github.com/jbenet/go-ipfs/p2p/peer" + eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog" u "github.com/jbenet/go-ipfs/util" - eventlog "github.com/jbenet/go-ipfs/util/eventlog" ) var log = eventlog.Logger("conn") diff --git a/net/mock/mock.go b/net/mock/mock.go index 5403358cb..eaeb16281 100644 --- a/net/mock/mock.go +++ b/net/mock/mock.go @@ -1,7 +1,7 @@ package mocknet import ( - eventlog "github.com/jbenet/go-ipfs/util/eventlog" + eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog" context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ) diff --git a/net/swarm/addr/addr.go b/net/swarm/addr/addr.go index bae6e8605..c1d3f22e0 100644 --- a/net/swarm/addr/addr.go +++ b/net/swarm/addr/addr.go @@ -3,7 +3,7 @@ package addrutil import ( "fmt" - eventlog "github.com/jbenet/go-ipfs/util/eventlog" + eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog" context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" diff --git a/net/swarm/swarm.go b/net/swarm/swarm.go index 5e3c667eb..f167dec4c 100644 --- a/net/swarm/swarm.go +++ b/net/swarm/swarm.go @@ -9,7 +9,7 @@ import ( inet "github.com/jbenet/go-ipfs/p2p/net" addrutil "github.com/jbenet/go-ipfs/p2p/net/swarm/addr" peer "github.com/jbenet/go-ipfs/p2p/peer" - eventlog "github.com/jbenet/go-ipfs/util/eventlog" + eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog" context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ctxgroup "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-ctxgroup" diff --git a/net/swarm/swarm_listen.go b/net/swarm/swarm_listen.go index 56c889a92..0e1e6b4ef 100644 --- a/net/swarm/swarm_listen.go +++ b/net/swarm/swarm_listen.go @@ -10,7 +10,7 @@ import ( context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ps "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream" - multierr "github.com/jbenet/go-ipfs/util/multierr" + multierr "github.com/jbenet/go-ipfs/thirdparty/multierr" ) // Open listeners for each network the swarm should listen on diff --git a/peer/queue/sync.go b/peer/queue/sync.go index 3d7aa68ad..cdbc4e415 100644 --- a/peer/queue/sync.go +++ b/peer/queue/sync.go @@ -4,7 +4,7 @@ import ( context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" peer "github.com/jbenet/go-ipfs/p2p/peer" - eventlog "github.com/jbenet/go-ipfs/util/eventlog" + eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog" ) var log = eventlog.Logger("peerqueue") diff --git a/protocol/identify/id.go b/protocol/identify/id.go index 15c7f1c5c..6065f0eec 100644 --- a/protocol/identify/id.go +++ b/protocol/identify/id.go @@ -9,14 +9,12 @@ import ( semver "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/coreos/go-semver/semver" ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" - config "github.com/jbenet/go-ipfs/repo/config" - eventlog "github.com/jbenet/go-ipfs/util/eventlog" - host "github.com/jbenet/go-ipfs/p2p/host" inet "github.com/jbenet/go-ipfs/p2p/net" protocol "github.com/jbenet/go-ipfs/p2p/protocol" - pb "github.com/jbenet/go-ipfs/p2p/protocol/identify/pb" + config "github.com/jbenet/go-ipfs/repo/config" + eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog" ) var log = eventlog.Logger("net/identify") diff --git a/protocol/mux.go b/protocol/mux.go index a4c0f302a..6ba99e4f2 100644 --- a/protocol/mux.go +++ b/protocol/mux.go @@ -8,7 +8,7 @@ import ( context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" inet "github.com/jbenet/go-ipfs/p2p/net" - eventlog "github.com/jbenet/go-ipfs/util/eventlog" + eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog" lgbl "github.com/jbenet/go-ipfs/util/eventlog/loggables" ) diff --git a/protocol/relay/relay.go b/protocol/relay/relay.go index 4e4f0ba22..2cd1af3c6 100644 --- a/protocol/relay/relay.go +++ b/protocol/relay/relay.go @@ -10,7 +10,7 @@ import ( inet "github.com/jbenet/go-ipfs/p2p/net" peer "github.com/jbenet/go-ipfs/p2p/peer" protocol "github.com/jbenet/go-ipfs/p2p/protocol" - eventlog "github.com/jbenet/go-ipfs/util/eventlog" + eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog" ) var log = eventlog.Logger("p2p/protocol/relay") diff --git a/protocol/relay/relay_test.go b/protocol/relay/relay_test.go index 14145044e..91d05d97a 100644 --- a/protocol/relay/relay_test.go +++ b/protocol/relay/relay_test.go @@ -8,7 +8,7 @@ import ( protocol "github.com/jbenet/go-ipfs/p2p/protocol" relay "github.com/jbenet/go-ipfs/p2p/protocol/relay" testutil "github.com/jbenet/go-ipfs/p2p/test/util" - eventlog "github.com/jbenet/go-ipfs/util/eventlog" + eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog" context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ) diff --git a/test/backpressure/backpressure_test.go b/test/backpressure/backpressure_test.go index 946b87b3a..3d6dfd29c 100644 --- a/test/backpressure/backpressure_test.go +++ b/test/backpressure/backpressure_test.go @@ -12,7 +12,7 @@ import ( peer "github.com/jbenet/go-ipfs/p2p/peer" protocol "github.com/jbenet/go-ipfs/p2p/protocol" testutil "github.com/jbenet/go-ipfs/p2p/test/util" - eventlog "github.com/jbenet/go-ipfs/util/eventlog" + eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog" context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ) diff --git a/test/reconnects/reconnect_test.go b/test/reconnects/reconnect_test.go index fee269bbd..9dcd0ed1b 100644 --- a/test/reconnects/reconnect_test.go +++ b/test/reconnects/reconnect_test.go @@ -13,7 +13,7 @@ import ( swarm "github.com/jbenet/go-ipfs/p2p/net/swarm" protocol "github.com/jbenet/go-ipfs/p2p/protocol" testutil "github.com/jbenet/go-ipfs/p2p/test/util" - eventlog "github.com/jbenet/go-ipfs/util/eventlog" + eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog" context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context" ps "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream" diff --git a/test/util/key.go b/test/util/key.go index fc4f3af4e..ec17430a4 100644 --- a/test/util/key.go +++ b/test/util/key.go @@ -5,8 +5,8 @@ import ( "io" "testing" + eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog" u "github.com/jbenet/go-ipfs/util" - eventlog "github.com/jbenet/go-ipfs/util/eventlog" testutil "github.com/jbenet/go-ipfs/util/testutil" ic "github.com/jbenet/go-ipfs/p2p/crypto"