diff --git a/loggables/loggables.go b/loggables/loggables.go index ea86cf346..978bb4e6d 100644 --- a/loggables/loggables.go +++ b/loggables/loggables.go @@ -9,9 +9,9 @@ package loggables import ( "net" - ma "github.com/jbenet/go-multiaddr" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" - logging "github.com/ipfs/go-log" + logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" peer "github.com/ipfs/go-libp2p/p2p/peer" ) diff --git a/p2p/crypto/key.go b/p2p/crypto/key.go index 2c539c766..b7eddbc1c 100644 --- a/p2p/crypto/key.go +++ b/p2p/crypto/key.go @@ -21,10 +21,10 @@ import ( pb "github.com/ipfs/go-libp2p/p2p/crypto/pb" - proto "github.com/gogo/protobuf/proto" + proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto" - u "github.com/ipfs/go-ipfs-util" - logging "github.com/ipfs/go-log" + u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util" + logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" ) var log = logging.Logger("crypto") diff --git a/p2p/crypto/pb/crypto.pb.go b/p2p/crypto/pb/crypto.pb.go index f6001ff96..35f93c0be 100644 --- a/p2p/crypto/pb/crypto.pb.go +++ b/p2p/crypto/pb/crypto.pb.go @@ -14,7 +14,7 @@ It has these top-level messages: */ package crypto_pb -import proto "github.com/gogo/protobuf/proto" +import proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto" import math "math" // Reference imports to suppress errors if they are not otherwise used. diff --git a/p2p/crypto/rsa.go b/p2p/crypto/rsa.go index 32bbbfbd3..1838f1254 100644 --- a/p2p/crypto/rsa.go +++ b/p2p/crypto/rsa.go @@ -8,7 +8,7 @@ import ( "crypto/x509" "errors" - proto "github.com/gogo/protobuf/proto" + proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto" pb "github.com/ipfs/go-libp2p/p2p/crypto/pb" ) diff --git a/p2p/crypto/secio/al.go b/p2p/crypto/secio/al.go index 5f7640992..86a9d394b 100644 --- a/p2p/crypto/secio/al.go +++ b/p2p/crypto/secio/al.go @@ -14,7 +14,7 @@ import ( "hash" ci "github.com/ipfs/go-libp2p/p2p/crypto" - bfish "golang.org/x/crypto/blowfish" + bfish "gx/ipfs/Qme1boxspcQWR8FBzMxeppqug2fYgYc15diNWmqgDVnvn2/go-crypto/blowfish" ) // List of supported ECDH curves diff --git a/p2p/crypto/secio/interface.go b/p2p/crypto/secio/interface.go index ff2e919c2..80208eb85 100644 --- a/p2p/crypto/secio/interface.go +++ b/p2p/crypto/secio/interface.go @@ -7,8 +7,8 @@ import ( ci "github.com/ipfs/go-libp2p/p2p/crypto" peer "github.com/ipfs/go-libp2p/p2p/peer" - msgio "github.com/jbenet/go-msgio" - context "golang.org/x/net/context" + msgio "gx/ipfs/QmRQhVisS8dmPbjBUthVkenn81pBxrx1GxE281csJhm2vL/go-msgio" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ) // SessionGenerator constructs secure communication sessions for a peer. diff --git a/p2p/crypto/secio/pb/spipe.pb.go b/p2p/crypto/secio/pb/spipe.pb.go index 0b4919b82..1903d1f68 100644 --- a/p2p/crypto/secio/pb/spipe.pb.go +++ b/p2p/crypto/secio/pb/spipe.pb.go @@ -14,7 +14,7 @@ It has these top-level messages: */ package spipe_pb -import proto "github.com/gogo/protobuf/proto" +import proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto" import math "math" // Reference imports to suppress errors if they are not otherwise used. diff --git a/p2p/crypto/secio/protocol.go b/p2p/crypto/secio/protocol.go index dff99c3d2..051a57253 100644 --- a/p2p/crypto/secio/protocol.go +++ b/p2p/crypto/secio/protocol.go @@ -9,13 +9,13 @@ import ( "sync" "time" - u "github.com/ipfs/go-ipfs-util" ci "github.com/ipfs/go-libp2p/p2p/crypto" pb "github.com/ipfs/go-libp2p/p2p/crypto/secio/pb" peer "github.com/ipfs/go-libp2p/p2p/peer" - logging "github.com/ipfs/go-log" - msgio "github.com/jbenet/go-msgio" - context "golang.org/x/net/context" + msgio "gx/ipfs/QmRQhVisS8dmPbjBUthVkenn81pBxrx1GxE281csJhm2vL/go-msgio" + u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" + logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" ) var log = logging.Logger("secio") diff --git a/p2p/crypto/secio/rw.go b/p2p/crypto/secio/rw.go index f01d63e64..4174b3f03 100644 --- a/p2p/crypto/secio/rw.go +++ b/p2p/crypto/secio/rw.go @@ -9,10 +9,10 @@ import ( "crypto/hmac" - proto "github.com/gogo/protobuf/proto" - msgio "github.com/jbenet/go-msgio" - mpool "github.com/jbenet/go-msgio/mpool" - context "golang.org/x/net/context" + msgio "gx/ipfs/QmRQhVisS8dmPbjBUthVkenn81pBxrx1GxE281csJhm2vL/go-msgio" + mpool "gx/ipfs/QmRQhVisS8dmPbjBUthVkenn81pBxrx1GxE281csJhm2vL/go-msgio/mpool" + proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ) const MaxMsgSize = 8 * 1024 * 1024 diff --git a/p2p/discovery/mdns.go b/p2p/discovery/mdns.go index 57abd027a..722d37948 100644 --- a/p2p/discovery/mdns.go +++ b/p2p/discovery/mdns.go @@ -9,13 +9,13 @@ import ( "sync" "time" - "github.com/cryptix/mdns" - ma "github.com/jbenet/go-multiaddr" - manet "github.com/jbenet/go-multiaddr-net" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + "gx/ipfs/QmSscYPCcE1H3UQr2tnsJ2a9dK9LsHTBGgP71VW6fz67e5/mdns" + manet "gx/ipfs/QmYtzQmUwPFGxjCXctJ8e6GXS8sYfoXy2pdeMbS5SFWqRi/go-multiaddr-net" "github.com/ipfs/go-libp2p/p2p/host" "github.com/ipfs/go-libp2p/p2p/peer" - logging "github.com/ipfs/go-log" + logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" ) var log = logging.Logger("mdns") diff --git a/p2p/host/basic/basic_host.go b/p2p/host/basic/basic_host.go index e6ba22a05..8ed0e0161 100644 --- a/p2p/host/basic/basic_host.go +++ b/p2p/host/basic/basic_host.go @@ -5,10 +5,10 @@ import ( metrics "github.com/ipfs/go-libp2p/p2p/metrics" mstream "github.com/ipfs/go-libp2p/p2p/metrics/stream" - logging "github.com/ipfs/go-log" - ma "github.com/jbenet/go-multiaddr" - goprocess "github.com/jbenet/goprocess" - context "golang.org/x/net/context" + goprocess "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" + logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" inet "github.com/ipfs/go-libp2p/p2p/net" peer "github.com/ipfs/go-libp2p/p2p/peer" @@ -16,7 +16,7 @@ import ( identify "github.com/ipfs/go-libp2p/p2p/protocol/identify" relay "github.com/ipfs/go-libp2p/p2p/protocol/relay" - msmux "github.com/whyrusleeping/go-multistream" + msmux "gx/ipfs/QmUeEcYJrzAEKdQXjzTxCgNZgc9sRuwharsvzzm5Gd2oGB/go-multistream" ) var log = logging.Logger("github.com/ipfs/go-libp2p/p2p/host/basic") diff --git a/p2p/host/basic/basic_host_test.go b/p2p/host/basic/basic_host_test.go index 3de87797e..afa106937 100644 --- a/p2p/host/basic/basic_host_test.go +++ b/p2p/host/basic/basic_host_test.go @@ -9,7 +9,7 @@ import ( protocol "github.com/ipfs/go-libp2p/p2p/protocol" testutil "github.com/ipfs/go-libp2p/p2p/test/util" - context "golang.org/x/net/context" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ) func TestHostSimple(t *testing.T) { diff --git a/p2p/host/basic/natmgr.go b/p2p/host/basic/natmgr.go index b09324d90..aac9576bc 100644 --- a/p2p/host/basic/natmgr.go +++ b/p2p/host/basic/natmgr.go @@ -3,9 +3,9 @@ package basichost import ( "sync" - ma "github.com/jbenet/go-multiaddr" - goprocess "github.com/jbenet/goprocess" - context "golang.org/x/net/context" + goprocess "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" lgbl "github.com/ipfs/go-libp2p/loggables" inat "github.com/ipfs/go-libp2p/p2p/nat" diff --git a/p2p/host/host.go b/p2p/host/host.go index d3abe3aef..64b9fd0aa 100644 --- a/p2p/host/host.go +++ b/p2p/host/host.go @@ -5,11 +5,11 @@ import ( inet "github.com/ipfs/go-libp2p/p2p/net" peer "github.com/ipfs/go-libp2p/p2p/peer" protocol "github.com/ipfs/go-libp2p/p2p/protocol" - logging "github.com/ipfs/go-log" - ma "github.com/jbenet/go-multiaddr" - context "golang.org/x/net/context" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" + logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" - msmux "github.com/whyrusleeping/go-multistream" + msmux "gx/ipfs/QmUeEcYJrzAEKdQXjzTxCgNZgc9sRuwharsvzzm5Gd2oGB/go-multistream" ) var log = logging.Logger("github.com/ipfs/go-libp2p/p2p/host") diff --git a/p2p/host/routed/routed.go b/p2p/host/routed/routed.go index 34218ad54..14a90d3ce 100644 --- a/p2p/host/routed/routed.go +++ b/p2p/host/routed/routed.go @@ -5,9 +5,9 @@ import ( "time" lgbl "github.com/ipfs/go-libp2p/loggables" - logging "github.com/ipfs/go-log" - ma "github.com/jbenet/go-multiaddr" - context "golang.org/x/net/context" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" + logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" host "github.com/ipfs/go-libp2p/p2p/host" metrics "github.com/ipfs/go-libp2p/p2p/metrics" @@ -15,7 +15,7 @@ import ( peer "github.com/ipfs/go-libp2p/p2p/peer" protocol "github.com/ipfs/go-libp2p/p2p/protocol" - msmux "github.com/whyrusleeping/go-multistream" + msmux "gx/ipfs/QmUeEcYJrzAEKdQXjzTxCgNZgc9sRuwharsvzzm5Gd2oGB/go-multistream" ) var log = logging.Logger("github.com/ipfs/go-libp2p/p2p/host/routed") diff --git a/p2p/metrics/bw_stats.go b/p2p/metrics/bw_stats.go index 80d455875..d611a3faf 100644 --- a/p2p/metrics/bw_stats.go +++ b/p2p/metrics/bw_stats.go @@ -1,7 +1,7 @@ package metrics import ( - gm "github.com/whyrusleeping/go-metrics" + gm "gx/ipfs/QmeYJHEk8UjVVZ4XCRTZe6dFQrb8pGWD81LYCgeLp8CvMB/go-metrics" "sync" peer "github.com/ipfs/go-libp2p/p2p/peer" diff --git a/p2p/metrics/stream/metered_test.go b/p2p/metrics/stream/metered_test.go index db2db6022..e37797889 100644 --- a/p2p/metrics/stream/metered_test.go +++ b/p2p/metrics/stream/metered_test.go @@ -5,10 +5,10 @@ import ( "io/ioutil" "testing" - randbo "github.com/dustin/randbo" inet "github.com/ipfs/go-libp2p/p2p/net" peer "github.com/ipfs/go-libp2p/p2p/peer" protocol "github.com/ipfs/go-libp2p/p2p/protocol" + randbo "gx/ipfs/QmYvsG72GsfLgUeSojXArjnU6L4Wmwk7wuAxtNLuyXcc1T/randbo" ) type FakeStream struct { diff --git a/p2p/nat/nat.go b/p2p/nat/nat.go index 6032ccd5a..c6f775989 100644 --- a/p2p/nat/nat.go +++ b/p2p/nat/nat.go @@ -8,14 +8,14 @@ import ( "sync" "time" - ma "github.com/jbenet/go-multiaddr" - manet "github.com/jbenet/go-multiaddr-net" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + manet "gx/ipfs/QmYtzQmUwPFGxjCXctJ8e6GXS8sYfoXy2pdeMbS5SFWqRi/go-multiaddr-net" - nat "github.com/fd/go-nat" - logging "github.com/ipfs/go-log" - goprocess "github.com/jbenet/goprocess" - periodic "github.com/jbenet/goprocess/periodic" - notifier "github.com/whyrusleeping/go-notifier" + nat "gx/ipfs/QmNLvkCDV6ZjUJsEwGNporYBuZdhWT6q7TBVYQwwRv12HT/go-nat" + goprocess "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess" + periodic "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/periodic" + logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" + notifier "gx/ipfs/QmbcS9XrwZkF1rZj8bBwwzoYhVuA2PCnPhFUL1pyWGgt2A/go-notifier" ) var ( diff --git a/p2p/net/conn/conn.go b/p2p/net/conn/conn.go index 33d47b614..cc7baa055 100644 --- a/p2p/net/conn/conn.go +++ b/p2p/net/conn/conn.go @@ -6,15 +6,15 @@ import ( "net" "time" - u "github.com/ipfs/go-ipfs-util" lgbl "github.com/ipfs/go-libp2p/loggables" ic "github.com/ipfs/go-libp2p/p2p/crypto" peer "github.com/ipfs/go-libp2p/p2p/peer" - logging "github.com/ipfs/go-log" - mpool "github.com/jbenet/go-msgio/mpool" - ma "github.com/jbenet/go-multiaddr" - manet "github.com/jbenet/go-multiaddr-net" - context "golang.org/x/net/context" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + mpool "gx/ipfs/QmRQhVisS8dmPbjBUthVkenn81pBxrx1GxE281csJhm2vL/go-msgio/mpool" + manet "gx/ipfs/QmYtzQmUwPFGxjCXctJ8e6GXS8sYfoXy2pdeMbS5SFWqRi/go-multiaddr-net" + u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" + logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" ) var log = logging.Logger("conn") diff --git a/p2p/net/conn/conn_test.go b/p2p/net/conn/conn_test.go index 461a1314c..4f442b5e7 100644 --- a/p2p/net/conn/conn_test.go +++ b/p2p/net/conn/conn_test.go @@ -9,8 +9,8 @@ import ( "time" travis "github.com/ipfs/go-libp2p/testutil/ci/travis" - msgio "github.com/jbenet/go-msgio" - context "golang.org/x/net/context" + msgio "gx/ipfs/QmRQhVisS8dmPbjBUthVkenn81pBxrx1GxE281csJhm2vL/go-msgio" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ) func msgioWrap(c Conn) msgio.ReadWriter { diff --git a/p2p/net/conn/dial.go b/p2p/net/conn/dial.go index 9c8a2fdb7..ce3efb8f7 100644 --- a/p2p/net/conn/dial.go +++ b/p2p/net/conn/dial.go @@ -6,9 +6,9 @@ import ( "strings" lgbl "github.com/ipfs/go-libp2p/loggables" - ma "github.com/jbenet/go-multiaddr" - manet "github.com/jbenet/go-multiaddr-net" - context "golang.org/x/net/context" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + manet "gx/ipfs/QmYtzQmUwPFGxjCXctJ8e6GXS8sYfoXy2pdeMbS5SFWqRi/go-multiaddr-net" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ci "github.com/ipfs/go-libp2p/p2p/crypto" addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr" diff --git a/p2p/net/conn/dial_test.go b/p2p/net/conn/dial_test.go index e4a3cb6e4..9a1b08022 100644 --- a/p2p/net/conn/dial_test.go +++ b/p2p/net/conn/dial_test.go @@ -13,8 +13,8 @@ import ( peer "github.com/ipfs/go-libp2p/p2p/peer" tu "github.com/ipfs/go-libp2p/testutil" - ma "github.com/jbenet/go-multiaddr" - context "golang.org/x/net/context" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ) func echoListen(ctx context.Context, listener Listener) { diff --git a/p2p/net/conn/interface.go b/p2p/net/conn/interface.go index a2ccb732f..7c80ef554 100644 --- a/p2p/net/conn/interface.go +++ b/p2p/net/conn/interface.go @@ -10,7 +10,7 @@ import ( transport "github.com/ipfs/go-libp2p/p2p/net/transport" peer "github.com/ipfs/go-libp2p/p2p/peer" - ma "github.com/jbenet/go-multiaddr" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" ) type PeerConn interface { diff --git a/p2p/net/conn/listen.go b/p2p/net/conn/listen.go index fcddc8605..8d1ae0e0e 100644 --- a/p2p/net/conn/listen.go +++ b/p2p/net/conn/listen.go @@ -5,11 +5,11 @@ import ( "io" "net" - ma "github.com/jbenet/go-multiaddr" - tec "github.com/jbenet/go-temp-err-catcher" - "github.com/jbenet/goprocess" - goprocessctx "github.com/jbenet/goprocess/context" - context "golang.org/x/net/context" + "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess" + goprocessctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + tec "gx/ipfs/QmWHgLqrghM9zw77nF6gdvT9ExQ2RB9pLxkd8sDHZf1rWb/go-temp-err-catcher" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ic "github.com/ipfs/go-libp2p/p2p/crypto" filter "github.com/ipfs/go-libp2p/p2p/net/filter" diff --git a/p2p/net/conn/secure_conn.go b/p2p/net/conn/secure_conn.go index 1f27c9098..0cb07457e 100644 --- a/p2p/net/conn/secure_conn.go +++ b/p2p/net/conn/secure_conn.go @@ -5,8 +5,8 @@ import ( "net" "time" - ma "github.com/jbenet/go-multiaddr" - context "golang.org/x/net/context" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ic "github.com/ipfs/go-libp2p/p2p/crypto" secio "github.com/ipfs/go-libp2p/p2p/crypto/secio" diff --git a/p2p/net/conn/secure_conn_test.go b/p2p/net/conn/secure_conn_test.go index f4f194487..9183547dd 100644 --- a/p2p/net/conn/secure_conn_test.go +++ b/p2p/net/conn/secure_conn_test.go @@ -10,7 +10,7 @@ import ( ic "github.com/ipfs/go-libp2p/p2p/crypto" travis "github.com/ipfs/go-libp2p/testutil/ci/travis" - context "golang.org/x/net/context" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ) func upgradeToSecureConn(t *testing.T, ctx context.Context, sk ic.PrivKey, c Conn) (Conn, error) { diff --git a/p2p/net/filter/filter.go b/p2p/net/filter/filter.go index 58154e214..1470d1d38 100644 --- a/p2p/net/filter/filter.go +++ b/p2p/net/filter/filter.go @@ -5,8 +5,8 @@ import ( "strings" "sync" - ma "github.com/jbenet/go-multiaddr" - manet "github.com/jbenet/go-multiaddr-net" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + manet "gx/ipfs/QmYtzQmUwPFGxjCXctJ8e6GXS8sYfoXy2pdeMbS5SFWqRi/go-multiaddr-net" ) type Filters struct { diff --git a/p2p/net/interface.go b/p2p/net/interface.go index 5febb8f26..728d81483 100644 --- a/p2p/net/interface.go +++ b/p2p/net/interface.go @@ -6,9 +6,9 @@ import ( conn "github.com/ipfs/go-libp2p/p2p/net/conn" peer "github.com/ipfs/go-libp2p/p2p/peer" - ma "github.com/jbenet/go-multiaddr" - "github.com/jbenet/goprocess" - context "golang.org/x/net/context" + "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ) // MessageSizeMax is a soft (recommended) maximum for network messages. diff --git a/p2p/net/mock/interface.go b/p2p/net/mock/interface.go index a7fe45e70..c3897badf 100644 --- a/p2p/net/mock/interface.go +++ b/p2p/net/mock/interface.go @@ -14,7 +14,7 @@ import ( "io" "time" - ma "github.com/jbenet/go-multiaddr" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" ) type Mocknet interface { diff --git a/p2p/net/mock/mock.go b/p2p/net/mock/mock.go index 114a0c6b9..81473735a 100644 --- a/p2p/net/mock/mock.go +++ b/p2p/net/mock/mock.go @@ -1,9 +1,9 @@ package mocknet import ( - logging "github.com/ipfs/go-log" + logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" - context "golang.org/x/net/context" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ) var log = logging.Logger("mocknet") diff --git a/p2p/net/mock/mock_conn.go b/p2p/net/mock/mock_conn.go index 84ea48fc7..bf4173922 100644 --- a/p2p/net/mock/mock_conn.go +++ b/p2p/net/mock/mock_conn.go @@ -8,8 +8,8 @@ import ( inet "github.com/ipfs/go-libp2p/p2p/net" peer "github.com/ipfs/go-libp2p/p2p/peer" - ma "github.com/jbenet/go-multiaddr" - process "github.com/jbenet/goprocess" + process "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" ) // conn represents one side's perspective of a diff --git a/p2p/net/mock/mock_net.go b/p2p/net/mock/mock_net.go index 78b066039..f25f78906 100644 --- a/p2p/net/mock/mock_net.go +++ b/p2p/net/mock/mock_net.go @@ -13,10 +13,10 @@ import ( p2putil "github.com/ipfs/go-libp2p/p2p/test/util" testutil "github.com/ipfs/go-libp2p/testutil" - ma "github.com/jbenet/go-multiaddr" - "github.com/jbenet/goprocess" - goprocessctx "github.com/jbenet/goprocess/context" - context "golang.org/x/net/context" + "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess" + goprocessctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ) // mocknet implements mocknet.Mocknet diff --git a/p2p/net/mock/mock_notif_test.go b/p2p/net/mock/mock_notif_test.go index 35a44b6c0..cb120bdd8 100644 --- a/p2p/net/mock/mock_notif_test.go +++ b/p2p/net/mock/mock_notif_test.go @@ -6,8 +6,8 @@ import ( inet "github.com/ipfs/go-libp2p/p2p/net" peer "github.com/ipfs/go-libp2p/p2p/peer" - ma "github.com/jbenet/go-multiaddr" - context "golang.org/x/net/context" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ) func TestNotifications(t *testing.T) { diff --git a/p2p/net/mock/mock_peernet.go b/p2p/net/mock/mock_peernet.go index f234338e4..43834221b 100644 --- a/p2p/net/mock/mock_peernet.go +++ b/p2p/net/mock/mock_peernet.go @@ -8,10 +8,10 @@ import ( inet "github.com/ipfs/go-libp2p/p2p/net" peer "github.com/ipfs/go-libp2p/p2p/peer" - ma "github.com/jbenet/go-multiaddr" - "github.com/jbenet/goprocess" - goprocessctx "github.com/jbenet/goprocess/context" - context "golang.org/x/net/context" + "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess" + goprocessctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ) // peernet implements inet.Network diff --git a/p2p/net/mock/mock_stream.go b/p2p/net/mock/mock_stream.go index 9b111fbe4..e259281ee 100644 --- a/p2p/net/mock/mock_stream.go +++ b/p2p/net/mock/mock_stream.go @@ -5,7 +5,7 @@ import ( "io" "time" - process "github.com/jbenet/goprocess" + process "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess" inet "github.com/ipfs/go-libp2p/p2p/net" ) diff --git a/p2p/net/mock/mock_test.go b/p2p/net/mock/mock_test.go index 574d8be44..9cb91f209 100644 --- a/p2p/net/mock/mock_test.go +++ b/p2p/net/mock/mock_test.go @@ -14,8 +14,8 @@ import ( protocol "github.com/ipfs/go-libp2p/p2p/protocol" testutil "github.com/ipfs/go-libp2p/testutil" - detectrace "github.com/jbenet/go-detect-race" - context "golang.org/x/net/context" + detectrace "gx/ipfs/QmQHGMVmrsgmqUG8ih3puNXUJneSpi13dkcZpzLKkskUkH/go-detect-race" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ) func randPeer(t *testing.T) peer.ID { diff --git a/p2p/net/swarm/addr/addr.go b/p2p/net/swarm/addr/addr.go index 39f00dba1..8711e8dae 100644 --- a/p2p/net/swarm/addr/addr.go +++ b/p2p/net/swarm/addr/addr.go @@ -3,11 +3,11 @@ package addrutil import ( "fmt" - logging "github.com/ipfs/go-log" + logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" - ma "github.com/jbenet/go-multiaddr" - manet "github.com/jbenet/go-multiaddr-net" - context "golang.org/x/net/context" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + manet "gx/ipfs/QmYtzQmUwPFGxjCXctJ8e6GXS8sYfoXy2pdeMbS5SFWqRi/go-multiaddr-net" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ) var log = logging.Logger("github.com/ipfs/go-libp2p/p2p/net/swarm/addr") diff --git a/p2p/net/swarm/addr/addr_test.go b/p2p/net/swarm/addr/addr_test.go index 49eec1351..aa82097c3 100644 --- a/p2p/net/swarm/addr/addr_test.go +++ b/p2p/net/swarm/addr/addr_test.go @@ -3,8 +3,8 @@ package addrutil import ( "testing" - ma "github.com/jbenet/go-multiaddr" - manet "github.com/jbenet/go-multiaddr-net" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + manet "gx/ipfs/QmYtzQmUwPFGxjCXctJ8e6GXS8sYfoXy2pdeMbS5SFWqRi/go-multiaddr-net" ) func newMultiaddr(t *testing.T, s string) ma.Multiaddr { diff --git a/p2p/net/swarm/dial_test.go b/p2p/net/swarm/dial_test.go index 57a4d7f16..72dd85860 100644 --- a/p2p/net/swarm/dial_test.go +++ b/p2p/net/swarm/dial_test.go @@ -13,9 +13,9 @@ import ( testutil "github.com/ipfs/go-libp2p/testutil" ci "github.com/ipfs/go-libp2p/testutil/ci" - ma "github.com/jbenet/go-multiaddr" - manet "github.com/jbenet/go-multiaddr-net" - context "golang.org/x/net/context" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + manet "gx/ipfs/QmYtzQmUwPFGxjCXctJ8e6GXS8sYfoXy2pdeMbS5SFWqRi/go-multiaddr-net" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ) func acceptAndHang(l net.Listener) { diff --git a/p2p/net/swarm/peers_test.go b/p2p/net/swarm/peers_test.go index b107fbfe8..3451ec1f5 100644 --- a/p2p/net/swarm/peers_test.go +++ b/p2p/net/swarm/peers_test.go @@ -5,8 +5,8 @@ import ( peer "github.com/ipfs/go-libp2p/p2p/peer" - ma "github.com/jbenet/go-multiaddr" - context "golang.org/x/net/context" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ) func TestPeers(t *testing.T) { diff --git a/p2p/net/swarm/simul_test.go b/p2p/net/swarm/simul_test.go index bd753e766..a838f3044 100644 --- a/p2p/net/swarm/simul_test.go +++ b/p2p/net/swarm/simul_test.go @@ -9,8 +9,8 @@ import ( peer "github.com/ipfs/go-libp2p/p2p/peer" ci "github.com/ipfs/go-libp2p/testutil/ci" - ma "github.com/jbenet/go-multiaddr" - context "golang.org/x/net/context" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ) func TestSimultOpen(t *testing.T) { diff --git a/p2p/net/swarm/swarm.go b/p2p/net/swarm/swarm.go index c71ef359d..c422645c5 100644 --- a/p2p/net/swarm/swarm.go +++ b/p2p/net/swarm/swarm.go @@ -16,16 +16,16 @@ import ( transport "github.com/ipfs/go-libp2p/p2p/net/transport" peer "github.com/ipfs/go-libp2p/p2p/peer" - ma "github.com/jbenet/go-multiaddr" - ps "github.com/jbenet/go-peerstream" - pst "github.com/jbenet/go-stream-muxer" - psmss "github.com/jbenet/go-stream-muxer/multistream" - "github.com/jbenet/goprocess" - goprocessctx "github.com/jbenet/goprocess/context" - mafilter "github.com/whyrusleeping/multiaddr-filter" - context "golang.org/x/net/context" + ps "gx/ipfs/QmQDPXRFzRcCGPbPViQCKjzbQBkZGpLV1f9KwXnksSNcTK/go-peerstream" + "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess" + goprocessctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + pst "gx/ipfs/QmTYr6RrJs8b63LTVwahmtytnuqzsLfNPBJp6EvmFWHbGh/go-stream-muxer" + psmss "gx/ipfs/QmTYr6RrJs8b63LTVwahmtytnuqzsLfNPBJp6EvmFWHbGh/go-stream-muxer/multistream" + mafilter "gx/ipfs/QmW3Q7RQa8D1qCEEeyKCBV1drgFxvHBqAZ3zgCujEwKpHD/multiaddr-filter" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" - logging "github.com/ipfs/go-log" + logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" ) var log = logging.Logger("swarm2") diff --git a/p2p/net/swarm/swarm_addr.go b/p2p/net/swarm/swarm_addr.go index 039683bfb..5b7aae5fb 100644 --- a/p2p/net/swarm/swarm_addr.go +++ b/p2p/net/swarm/swarm_addr.go @@ -4,7 +4,7 @@ import ( conn "github.com/ipfs/go-libp2p/p2p/net/conn" addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr" - ma "github.com/jbenet/go-multiaddr" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" ) // ListenAddresses returns a list of addresses at which this swarm listens. diff --git a/p2p/net/swarm/swarm_addr_test.go b/p2p/net/swarm/swarm_addr_test.go index 7db46d344..f48291bcd 100644 --- a/p2p/net/swarm/swarm_addr_test.go +++ b/p2p/net/swarm/swarm_addr_test.go @@ -8,8 +8,8 @@ import ( peer "github.com/ipfs/go-libp2p/p2p/peer" testutil "github.com/ipfs/go-libp2p/testutil" - ma "github.com/jbenet/go-multiaddr" - context "golang.org/x/net/context" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ) func TestFilterAddrs(t *testing.T) { diff --git a/p2p/net/swarm/swarm_conn.go b/p2p/net/swarm/swarm_conn.go index 840a9b465..b8c5633f1 100644 --- a/p2p/net/swarm/swarm_conn.go +++ b/p2p/net/swarm/swarm_conn.go @@ -8,9 +8,9 @@ import ( conn "github.com/ipfs/go-libp2p/p2p/net/conn" peer "github.com/ipfs/go-libp2p/p2p/peer" - ma "github.com/jbenet/go-multiaddr" - ps "github.com/jbenet/go-peerstream" - context "golang.org/x/net/context" + ps "gx/ipfs/QmQDPXRFzRcCGPbPViQCKjzbQBkZGpLV1f9KwXnksSNcTK/go-peerstream" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ) // a Conn is a simple wrapper around a ps.Conn that also exposes diff --git a/p2p/net/swarm/swarm_dial.go b/p2p/net/swarm/swarm_dial.go index 0cb285876..e05a2a2f3 100644 --- a/p2p/net/swarm/swarm_dial.go +++ b/p2p/net/swarm/swarm_dial.go @@ -12,10 +12,10 @@ import ( conn "github.com/ipfs/go-libp2p/p2p/net/conn" addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr" peer "github.com/ipfs/go-libp2p/p2p/peer" - "github.com/jbenet/go-multiaddr-net" + "gx/ipfs/QmYtzQmUwPFGxjCXctJ8e6GXS8sYfoXy2pdeMbS5SFWqRi/go-multiaddr-net" - ma "github.com/jbenet/go-multiaddr" - context "golang.org/x/net/context" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ) // Diagram of dial sync: diff --git a/p2p/net/swarm/swarm_listen.go b/p2p/net/swarm/swarm_listen.go index f18464065..4584250f7 100644 --- a/p2p/net/swarm/swarm_listen.go +++ b/p2p/net/swarm/swarm_listen.go @@ -9,9 +9,9 @@ import ( conn "github.com/ipfs/go-libp2p/p2p/net/conn" transport "github.com/ipfs/go-libp2p/p2p/net/transport" - ma "github.com/jbenet/go-multiaddr" - ps "github.com/jbenet/go-peerstream" - context "golang.org/x/net/context" + ps "gx/ipfs/QmQDPXRFzRcCGPbPViQCKjzbQBkZGpLV1f9KwXnksSNcTK/go-peerstream" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ) // Open listeners and reuse-dialers for the given addresses diff --git a/p2p/net/swarm/swarm_net.go b/p2p/net/swarm/swarm_net.go index a8361fc5b..1d75814da 100644 --- a/p2p/net/swarm/swarm_net.go +++ b/p2p/net/swarm/swarm_net.go @@ -8,9 +8,9 @@ import ( metrics "github.com/ipfs/go-libp2p/p2p/metrics" inet "github.com/ipfs/go-libp2p/p2p/net" - ma "github.com/jbenet/go-multiaddr" - "github.com/jbenet/goprocess" - context "golang.org/x/net/context" + "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ) // Network implements the inet.Network interface. diff --git a/p2p/net/swarm/swarm_net_test.go b/p2p/net/swarm/swarm_net_test.go index 14c590b9d..1ffb44812 100644 --- a/p2p/net/swarm/swarm_net_test.go +++ b/p2p/net/swarm/swarm_net_test.go @@ -7,7 +7,7 @@ import ( inet "github.com/ipfs/go-libp2p/p2p/net" testutil "github.com/ipfs/go-libp2p/p2p/test/util" - context "golang.org/x/net/context" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ) // TestConnectednessCorrect starts a few networks, connects a few diff --git a/p2p/net/swarm/swarm_notif_test.go b/p2p/net/swarm/swarm_notif_test.go index 0d976e81d..d6f06da7c 100644 --- a/p2p/net/swarm/swarm_notif_test.go +++ b/p2p/net/swarm/swarm_notif_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - ma "github.com/jbenet/go-multiaddr" - context "golang.org/x/net/context" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" inet "github.com/ipfs/go-libp2p/p2p/net" peer "github.com/ipfs/go-libp2p/p2p/peer" diff --git a/p2p/net/swarm/swarm_stream.go b/p2p/net/swarm/swarm_stream.go index 7965d2743..3f9115fc6 100644 --- a/p2p/net/swarm/swarm_stream.go +++ b/p2p/net/swarm/swarm_stream.go @@ -3,7 +3,7 @@ package swarm import ( inet "github.com/ipfs/go-libp2p/p2p/net" - ps "github.com/jbenet/go-peerstream" + ps "gx/ipfs/QmQDPXRFzRcCGPbPViQCKjzbQBkZGpLV1f9KwXnksSNcTK/go-peerstream" ) // a Stream is a wrapper around a ps.Stream that exposes a way to get diff --git a/p2p/net/swarm/swarm_test.go b/p2p/net/swarm/swarm_test.go index a1c35696d..1166f52f1 100644 --- a/p2p/net/swarm/swarm_test.go +++ b/p2p/net/swarm/swarm_test.go @@ -14,8 +14,8 @@ import ( peer "github.com/ipfs/go-libp2p/p2p/peer" testutil "github.com/ipfs/go-libp2p/testutil" - ma "github.com/jbenet/go-multiaddr" - context "golang.org/x/net/context" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ) func EchoStreamHandler(stream inet.Stream) { diff --git a/p2p/net/transport/reuseport.go b/p2p/net/transport/reuseport.go index dfb50e5f3..2e0598333 100644 --- a/p2p/net/transport/reuseport.go +++ b/p2p/net/transport/reuseport.go @@ -6,7 +6,7 @@ import ( "strings" "syscall" - reuseport "github.com/jbenet/go-reuseport" + reuseport "gx/ipfs/QmaaC9QMYTQHCbMq3Ebr3uMaAR2ev4AVqMmsJpgQijAZbJ/go-reuseport" ) // envReuseport is the env variable name used to turn off reuse port. diff --git a/p2p/net/transport/tcp.go b/p2p/net/transport/tcp.go index 21f6ffbb3..037af45e4 100644 --- a/p2p/net/transport/tcp.go +++ b/p2p/net/transport/tcp.go @@ -7,10 +7,10 @@ import ( "time" lgbl "github.com/ipfs/go-libp2p/loggables" - ma "github.com/jbenet/go-multiaddr" - manet "github.com/jbenet/go-multiaddr-net" - reuseport "github.com/jbenet/go-reuseport" - context "golang.org/x/net/context" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + manet "gx/ipfs/QmYtzQmUwPFGxjCXctJ8e6GXS8sYfoXy2pdeMbS5SFWqRi/go-multiaddr-net" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" + reuseport "gx/ipfs/QmaaC9QMYTQHCbMq3Ebr3uMaAR2ev4AVqMmsJpgQijAZbJ/go-reuseport" ) type TcpTransport struct { diff --git a/p2p/net/transport/transport.go b/p2p/net/transport/transport.go index 8cfd72e74..681b61306 100644 --- a/p2p/net/transport/transport.go +++ b/p2p/net/transport/transport.go @@ -4,9 +4,9 @@ import ( "net" "time" - logging "github.com/ipfs/go-log" - ma "github.com/jbenet/go-multiaddr" - manet "github.com/jbenet/go-multiaddr-net" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + manet "gx/ipfs/QmYtzQmUwPFGxjCXctJ8e6GXS8sYfoXy2pdeMbS5SFWqRi/go-multiaddr-net" + logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" ) var log = logging.Logger("transport") diff --git a/p2p/peer/addr/addrsrcs.go b/p2p/peer/addr/addrsrcs.go index a172373d8..2769e4ba8 100644 --- a/p2p/peer/addr/addrsrcs.go +++ b/p2p/peer/addr/addrsrcs.go @@ -2,7 +2,7 @@ package addr import ( - ma "github.com/jbenet/go-multiaddr" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" ) // AddrSource is a source of addresses. It allows clients to retrieve diff --git a/p2p/peer/addr/addrsrcs_test.go b/p2p/peer/addr/addrsrcs_test.go index 46140641c..03e936684 100644 --- a/p2p/peer/addr/addrsrcs_test.go +++ b/p2p/peer/addr/addrsrcs_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - ma "github.com/jbenet/go-multiaddr" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" ) func newAddrOrFatal(t *testing.T, s string) ma.Multiaddr { diff --git a/p2p/peer/addr_manager.go b/p2p/peer/addr_manager.go index 87b8206ee..b2243e101 100644 --- a/p2p/peer/addr_manager.go +++ b/p2p/peer/addr_manager.go @@ -4,7 +4,7 @@ import ( "sync" "time" - ma "github.com/jbenet/go-multiaddr" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" ) const ( diff --git a/p2p/peer/addr_manager_test.go b/p2p/peer/addr_manager_test.go index 0de0c6ab3..66dce5ab7 100644 --- a/p2p/peer/addr_manager_test.go +++ b/p2p/peer/addr_manager_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - ma "github.com/jbenet/go-multiaddr" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" ) func IDS(t *testing.T, ids string) ID { diff --git a/p2p/peer/peer.go b/p2p/peer/peer.go index 2f2a48683..e3544a126 100644 --- a/p2p/peer/peer.go +++ b/p2p/peer/peer.go @@ -7,13 +7,13 @@ import ( "fmt" "strings" - b58 "github.com/jbenet/go-base58" - ma "github.com/jbenet/go-multiaddr" - mh "github.com/jbenet/go-multihash" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + b58 "gx/ipfs/QmT8rehPR3F6bmwL6zjUN8XpiDBFFpMP2myPdC6ApsWfJf/go-base58" + mh "gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash" - u "github.com/ipfs/go-ipfs-util" ic "github.com/ipfs/go-libp2p/p2p/crypto" - logging "github.com/ipfs/go-log" + u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util" + logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" ) var log = logging.Logger("peer") diff --git a/p2p/peer/peer_test.go b/p2p/peer/peer_test.go index 93cbfc86c..013bcf2e0 100644 --- a/p2p/peer/peer_test.go +++ b/p2p/peer/peer_test.go @@ -6,12 +6,12 @@ import ( "strings" "testing" - u "github.com/ipfs/go-ipfs-util" ic "github.com/ipfs/go-libp2p/p2p/crypto" . "github.com/ipfs/go-libp2p/p2p/peer" tu "github.com/ipfs/go-libp2p/testutil" + u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util" - b58 "github.com/jbenet/go-base58" + b58 "gx/ipfs/QmT8rehPR3F6bmwL6zjUN8XpiDBFFpMP2myPdC6ApsWfJf/go-base58" ) var gen1 keyset // generated diff --git a/p2p/peer/peerstore.go b/p2p/peer/peerstore.go index f8e88754e..9eb49e073 100644 --- a/p2p/peer/peerstore.go +++ b/p2p/peer/peerstore.go @@ -9,7 +9,7 @@ import ( //ds "github.com/jbenet/go-datastore" //dssync "github.com/jbenet/go-datastore/sync" - ma "github.com/jbenet/go-multiaddr" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" ) const ( diff --git a/p2p/peer/queue/queue_test.go b/p2p/peer/queue/queue_test.go index 8d43bb690..34179a598 100644 --- a/p2p/peer/queue/queue_test.go +++ b/p2p/peer/queue/queue_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" - u "github.com/ipfs/go-ipfs-util" peer "github.com/ipfs/go-libp2p/p2p/peer" + u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util" - context "golang.org/x/net/context" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ) func TestQueue(t *testing.T) { diff --git a/p2p/peer/queue/sync.go b/p2p/peer/queue/sync.go index fd49e0054..b679a4930 100644 --- a/p2p/peer/queue/sync.go +++ b/p2p/peer/queue/sync.go @@ -2,8 +2,8 @@ package queue import ( peer "github.com/ipfs/go-libp2p/p2p/peer" - logging "github.com/ipfs/go-log" - context "golang.org/x/net/context" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" + logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" ) var log = logging.Logger("peerqueue") diff --git a/p2p/protocol/identify/id.go b/p2p/protocol/identify/id.go index af38802f6..1f1e2c132 100644 --- a/p2p/protocol/identify/id.go +++ b/p2p/protocol/identify/id.go @@ -4,11 +4,11 @@ import ( "strings" "sync" - semver "github.com/coreos/go-semver/semver" - ggio "github.com/gogo/protobuf/io" - ma "github.com/jbenet/go-multiaddr" - msmux "github.com/whyrusleeping/go-multistream" - context "golang.org/x/net/context" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + msmux "gx/ipfs/QmUeEcYJrzAEKdQXjzTxCgNZgc9sRuwharsvzzm5Gd2oGB/go-multistream" + ggio "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/io" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" + semver "gx/ipfs/QmcrrEpx3VMUbrbgVroH3YiYyUS5c4YAykzyPJWKspUYLa/go-semver/semver" host "github.com/ipfs/go-libp2p/p2p/host" mstream "github.com/ipfs/go-libp2p/p2p/metrics/stream" @@ -17,7 +17,7 @@ import ( pb "github.com/ipfs/go-libp2p/p2p/protocol/identify/pb" lgbl "github.com/ipfs/go-libp2p/loggables" - logging "github.com/ipfs/go-log" + logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" ) var log = logging.Logger("net/identify") diff --git a/p2p/protocol/identify/id_test.go b/p2p/protocol/identify/id_test.go index 1057786d4..53a5729d5 100644 --- a/p2p/protocol/identify/id_test.go +++ b/p2p/protocol/identify/id_test.go @@ -9,8 +9,8 @@ import ( identify "github.com/ipfs/go-libp2p/p2p/protocol/identify" testutil "github.com/ipfs/go-libp2p/p2p/test/util" - ma "github.com/jbenet/go-multiaddr" - context "golang.org/x/net/context" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ) func subtestIDService(t *testing.T, postDialWait time.Duration) { diff --git a/p2p/protocol/identify/obsaddr.go b/p2p/protocol/identify/obsaddr.go index 98c29b277..2f25b6efe 100644 --- a/p2p/protocol/identify/obsaddr.go +++ b/p2p/protocol/identify/obsaddr.go @@ -6,7 +6,7 @@ import ( peer "github.com/ipfs/go-libp2p/p2p/peer" - ma "github.com/jbenet/go-multiaddr" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" ) // ObservedAddr is an entry for an address reported by our peers. diff --git a/p2p/protocol/identify/obsaddr_test.go b/p2p/protocol/identify/obsaddr_test.go index 81413c4f0..8d20277aa 100644 --- a/p2p/protocol/identify/obsaddr_test.go +++ b/p2p/protocol/identify/obsaddr_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - ma "github.com/jbenet/go-multiaddr" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" ) // TestObsAddrSet diff --git a/p2p/protocol/identify/pb/identify.pb.go b/p2p/protocol/identify/pb/identify.pb.go index cc4cba497..c6634f649 100644 --- a/p2p/protocol/identify/pb/identify.pb.go +++ b/p2p/protocol/identify/pb/identify.pb.go @@ -13,7 +13,7 @@ It has these top-level messages: */ package identify_pb -import proto "github.com/gogo/protobuf/proto" +import proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto" import math "math" // Reference imports to suppress errors if they are not otherwise used. diff --git a/p2p/protocol/ping/ping.go b/p2p/protocol/ping/ping.go index b9d5832bb..5a85eeb4f 100644 --- a/p2p/protocol/ping/ping.go +++ b/p2p/protocol/ping/ping.go @@ -6,13 +6,13 @@ import ( "io" "time" - u "github.com/ipfs/go-ipfs-util" - context "golang.org/x/net/context" + u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" host "github.com/ipfs/go-libp2p/p2p/host" inet "github.com/ipfs/go-libp2p/p2p/net" peer "github.com/ipfs/go-libp2p/p2p/peer" - logging "github.com/ipfs/go-log" + logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" ) var log = logging.Logger("ping") diff --git a/p2p/protocol/ping/ping_test.go b/p2p/protocol/ping/ping_test.go index d88fbcac3..6fc660945 100644 --- a/p2p/protocol/ping/ping_test.go +++ b/p2p/protocol/ping/ping_test.go @@ -6,7 +6,7 @@ import ( peer "github.com/ipfs/go-libp2p/p2p/peer" netutil "github.com/ipfs/go-libp2p/p2p/test/util" - context "golang.org/x/net/context" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ) func TestPing(t *testing.T) { diff --git a/p2p/protocol/relay/relay.go b/p2p/protocol/relay/relay.go index 43ca79159..6f7a743d2 100644 --- a/p2p/protocol/relay/relay.go +++ b/p2p/protocol/relay/relay.go @@ -5,14 +5,14 @@ import ( "io" "time" - mh "github.com/jbenet/go-multihash" + mh "gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash" host "github.com/ipfs/go-libp2p/p2p/host" inet "github.com/ipfs/go-libp2p/p2p/net" peer "github.com/ipfs/go-libp2p/p2p/peer" protocol "github.com/ipfs/go-libp2p/p2p/protocol" - logging "github.com/ipfs/go-log" - context "golang.org/x/net/context" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" + logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" ) var log = logging.Logger("github.com/ipfs/go-libp2p/p2p/protocol/relay") diff --git a/p2p/protocol/relay/relay_test.go b/p2p/protocol/relay/relay_test.go index 4e7074961..b4fd83aff 100644 --- a/p2p/protocol/relay/relay_test.go +++ b/p2p/protocol/relay/relay_test.go @@ -8,10 +8,10 @@ import ( protocol "github.com/ipfs/go-libp2p/p2p/protocol" relay "github.com/ipfs/go-libp2p/p2p/protocol/relay" testutil "github.com/ipfs/go-libp2p/p2p/test/util" - logging "github.com/ipfs/go-log" + logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" - msmux "github.com/whyrusleeping/go-multistream" - context "golang.org/x/net/context" + msmux "gx/ipfs/QmUeEcYJrzAEKdQXjzTxCgNZgc9sRuwharsvzzm5Gd2oGB/go-multistream" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ) var log = logging.Logger("relay_test") diff --git a/p2p/test/backpressure/backpressure_test.go b/p2p/test/backpressure/backpressure_test.go index 5018cbb62..0f2a7dd6c 100644 --- a/p2p/test/backpressure/backpressure_test.go +++ b/p2p/test/backpressure/backpressure_test.go @@ -11,10 +11,10 @@ import ( peer "github.com/ipfs/go-libp2p/p2p/peer" protocol "github.com/ipfs/go-libp2p/p2p/protocol" testutil "github.com/ipfs/go-libp2p/p2p/test/util" - logging "github.com/ipfs/go-log" + logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" - u "github.com/ipfs/go-ipfs-util" - context "golang.org/x/net/context" + u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ) var log = logging.Logger("backpressure") diff --git a/p2p/test/reconnects/reconnect_test.go b/p2p/test/reconnects/reconnect_test.go index cc53a1e93..cf649886e 100644 --- a/p2p/test/reconnects/reconnect_test.go +++ b/p2p/test/reconnects/reconnect_test.go @@ -7,16 +7,16 @@ import ( "testing" "time" - u "github.com/ipfs/go-ipfs-util" host "github.com/ipfs/go-libp2p/p2p/host" inet "github.com/ipfs/go-libp2p/p2p/net" swarm "github.com/ipfs/go-libp2p/p2p/net/swarm" protocol "github.com/ipfs/go-libp2p/p2p/protocol" testutil "github.com/ipfs/go-libp2p/p2p/test/util" - logging "github.com/ipfs/go-log" + u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util" + logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" - ps "github.com/jbenet/go-peerstream" - context "golang.org/x/net/context" + ps "gx/ipfs/QmQDPXRFzRcCGPbPViQCKjzbQBkZGpLV1f9KwXnksSNcTK/go-peerstream" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ) func init() { diff --git a/p2p/test/util/key.go b/p2p/test/util/key.go index 7ab179933..d75a692eb 100644 --- a/p2p/test/util/key.go +++ b/p2p/test/util/key.go @@ -5,14 +5,14 @@ import ( "io" "testing" - u "github.com/ipfs/go-ipfs-util" testutil "github.com/ipfs/go-libp2p/testutil" - logging "github.com/ipfs/go-log" + u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util" + logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" ic "github.com/ipfs/go-libp2p/p2p/crypto" peer "github.com/ipfs/go-libp2p/p2p/peer" - ma "github.com/jbenet/go-multiaddr" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" ) var log = logging.Logger("boguskey") diff --git a/p2p/test/util/util.go b/p2p/test/util/util.go index 15abf042b..bb7300e8c 100644 --- a/p2p/test/util/util.go +++ b/p2p/test/util/util.go @@ -10,8 +10,8 @@ import ( peer "github.com/ipfs/go-libp2p/p2p/peer" tu "github.com/ipfs/go-libp2p/testutil" - ma "github.com/jbenet/go-multiaddr" - context "golang.org/x/net/context" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" + context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ) func GenSwarmNetwork(t *testing.T, ctx context.Context) *swarm.Network { diff --git a/testutil/gen.go b/testutil/gen.go index a931cc899..1dea71f1c 100644 --- a/testutil/gen.go +++ b/testutil/gen.go @@ -8,11 +8,11 @@ import ( "sync" "testing" - u "github.com/ipfs/go-ipfs-util" ci "github.com/ipfs/go-libp2p/p2p/crypto" peer "github.com/ipfs/go-libp2p/p2p/peer" + u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util" - ma "github.com/jbenet/go-multiaddr" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" ) // ZeroLocalTCPAddress is the "zero" tcp local multiaddr. This means: diff --git a/testutil/identity.go b/testutil/identity.go index 04a8ead83..2b3231f62 100644 --- a/testutil/identity.go +++ b/testutil/identity.go @@ -5,7 +5,7 @@ import ( ci "github.com/ipfs/go-libp2p/p2p/crypto" peer "github.com/ipfs/go-libp2p/p2p/peer" - ma "github.com/jbenet/go-multiaddr" + ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr" ) type Identity interface {