diff --git a/examples/hosts/main.go b/examples/hosts/main.go index 8625df633c5d260a9ec24d1e2d06fe0e777c29c9..bfcc3cebe0e66c4b5ac5c6eaed14e367fcc90dca 100644 --- a/examples/hosts/main.go +++ b/examples/hosts/main.go @@ -14,10 +14,10 @@ import ( bhost "github.com/libp2p/go-libp2p/p2p/host/basic" swarm "github.com/libp2p/go-libp2p/p2p/net/swarm" - peer "github.com/ipfs/go-libp2p-peer" - pstore "github.com/ipfs/go-libp2p-peerstore" - ma "github.com/jbenet/go-multiaddr" + peer "github.com/libp2p/go-libp2p-peer" + pstore "github.com/libp2p/go-libp2p-peerstore" testutil "github.com/libp2p/go-testutil" + ma "github.com/multiformats/go-multiaddr" ) // create a 'Host' with a random peer to listen on the given address diff --git a/examples/justtcp/main.go b/examples/justtcp/main.go index 571c0db57f78f331baa8a84a6577c24930620e59..ac56e2360484fa55fb8d5dccfee130e0406f0de0 100644 --- a/examples/justtcp/main.go +++ b/examples/justtcp/main.go @@ -5,9 +5,9 @@ import ( "fmt" "os" - ma "github.com/jbenet/go-multiaddr" "github.com/libp2p/go-libp2p/p2p/net/swarm" tcpt "github.com/libp2p/go-tcp-transport" + ma "github.com/multiformats/go-multiaddr" ) func fatal(i interface{}) { diff --git a/p2p/discovery/mdns.go b/p2p/discovery/mdns.go index 1d616073e3768baff2a78118ec2f78cfd031e584..003567cc496c1460695be12c91921fa1b47ff7c2 100644 --- a/p2p/discovery/mdns.go +++ b/p2p/discovery/mdns.go @@ -10,12 +10,12 @@ import ( "sync" "time" - "github.com/ipfs/go-libp2p-peer" - pstore "github.com/ipfs/go-libp2p-peerstore" logging "github.com/ipfs/go-log" - ma "github.com/jbenet/go-multiaddr" - manet "github.com/jbenet/go-multiaddr-net" "github.com/libp2p/go-libp2p-host" + "github.com/libp2p/go-libp2p-peer" + pstore "github.com/libp2p/go-libp2p-peerstore" + ma "github.com/multiformats/go-multiaddr" + manet "github.com/multiformats/go-multiaddr-net" "github.com/whyrusleeping/mdns" ) diff --git a/p2p/discovery/mdns_test.go b/p2p/discovery/mdns_test.go index a1d26ef91126f8d67cb46c21757bb9ba8a31f7e0..8c5250048e2723f1157fccd1e4c862135a04b894 100644 --- a/p2p/discovery/mdns_test.go +++ b/p2p/discovery/mdns_test.go @@ -8,7 +8,7 @@ import ( host "github.com/libp2p/go-libp2p-host" netutil "github.com/libp2p/go-libp2p/p2p/test/util" - pstore "github.com/ipfs/go-libp2p-peerstore" + pstore "github.com/libp2p/go-libp2p-peerstore" ) type DiscoveryNotifee struct { diff --git a/p2p/host/basic/basic_host.go b/p2p/host/basic/basic_host.go index 50dd403be11c5895f64640924df0905d71ec8410..355f5490aca8043d047ae612c0a082bd44ee49b8 100644 --- a/p2p/host/basic/basic_host.go +++ b/p2p/host/basic/basic_host.go @@ -8,15 +8,15 @@ import ( identify "github.com/libp2p/go-libp2p/p2p/protocol/identify" relay "github.com/libp2p/go-libp2p/p2p/protocol/relay" - peer "github.com/ipfs/go-libp2p-peer" - pstore "github.com/ipfs/go-libp2p-peerstore" logging "github.com/ipfs/go-log" - ma "github.com/jbenet/go-multiaddr" goprocess "github.com/jbenet/goprocess" metrics "github.com/libp2p/go-libp2p-metrics" mstream "github.com/libp2p/go-libp2p-metrics/stream" inet "github.com/libp2p/go-libp2p-net" + peer "github.com/libp2p/go-libp2p-peer" + pstore "github.com/libp2p/go-libp2p-peerstore" protocol "github.com/libp2p/go-libp2p-protocol" + ma "github.com/multiformats/go-multiaddr" msmux "github.com/whyrusleeping/go-multistream" ) diff --git a/p2p/host/basic/natmgr.go b/p2p/host/basic/natmgr.go index 8f375b906da4fa27f41b71bb89016f6e895b1fd8..8844b0791e305eedba7f3f25c33142aad2c2fb50 100644 --- a/p2p/host/basic/natmgr.go +++ b/p2p/host/basic/natmgr.go @@ -6,10 +6,10 @@ import ( inat "github.com/libp2p/go-libp2p/p2p/nat" - lgbl "github.com/ipfs/go-libp2p-loggables" - ma "github.com/jbenet/go-multiaddr" goprocess "github.com/jbenet/goprocess" + lgbl "github.com/libp2p/go-libp2p-loggables" inet "github.com/libp2p/go-libp2p-net" + ma "github.com/multiformats/go-multiaddr" ) // natManager takes care of adding + removing port mappings to the nat. diff --git a/p2p/host/routed/routed.go b/p2p/host/routed/routed.go index a9ba767b1493e260d825a782b6b1e75e6ee5a25d..7279a78b47713963ed4a51712e6401eb6ba87cdb 100644 --- a/p2p/host/routed/routed.go +++ b/p2p/host/routed/routed.go @@ -7,14 +7,14 @@ import ( host "github.com/libp2p/go-libp2p-host" - lgbl "github.com/ipfs/go-libp2p-loggables" - peer "github.com/ipfs/go-libp2p-peer" - pstore "github.com/ipfs/go-libp2p-peerstore" logging "github.com/ipfs/go-log" - ma "github.com/jbenet/go-multiaddr" + lgbl "github.com/libp2p/go-libp2p-loggables" metrics "github.com/libp2p/go-libp2p-metrics" inet "github.com/libp2p/go-libp2p-net" + peer "github.com/libp2p/go-libp2p-peer" + pstore "github.com/libp2p/go-libp2p-peerstore" protocol "github.com/libp2p/go-libp2p-protocol" + ma "github.com/multiformats/go-multiaddr" msmux "github.com/whyrusleeping/go-multistream" ) diff --git a/p2p/nat/mapping.go b/p2p/nat/mapping.go index b2aeb9c4d7e7ba8b84c2b4d923ddbaad32cc1bba..b03b002d0005320d4dfe5f035caa3e9fc784fbfe 100644 --- a/p2p/nat/mapping.go +++ b/p2p/nat/mapping.go @@ -5,9 +5,9 @@ import ( "sync" "time" - ma "github.com/jbenet/go-multiaddr" - manet "github.com/jbenet/go-multiaddr-net" "github.com/jbenet/goprocess" + ma "github.com/multiformats/go-multiaddr" + manet "github.com/multiformats/go-multiaddr-net" ) // Mapping represents a port mapping in a NAT. diff --git a/p2p/nat/nat.go b/p2p/nat/nat.go index 3a4ae60b4d35a1f0d68ea03a65195b8738478df2..602667a3fc9d0808c9607a796d9e3afb2bcf77bb 100644 --- a/p2p/nat/nat.go +++ b/p2p/nat/nat.go @@ -10,10 +10,10 @@ import ( nat "github.com/fd/go-nat" logging "github.com/ipfs/go-log" - ma "github.com/jbenet/go-multiaddr" - manet "github.com/jbenet/go-multiaddr-net" goprocess "github.com/jbenet/goprocess" periodic "github.com/jbenet/goprocess/periodic" + ma "github.com/multiformats/go-multiaddr" + manet "github.com/multiformats/go-multiaddr-net" ) var ( diff --git a/p2p/net/mock/interface.go b/p2p/net/mock/interface.go index 9e5a7bd4f70f5f406c8aa4b45e0c4e2ba8dbc2fa..e62fc4d7185ce52b0bb6794ac2e23ed6c51693bc 100644 --- a/p2p/net/mock/interface.go +++ b/p2p/net/mock/interface.go @@ -12,11 +12,11 @@ import ( host "github.com/libp2p/go-libp2p-host" - ic "github.com/ipfs/go-libp2p-crypto" - peer "github.com/ipfs/go-libp2p-peer" - pstore "github.com/ipfs/go-libp2p-peerstore" - ma "github.com/jbenet/go-multiaddr" + ic "github.com/libp2p/go-libp2p-crypto" inet "github.com/libp2p/go-libp2p-net" + peer "github.com/libp2p/go-libp2p-peer" + pstore "github.com/libp2p/go-libp2p-peerstore" + ma "github.com/multiformats/go-multiaddr" ) type Mocknet interface { diff --git a/p2p/net/mock/mock_conn.go b/p2p/net/mock/mock_conn.go index 55488b34a8d20efec8cdf8f8303a8751771a2bc5..a552c7e24a5eb67ac2f3ec4501d06effd74fbc93 100644 --- a/p2p/net/mock/mock_conn.go +++ b/p2p/net/mock/mock_conn.go @@ -4,11 +4,11 @@ import ( "container/list" "sync" - ic "github.com/ipfs/go-libp2p-crypto" - peer "github.com/ipfs/go-libp2p-peer" - ma "github.com/jbenet/go-multiaddr" process "github.com/jbenet/goprocess" + ic "github.com/libp2p/go-libp2p-crypto" inet "github.com/libp2p/go-libp2p-net" + peer "github.com/libp2p/go-libp2p-peer" + ma "github.com/multiformats/go-multiaddr" ) // conn represents one side's perspective of a diff --git a/p2p/net/mock/mock_link.go b/p2p/net/mock/mock_link.go index 9beeada4d600cf62080d5c4bab4f9200ba8ac2e6..bcb7d9a9461bb1119f05582851e4bcd1c99e2649 100644 --- a/p2p/net/mock/mock_link.go +++ b/p2p/net/mock/mock_link.go @@ -6,8 +6,8 @@ import ( "sync" "time" - peer "github.com/ipfs/go-libp2p-peer" inet "github.com/libp2p/go-libp2p-net" + peer "github.com/libp2p/go-libp2p-peer" ) // link implements mocknet.Link diff --git a/p2p/net/mock/mock_net.go b/p2p/net/mock/mock_net.go index 6d0fdcbd06d2f1d024a4e8f09c9e3e07ea19e515..4de12ea5a31b5b741d24955c731889c3881bee7d 100644 --- a/p2p/net/mock/mock_net.go +++ b/p2p/net/mock/mock_net.go @@ -10,14 +10,14 @@ import ( bhost "github.com/libp2p/go-libp2p/p2p/host/basic" p2putil "github.com/libp2p/go-libp2p/p2p/test/util" - ic "github.com/ipfs/go-libp2p-crypto" - peer "github.com/ipfs/go-libp2p-peer" - pstore "github.com/ipfs/go-libp2p-peerstore" - ma "github.com/jbenet/go-multiaddr" "github.com/jbenet/goprocess" goprocessctx "github.com/jbenet/goprocess/context" + ic "github.com/libp2p/go-libp2p-crypto" inet "github.com/libp2p/go-libp2p-net" + peer "github.com/libp2p/go-libp2p-peer" + pstore "github.com/libp2p/go-libp2p-peerstore" testutil "github.com/libp2p/go-testutil" + ma "github.com/multiformats/go-multiaddr" ) // mocknet implements mocknet.Mocknet diff --git a/p2p/net/mock/mock_notif_test.go b/p2p/net/mock/mock_notif_test.go index 88b347fc41861d7466f94276094f084f43eb2d98..488e86d1bcd9c1eb579b3ecdd0157be15c30d2de 100644 --- a/p2p/net/mock/mock_notif_test.go +++ b/p2p/net/mock/mock_notif_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - peer "github.com/ipfs/go-libp2p-peer" - ma "github.com/jbenet/go-multiaddr" inet "github.com/libp2p/go-libp2p-net" + peer "github.com/libp2p/go-libp2p-peer" + ma "github.com/multiformats/go-multiaddr" ) func TestNotifications(t *testing.T) { diff --git a/p2p/net/mock/mock_peernet.go b/p2p/net/mock/mock_peernet.go index 5a5b61041d41e1f0feaf72215311e215384b7ec0..d0265b878b7324c179681e788988c071a695bc32 100644 --- a/p2p/net/mock/mock_peernet.go +++ b/p2p/net/mock/mock_peernet.go @@ -6,12 +6,12 @@ import ( "math/rand" "sync" - peer "github.com/ipfs/go-libp2p-peer" - pstore "github.com/ipfs/go-libp2p-peerstore" - ma "github.com/jbenet/go-multiaddr" "github.com/jbenet/goprocess" goprocessctx "github.com/jbenet/goprocess/context" inet "github.com/libp2p/go-libp2p-net" + peer "github.com/libp2p/go-libp2p-peer" + pstore "github.com/libp2p/go-libp2p-peerstore" + ma "github.com/multiformats/go-multiaddr" ) // peernet implements inet.Network diff --git a/p2p/net/mock/mock_printer.go b/p2p/net/mock/mock_printer.go index 0465922d843625c77fa7a5fd3cdc6445d899e742..4990811a3730ad18bd8b687988b5813ba5eab338 100644 --- a/p2p/net/mock/mock_printer.go +++ b/p2p/net/mock/mock_printer.go @@ -4,8 +4,8 @@ import ( "fmt" "io" - peer "github.com/ipfs/go-libp2p-peer" inet "github.com/libp2p/go-libp2p-net" + peer "github.com/libp2p/go-libp2p-peer" ) // separate object so our interfaces are separate :) diff --git a/p2p/net/mock/mock_test.go b/p2p/net/mock/mock_test.go index e6e28eeda3227b5cc116ea18324c3f78eb36a88f..6f6b20cc57dcfd09f94baa9f5d611a924ad3e16b 100644 --- a/p2p/net/mock/mock_test.go +++ b/p2p/net/mock/mock_test.go @@ -12,8 +12,8 @@ import ( inet "github.com/libp2p/go-libp2p-net" - peer "github.com/ipfs/go-libp2p-peer" detectrace "github.com/jbenet/go-detect-race" + peer "github.com/libp2p/go-libp2p-peer" protocol "github.com/libp2p/go-libp2p-protocol" testutil "github.com/libp2p/go-testutil" ) diff --git a/p2p/net/swarm/dial_sync.go b/p2p/net/swarm/dial_sync.go index a63c047ac8552ec598262d481827fb0491862d28..75d3f0fbee1b545c3a538f602b6113d21d083104 100644 --- a/p2p/net/swarm/dial_sync.go +++ b/p2p/net/swarm/dial_sync.go @@ -4,7 +4,7 @@ import ( "context" "sync" - peer "github.com/ipfs/go-libp2p-peer" + peer "github.com/libp2p/go-libp2p-peer" ) type DialFunc func(context.Context, peer.ID) (*Conn, error) diff --git a/p2p/net/swarm/dial_sync_test.go b/p2p/net/swarm/dial_sync_test.go index 61a69ce38692c4105066f86efbc54e73b60169f1..ca81a9c87209594b5a270ba85c19fc6ac10cb803 100644 --- a/p2p/net/swarm/dial_sync_test.go +++ b/p2p/net/swarm/dial_sync_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - peer "github.com/ipfs/go-libp2p-peer" + peer "github.com/libp2p/go-libp2p-peer" ) func getMockDialFunc() (DialFunc, func(), context.Context, <-chan struct{}) { diff --git a/p2p/net/swarm/dial_test.go b/p2p/net/swarm/dial_test.go index 8e7b48fc2b3521aff5c76e67dc3696506507ddca..dabb0bdb00e0cc623f96bda7f5724abaf51e2fcf 100644 --- a/p2p/net/swarm/dial_test.go +++ b/p2p/net/swarm/dial_test.go @@ -7,13 +7,13 @@ import ( "testing" "time" - peer "github.com/ipfs/go-libp2p-peer" - pstore "github.com/ipfs/go-libp2p-peerstore" - ma "github.com/jbenet/go-multiaddr" - manet "github.com/jbenet/go-multiaddr-net" addrutil "github.com/libp2p/go-addr-util" + peer "github.com/libp2p/go-libp2p-peer" + pstore "github.com/libp2p/go-libp2p-peerstore" testutil "github.com/libp2p/go-testutil" ci "github.com/libp2p/go-testutil/ci" + ma "github.com/multiformats/go-multiaddr" + manet "github.com/multiformats/go-multiaddr-net" ) func closeSwarms(swarms []*Swarm) { diff --git a/p2p/net/swarm/limiter.go b/p2p/net/swarm/limiter.go index bf4bcf0f5c180344439c7936f4b3e3a0e4c58564..5e96908e41e07099b86e09587a8d7f5f1b488c33 100644 --- a/p2p/net/swarm/limiter.go +++ b/p2p/net/swarm/limiter.go @@ -4,10 +4,10 @@ import ( "context" "sync" - peer "github.com/ipfs/go-libp2p-peer" - ma "github.com/jbenet/go-multiaddr" addrutil "github.com/libp2p/go-addr-util" iconn "github.com/libp2p/go-libp2p-interface-conn" + peer "github.com/libp2p/go-libp2p-peer" + ma "github.com/multiformats/go-multiaddr" ) type dialResult struct { diff --git a/p2p/net/swarm/limiter_test.go b/p2p/net/swarm/limiter_test.go index 31ac8435df837da0d49ab22ac39b60a8e4d0dcb7..646019d265c11379af30099a3b7304f8fd18176c 100644 --- a/p2p/net/swarm/limiter_test.go +++ b/p2p/net/swarm/limiter_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - peer "github.com/ipfs/go-libp2p-peer" - ma "github.com/jbenet/go-multiaddr" iconn "github.com/libp2p/go-libp2p-interface-conn" + peer "github.com/libp2p/go-libp2p-peer" + ma "github.com/multiformats/go-multiaddr" mafmt "github.com/whyrusleeping/mafmt" ) diff --git a/p2p/net/swarm/peers_test.go b/p2p/net/swarm/peers_test.go index 5eadf4e6716dc98cbe1ade518fde04a86236a4b4..3259264ae82fce2584bf41a135f1b360be626376 100644 --- a/p2p/net/swarm/peers_test.go +++ b/p2p/net/swarm/peers_test.go @@ -4,9 +4,9 @@ import ( "testing" "context" - peer "github.com/ipfs/go-libp2p-peer" - pstore "github.com/ipfs/go-libp2p-peerstore" - ma "github.com/jbenet/go-multiaddr" + peer "github.com/libp2p/go-libp2p-peer" + pstore "github.com/libp2p/go-libp2p-peerstore" + ma "github.com/multiformats/go-multiaddr" ) func TestPeers(t *testing.T) { diff --git a/p2p/net/swarm/simul_test.go b/p2p/net/swarm/simul_test.go index 3518f139e6edd95d563488a2b0b2cc98e5b110a7..8935773296a26518af8230f8c33386b4366d3bf9 100644 --- a/p2p/net/swarm/simul_test.go +++ b/p2p/net/swarm/simul_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - peer "github.com/ipfs/go-libp2p-peer" - pstore "github.com/ipfs/go-libp2p-peerstore" - ma "github.com/jbenet/go-multiaddr" + peer "github.com/libp2p/go-libp2p-peer" + pstore "github.com/libp2p/go-libp2p-peerstore" ci "github.com/libp2p/go-testutil/ci" + ma "github.com/multiformats/go-multiaddr" ) func TestSimultOpen(t *testing.T) { diff --git a/p2p/net/swarm/swarm.go b/p2p/net/swarm/swarm.go index 77c7daff040f6bd0ded6bca57248f472a06199ac..bb179bbc69efda9fdd6621a702d5db73c9913b65 100644 --- a/p2p/net/swarm/swarm.go +++ b/p2p/net/swarm/swarm.go @@ -11,23 +11,23 @@ import ( "sync" "time" - ci "github.com/ipfs/go-libp2p-crypto" - peer "github.com/ipfs/go-libp2p-peer" - pstore "github.com/ipfs/go-libp2p-peerstore" logging "github.com/ipfs/go-log" - ma "github.com/jbenet/go-multiaddr" ps "github.com/jbenet/go-peerstream" pst "github.com/jbenet/go-stream-muxer" "github.com/jbenet/goprocess" goprocessctx "github.com/jbenet/goprocess/context" addrutil "github.com/libp2p/go-addr-util" conn "github.com/libp2p/go-libp2p-conn" + ci "github.com/libp2p/go-libp2p-crypto" metrics "github.com/libp2p/go-libp2p-metrics" mconn "github.com/libp2p/go-libp2p-metrics/conn" inet "github.com/libp2p/go-libp2p-net" + peer "github.com/libp2p/go-libp2p-peer" + pstore "github.com/libp2p/go-libp2p-peerstore" transport "github.com/libp2p/go-libp2p-transport" filter "github.com/libp2p/go-maddr-filter" tcpt "github.com/libp2p/go-tcp-transport" + ma "github.com/multiformats/go-multiaddr" psmss "github.com/whyrusleeping/go-smux-multistream" spdy "github.com/whyrusleeping/go-smux-spdystream" yamux "github.com/whyrusleeping/go-smux-yamux" diff --git a/p2p/net/swarm/swarm_addr.go b/p2p/net/swarm/swarm_addr.go index 0ab2c7ea1c552d473691561c09940e60a31bd06c..78a3f5351a10697ea241f0f498bf05d3d1d17aa5 100644 --- a/p2p/net/swarm/swarm_addr.go +++ b/p2p/net/swarm/swarm_addr.go @@ -1,9 +1,9 @@ package swarm import ( - ma "github.com/jbenet/go-multiaddr" addrutil "github.com/libp2p/go-addr-util" iconn "github.com/libp2p/go-libp2p-interface-conn" + ma "github.com/multiformats/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 5d2225405ab2517ef79d478381c7858345c13870..011b706d813c804922d7cd0775dba8195e7caa0b 100644 --- a/p2p/net/swarm/swarm_addr_test.go +++ b/p2p/net/swarm/swarm_addr_test.go @@ -4,11 +4,11 @@ import ( "context" "testing" - pstore "github.com/ipfs/go-libp2p-peerstore" - ma "github.com/jbenet/go-multiaddr" addrutil "github.com/libp2p/go-addr-util" metrics "github.com/libp2p/go-libp2p-metrics" + pstore "github.com/libp2p/go-libp2p-peerstore" testutil "github.com/libp2p/go-testutil" + ma "github.com/multiformats/go-multiaddr" ) func TestFilterAddrs(t *testing.T) { diff --git a/p2p/net/swarm/swarm_conn.go b/p2p/net/swarm/swarm_conn.go index 8128a3e6abbf96a2a965bf07c70852f62d4bd120..72609f0f329cc1e1759d6deb1e5b7226df972920 100644 --- a/p2p/net/swarm/swarm_conn.go +++ b/p2p/net/swarm/swarm_conn.go @@ -4,12 +4,12 @@ import ( "context" "fmt" - ic "github.com/ipfs/go-libp2p-crypto" - peer "github.com/ipfs/go-libp2p-peer" - ma "github.com/jbenet/go-multiaddr" ps "github.com/jbenet/go-peerstream" + ic "github.com/libp2p/go-libp2p-crypto" iconn "github.com/libp2p/go-libp2p-interface-conn" inet "github.com/libp2p/go-libp2p-net" + peer "github.com/libp2p/go-libp2p-peer" + ma "github.com/multiformats/go-multiaddr" ) // 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 bfe9f0382e5b15d7a620d4fb6a18d775797930fa..0f153016983a83403bd4fccf908373bb6e61ab0c 100644 --- a/p2p/net/swarm/swarm_dial.go +++ b/p2p/net/swarm/swarm_dial.go @@ -7,11 +7,11 @@ import ( "sync" "time" - lgbl "github.com/ipfs/go-libp2p-loggables" - peer "github.com/ipfs/go-libp2p-peer" - ma "github.com/jbenet/go-multiaddr" addrutil "github.com/libp2p/go-addr-util" iconn "github.com/libp2p/go-libp2p-interface-conn" + lgbl "github.com/libp2p/go-libp2p-loggables" + peer "github.com/libp2p/go-libp2p-peer" + ma "github.com/multiformats/go-multiaddr" ) // Diagram of dial sync: diff --git a/p2p/net/swarm/swarm_listen.go b/p2p/net/swarm/swarm_listen.go index 756084abc7591deb1333e5391f260dee904d4d40..d76d1e640efc7f9dec2c189b1d9e949f4eea748d 100644 --- a/p2p/net/swarm/swarm_listen.go +++ b/p2p/net/swarm/swarm_listen.go @@ -4,14 +4,14 @@ import ( "context" "fmt" - lgbl "github.com/ipfs/go-libp2p-loggables" - ma "github.com/jbenet/go-multiaddr" ps "github.com/jbenet/go-peerstream" conn "github.com/libp2p/go-libp2p-conn" iconn "github.com/libp2p/go-libp2p-interface-conn" + lgbl "github.com/libp2p/go-libp2p-loggables" mconn "github.com/libp2p/go-libp2p-metrics/conn" inet "github.com/libp2p/go-libp2p-net" transport "github.com/libp2p/go-libp2p-transport" + ma "github.com/multiformats/go-multiaddr" ) func (s *Swarm) AddListenAddr(a ma.Multiaddr) error { diff --git a/p2p/net/swarm/swarm_net.go b/p2p/net/swarm/swarm_net.go index 86755cf8bed6a93fa0ed35eece8b30c7d7c94340..90356a0fc7e37ddf3daa5a58be0d53d1bd3fc08c 100644 --- a/p2p/net/swarm/swarm_net.go +++ b/p2p/net/swarm/swarm_net.go @@ -4,12 +4,12 @@ import ( "context" "fmt" - peer "github.com/ipfs/go-libp2p-peer" - pstore "github.com/ipfs/go-libp2p-peerstore" - ma "github.com/jbenet/go-multiaddr" "github.com/jbenet/goprocess" metrics "github.com/libp2p/go-libp2p-metrics" inet "github.com/libp2p/go-libp2p-net" + peer "github.com/libp2p/go-libp2p-peer" + pstore "github.com/libp2p/go-libp2p-peerstore" + ma "github.com/multiformats/go-multiaddr" ) // Network implements the inet.Network interface. diff --git a/p2p/net/swarm/swarm_notif_test.go b/p2p/net/swarm/swarm_notif_test.go index 9e914b8218b99faf7f72a39c9e76d09d5ee28c0f..d9e9df62a59ba47b9445812814b378813c9e9054 100644 --- a/p2p/net/swarm/swarm_notif_test.go +++ b/p2p/net/swarm/swarm_notif_test.go @@ -5,9 +5,9 @@ import ( "time" "context" - peer "github.com/ipfs/go-libp2p-peer" - ma "github.com/jbenet/go-multiaddr" inet "github.com/libp2p/go-libp2p-net" + peer "github.com/libp2p/go-libp2p-peer" + ma "github.com/multiformats/go-multiaddr" ) func streamsSame(a, b inet.Stream) bool { diff --git a/p2p/net/swarm/swarm_test.go b/p2p/net/swarm/swarm_test.go index f0ed560cf2377eacb65324e9a131642820e4812d..9deb918f3cb2a329e990095cfced00674c12eb31 100644 --- a/p2p/net/swarm/swarm_test.go +++ b/p2p/net/swarm/swarm_test.go @@ -10,12 +10,12 @@ import ( "testing" "time" - peer "github.com/ipfs/go-libp2p-peer" - pstore "github.com/ipfs/go-libp2p-peerstore" - ma "github.com/jbenet/go-multiaddr" metrics "github.com/libp2p/go-libp2p-metrics" inet "github.com/libp2p/go-libp2p-net" + peer "github.com/libp2p/go-libp2p-peer" + pstore "github.com/libp2p/go-libp2p-peerstore" testutil "github.com/libp2p/go-testutil" + ma "github.com/multiformats/go-multiaddr" ) func EchoStreamHandler(stream inet.Stream) { diff --git a/p2p/protocol/identify/id.go b/p2p/protocol/identify/id.go index 0324248f6ed6590bea89e8141f6a3383b59a81d3..36e08b2279d6f2267802eab5d8caceadabb91297 100644 --- a/p2p/protocol/identify/id.go +++ b/p2p/protocol/identify/id.go @@ -9,15 +9,15 @@ import ( semver "github.com/coreos/go-semver/semver" ggio "github.com/gogo/protobuf/io" - ic "github.com/ipfs/go-libp2p-crypto" - lgbl "github.com/ipfs/go-libp2p-loggables" - peer "github.com/ipfs/go-libp2p-peer" - pstore "github.com/ipfs/go-libp2p-peerstore" logging "github.com/ipfs/go-log" - ma "github.com/jbenet/go-multiaddr" + ic "github.com/libp2p/go-libp2p-crypto" host "github.com/libp2p/go-libp2p-host" + lgbl "github.com/libp2p/go-libp2p-loggables" mstream "github.com/libp2p/go-libp2p-metrics/stream" inet "github.com/libp2p/go-libp2p-net" + peer "github.com/libp2p/go-libp2p-peer" + pstore "github.com/libp2p/go-libp2p-peerstore" + ma "github.com/multiformats/go-multiaddr" msmux "github.com/whyrusleeping/go-multistream" ) diff --git a/p2p/protocol/identify/id_test.go b/p2p/protocol/identify/id_test.go index bc0c90f99d449944a0d199115ef8dee3c5ccbdd7..a7a87bc85773e9922015297eb6c20b2159ba57af 100644 --- a/p2p/protocol/identify/id_test.go +++ b/p2p/protocol/identify/id_test.go @@ -5,13 +5,13 @@ import ( "testing" "time" - ic "github.com/ipfs/go-libp2p-crypto" - peer "github.com/ipfs/go-libp2p-peer" + ic "github.com/libp2p/go-libp2p-crypto" + peer "github.com/libp2p/go-libp2p-peer" identify "github.com/libp2p/go-libp2p/p2p/protocol/identify" testutil "github.com/libp2p/go-libp2p/p2p/test/util" - ma "github.com/jbenet/go-multiaddr" host "github.com/libp2p/go-libp2p-host" + ma "github.com/multiformats/go-multiaddr" ) func subtestIDService(t *testing.T, postDialWait time.Duration) { diff --git a/p2p/protocol/identify/obsaddr.go b/p2p/protocol/identify/obsaddr.go index f6150c5e4b4b8508a624404f09b831db2adb0fb6..72263e37631c093afbb76264bad4fae483d857e9 100644 --- a/p2p/protocol/identify/obsaddr.go +++ b/p2p/protocol/identify/obsaddr.go @@ -4,8 +4,8 @@ import ( "sync" "time" - pstore "github.com/ipfs/go-libp2p-peerstore" - ma "github.com/jbenet/go-multiaddr" + pstore "github.com/libp2p/go-libp2p-peerstore" + ma "github.com/multiformats/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 81413c4f091f703f676aa437b2fedf66ab1da9d3..ac3b239f0e90dccdf5d29a0bf0fd38a51c04c2d6 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 "github.com/multiformats/go-multiaddr" ) // TestObsAddrSet diff --git a/p2p/protocol/ping/ping.go b/p2p/protocol/ping/ping.go index ace786ee2983e90f542342eadc9f4d552b2ce1ab..d6e571e0f31f9e28382df0b5116b8e5ad1bc3fa8 100644 --- a/p2p/protocol/ping/ping.go +++ b/p2p/protocol/ping/ping.go @@ -8,10 +8,10 @@ import ( "time" u "github.com/ipfs/go-ipfs-util" - peer "github.com/ipfs/go-libp2p-peer" logging "github.com/ipfs/go-log" host "github.com/libp2p/go-libp2p-host" inet "github.com/libp2p/go-libp2p-net" + peer "github.com/libp2p/go-libp2p-peer" ) var log = logging.Logger("ping") diff --git a/p2p/protocol/ping/ping_test.go b/p2p/protocol/ping/ping_test.go index 850e64381632356b14817b07dee978f7711ce7ec..1c420ca7ef5955ff45d75d3a77975a17fc6d419d 100644 --- a/p2p/protocol/ping/ping_test.go +++ b/p2p/protocol/ping/ping_test.go @@ -7,8 +7,8 @@ import ( netutil "github.com/libp2p/go-libp2p/p2p/test/util" "context" - peer "github.com/ipfs/go-libp2p-peer" - pstore "github.com/ipfs/go-libp2p-peerstore" + peer "github.com/libp2p/go-libp2p-peer" + pstore "github.com/libp2p/go-libp2p-peerstore" ) func TestPing(t *testing.T) { diff --git a/p2p/protocol/relay/relay.go b/p2p/protocol/relay/relay.go index cef8d835fe5d24e40b30f6f91f1eec8a70e0eb2f..dabda1ae644d6dd46560c2f58aa6cc388c7f2513 100644 --- a/p2p/protocol/relay/relay.go +++ b/p2p/protocol/relay/relay.go @@ -8,10 +8,10 @@ import ( host "github.com/libp2p/go-libp2p-host" - peer "github.com/ipfs/go-libp2p-peer" logging "github.com/ipfs/go-log" mh "github.com/jbenet/go-multihash" inet "github.com/libp2p/go-libp2p-net" + peer "github.com/libp2p/go-libp2p-peer" protocol "github.com/libp2p/go-libp2p-protocol" ) diff --git a/p2p/test/backpressure/backpressure_test.go b/p2p/test/backpressure/backpressure_test.go index 9bbb22b197004c9bd2d409a1318967ea768656f2..c23944c2fda48587c14331e23e17d4fb1d85cfa3 100644 --- a/p2p/test/backpressure/backpressure_test.go +++ b/p2p/test/backpressure/backpressure_test.go @@ -8,10 +8,10 @@ import ( "context" u "github.com/ipfs/go-ipfs-util" - peer "github.com/ipfs/go-libp2p-peer" logging "github.com/ipfs/go-log" host "github.com/libp2p/go-libp2p-host" inet "github.com/libp2p/go-libp2p-net" + peer "github.com/libp2p/go-libp2p-peer" protocol "github.com/libp2p/go-libp2p-protocol" testutil "github.com/libp2p/go-libp2p/p2p/test/util" ) diff --git a/p2p/test/util/key.go b/p2p/test/util/key.go index 99bfb5bec8bf2c4f1e6f307a6d3000291c904a1f..501d6dd3ae8432690946af27042679d197273cea 100644 --- a/p2p/test/util/key.go +++ b/p2p/test/util/key.go @@ -6,12 +6,12 @@ import ( "testing" u "github.com/ipfs/go-ipfs-util" - ic "github.com/ipfs/go-libp2p-crypto" - peer "github.com/ipfs/go-libp2p-peer" logging "github.com/ipfs/go-log" + ic "github.com/libp2p/go-libp2p-crypto" + peer "github.com/libp2p/go-libp2p-peer" testutil "github.com/libp2p/go-testutil" - ma "github.com/jbenet/go-multiaddr" + ma "github.com/multiformats/go-multiaddr" ) var log = logging.Logger("boguskey") diff --git a/p2p/test/util/util.go b/p2p/test/util/util.go index 1104de0b9e4abaf783c792de944170aca95f3d50..b02e989b698a93b9f0715064d020add77212507c 100644 --- a/p2p/test/util/util.go +++ b/p2p/test/util/util.go @@ -7,11 +7,11 @@ import ( bhost "github.com/libp2p/go-libp2p/p2p/host/basic" swarm "github.com/libp2p/go-libp2p/p2p/net/swarm" - pstore "github.com/ipfs/go-libp2p-peerstore" - ma "github.com/jbenet/go-multiaddr" metrics "github.com/libp2p/go-libp2p-metrics" inet "github.com/libp2p/go-libp2p-net" + pstore "github.com/libp2p/go-libp2p-peerstore" tu "github.com/libp2p/go-testutil" + ma "github.com/multiformats/go-multiaddr" ) func GenSwarmNetwork(t *testing.T, ctx context.Context) *swarm.Network { diff --git a/package.json b/package.json index 6e28ab500c23f6a45228a3073e4027c7d1f4447f..68236ed69a58cafcaa7c9964e12f0d3995ffe69d 100644 --- a/package.json +++ b/package.json @@ -24,9 +24,9 @@ "version": "0.0.0" }, { - "hash": "QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1", + "hash": "Qmb912gdngC1UWwTkhuW8knyRbcWeu5kqkxBpveLmW8bSr", "name": "go-ipfs-util", - "version": "1.0.0" + "version": "1.2.0" }, { "hash": "QmUusaX99BZoELh7dmPgirqRQ1FAmMnmnBn3oiqDFGBUSc", @@ -49,9 +49,9 @@ "version": "0.0.0" }, { - "hash": "QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn", + "hash": "QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP", "name": "goprocess", - "version": "0.0.0" + "version": "1.0.0" }, { "hash": "QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52", @@ -59,14 +59,14 @@ "version": "1.2.0" }, { - "hash": "QmY83KqqnQ286ZWbV2x7ixpeemH3cBpk8R54egS619WYff", + "hash": "QmT6Cp31887FpAc25z25YHgpFJohZedrYLWPPspRtj1Brp", "name": "go-multiaddr-net", - "version": "1.3.0" + "version": "1.5.1" }, { - "hash": "QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku", + "hash": "QmYDds3421prZgqKbLpEK7T9Aa2eVdQ7o3YarX1LVLdP2J", "name": "go-multihash", - "version": "0.0.0" + "version": "1.0.0" }, { "hash": "QmSMZwvs3n4GBikZ7hKzT17c3bk65FmyZo2JqtJ16swqCv", @@ -89,9 +89,9 @@ "version": "0.0.0" }, { - "hash": "QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd", + "hash": "QmUAQaWbKxGCUTuoQVvvicbQNZ9APF5pDGWyAZSe93AtKH", "name": "go-multiaddr", - "version": "0.0.0" + "version": "1.1.2" }, { "hash": "QmeYJHEk8UjVVZ4XCRTZe6dFQrb8pGWD81LYCgeLp8CvMB", @@ -109,9 +109,9 @@ "version": "1.0.0" }, { - "hash": "QmbcS9XrwZkF1rZj8bBwwzoYhVuA2PCnPhFUL1pyWGgt2A", + "hash": "QmeQW4ayVqi7Jjay1SrP2wYydsH9KwSrzQBnqyC25gPFnG", "name": "go-notifier", - "version": "0.0.0" + "version": "1.0.0" }, { "hash": "QmWHgLqrghM9zw77nF6gdvT9ExQ2RB9pLxkd8sDHZf1rWb", @@ -125,9 +125,9 @@ }, { "author": "whyrusleeping", - "hash": "QmeLQ13LftT9XhNn22piZc3GP56fGqhijuL5Y8KdUaRn1g", + "hash": "QmQkdkvXE4oKXAcLZK5d7Zc6xvyukQc8WVjX7QvxDJ7hJj", "name": "mafmt", - "version": "1.1.1" + "version": "1.1.2" }, { "author": "whyrusleeping", @@ -137,15 +137,15 @@ }, { "author": "whyrusleeping", - "hash": "QmYrv4LgCC8FhG2Ab4bwuq5DqBdwMtx3hMb3KKJDZcr2d7", + "hash": "QmTMy4hVSY28DdwJ9kBz6y7q6MuioFzPcpM3Ma3aPjo1i3", "name": "go-libp2p-loggables", - "version": "1.0.11" + "version": "1.1.1" }, { "author": "whyrusleeping", - "hash": "QmbnPJidHfeekkdLkoboBooA56KB92cT8csDmJwCc2bQJ1", + "hash": "QmfDU2uJQkxXP6nDTfSPSx4rQt4S4fU4XMRoQA5DzYGWfe", "name": "go-libp2p-secio", - "version": "1.0.12" + "version": "1.1.0" }, { "author": "whyrusleeping", @@ -167,33 +167,33 @@ }, { "author": "whyrusleeping", - "hash": "QmYkwVGkwoPbMVQEbf6LonZg4SsCxGP3H7PBEtdNCNRyxD", + "hash": "QmXXCcQ7CLg5a81Ui9TTR35QcR4y7ZyihxwfjqaHfUVcVo", "name": "go-libp2p-peerstore", - "version": "1.2.5" + "version": "1.3.0" }, { "author": "whyrusleeping", - "hash": "QmNvbe83jVfR13jAHpmEzrV21YJ1QRrRWJh6Vw9uBDaQdS", + "hash": "QmSC7uaj9igPHBEBRVD48iahCe3kBrywsmSaU4FesHgXWn", "name": "ws-transport", - "version": "1.3.0" + "version": "1.4.1" }, { "author": "whyrusleeping", - "hash": "QmUDjsP471mkH5F4DoD5jQaTybX7ENU6YDULwQi9Keu3Vi", + "hash": "QmWMia2fBVBesMerbtApQY7Tj2sgTaziveBACfCRUcv45f", "name": "go-libp2p-transport", - "version": "2.1.2" + "version": "2.2.1" }, { "author": "whyrusleeping", - "hash": "QmXFU6HbpMaxJ3wtw96aSSqBcdJJqtuE2ipMopmh1T3be8", + "hash": "QmNiFRHdeJgN9svSGkEtmhd5sGvv3suSKZ1sRkLqoCzL76", "name": "go-tcp-transport", - "version": "1.0.2" + "version": "1.1.0" }, { "author": "whyrusleeping", - "hash": "QmaRNdghe7SY53L9WfyVesio7yvVnyXtgSpbBd9CJYfvJg", + "hash": "QmQb6oCvHE6iqsFbuGtG32GWeXLmAV5bKkj1pv1rdSAZMA", "name": "go-maddr-filter", - "version": "1.0.0" + "version": "1.1.0" }, { "author": "whyrusleeping", @@ -203,45 +203,45 @@ }, { "author": "whyrusleeping", - "hash": "QmT6RvBdXJ6xfPgEMT7LAmFcTEbs9Ggh2N3fYGfR1xN3HX", + "hash": "QmVDnc2zvyQm8LhT72n22THcshvH7j3qPMnhvjerQER62T", "name": "go-addr-util", - "version": "1.0.0" + "version": "1.1.1" }, { "author": "whyrusleeping", - "hash": "QmYpVUnnedgGrp6cX2pBii5HRQgcSr778FiKVe7o7nF5Z3", + "hash": "QmaEcA713Y54EtSsj7ZYfwXmsTfxrJ4oywr1iFt1d6LKY5", "name": "go-testutil", - "version": "1.0.2" + "version": "1.1.0" }, { "author": "whyrusleeping", - "hash": "Qmd4eGc7VMmVZu225mdCzsagdWJBaAVHmmvNFYSvxSUeX5", + "hash": "QmdiBXu57LDzaoovc89jypRSNEhxVZ4zRig2AsXm9VwrsS", "name": "go-libp2p-conn", - "version": "1.1.0" + "version": "1.2.1" }, { "author": "whyrusleeping", - "hash": "Qmcr6YS5QCPwejhBxZk5iFEvVEHSVzewbLVMyc64zefaUf", + "hash": "QmdXimY9QHaasZmw6hWojWnCJvfgxETjZQfg9g6ZrA9wMX", "name": "go-libp2p-net", - "version": "1.0.0" + "version": "1.2.1" }, { "author": "whyrusleeping", - "hash": "QmbidKjoAxLVE2skY74Rfw1QafReyf4w2FZqA8Sd7MxoVd", + "hash": "QmWpTXhTkpoCDEm9twJd5Rc9jFwy61emzxneeJzrVMfjGF", "name": "go-libp2p-metrics", - "version": "1.1.0" + "version": "1.2.0" }, { "author": "whyrusleeping", - "hash": "QmRxzoGdQaN6HYyqWnT82NnLLHBAZbTUvxPEfTBTjU7KCn", + "hash": "QmNxScD426NivSWRNJdLVfXLrzVdtNWxW74EnXAWJvgGwh", "name": "go-libp2p-interface-conn", - "version": "0.1.0" + "version": "0.1.2" }, { "author": "whyrusleeping", - "hash": "QmaAyA9QMVdzCYHv7QJnKu4Dzk4zfnFrHw9itzP9kEUKYW", + "hash": "QmdML3R42PRSwnt46jSuEts9bHSqLctVYEjJqMR3UYV8ki", "name": "go-libp2p-host", - "version": "1.0.0" + "version": "1.1.0" } ], "gxVersion": "0.4.0",