Skip to content

GitLab

Commit 17632a3b authored by Jeromy Johnson's avatar Jeromy Johnson
Browse files

Merge pull request #40 from ipfs/publish-3.0.0 

Publish 3.0.0
parents 0d7301a7 664cf000
Hide whitespace changes
Inline Side-by-side
p2p/net/conn/listen.go
View file @ 17632a3b
...@@ -7,16 +7,16 @@ import ( ...@@ -7,16 +7,16 @@ import (
"sync" "sync"
"time" "time"
ic "github.com/ipfs/go-libp2p-crypto"
peer "github.com/ipfs/go-libp2p-peer"
transport "github.com/ipfs/go-libp2p-transport"
filter "github.com/ipfs/go-libp2p/p2p/net/filter" filter "github.com/ipfs/go-libp2p/p2p/net/filter"
"gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess" ma "github.com/jbenet/go-multiaddr"
goprocessctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context" tec "github.com/jbenet/go-temp-err-catcher"
transport "gx/ipfs/QmRHqYZs3Diy8YC3bW16zvs8VDDwS2ARKBuKwALxEMqibc/go-libp2p-transport" "github.com/jbenet/goprocess"
ic "gx/ipfs/QmUEUu1CM8bxBJxc3ZLojAi8evhTr4byQogWstABet79oY/go-libp2p-crypto" goprocessctx "github.com/jbenet/goprocess/context"
msmux "gx/ipfs/QmUeEcYJrzAEKdQXjzTxCgNZgc9sRuwharsvzzm5Gd2oGB/go-multistream" msmux "github.com/whyrusleeping/go-multistream"
tec "gx/ipfs/QmWHgLqrghM9zw77nF6gdvT9ExQ2RB9pLxkd8sDHZf1rWb/go-temp-err-catcher" context "golang.org/x/net/context"
peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer"
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr"
) )
const ( const (
......
p2p/net/conn/secure_conn.go
View file @ 17632a3b
...@@ -5,11 +5,11 @@ import ( ...@@ -5,11 +5,11 @@ import (
"net" "net"
"time" "time"
secio "gx/ipfs/QmPKuU1ohMDaJRJHmatXewCqjZp5wKrD3CK6m9TnCK6XBe/go-libp2p-secio" ic "github.com/ipfs/go-libp2p-crypto"
ic "gx/ipfs/QmUEUu1CM8bxBJxc3ZLojAi8evhTr4byQogWstABet79oY/go-libp2p-crypto" peer "github.com/ipfs/go-libp2p-peer"
peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" secio "github.com/ipfs/go-libp2p-secio"
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ma "github.com/jbenet/go-multiaddr"
ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" context "golang.org/x/net/context"
) )
// secureConn wraps another Conn object with an encrypted channel. // secureConn wraps another Conn object with an encrypted channel.
......
p2p/net/conn/secure_conn_test.go
View file @ 17632a3b
...@@ -7,10 +7,10 @@ import ( ...@@ -7,10 +7,10 @@ import (
"testing" "testing"
"time" "time"
ic "github.com/ipfs/go-libp2p-crypto"
travis "github.com/ipfs/go-libp2p/testutil/ci/travis" travis "github.com/ipfs/go-libp2p/testutil/ci/travis"
ic "gx/ipfs/QmUEUu1CM8bxBJxc3ZLojAi8evhTr4byQogWstABet79oY/go-libp2p-crypto"
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" context "golang.org/x/net/context"
) )
func upgradeToSecureConn(t *testing.T, ctx context.Context, sk ic.PrivKey, c Conn) (Conn, error) { func upgradeToSecureConn(t *testing.T, ctx context.Context, sk ic.PrivKey, c Conn) (Conn, error) {
......
p2p/net/filter/filter.go
View file @ 17632a3b
...@@ -4,8 +4,8 @@ import ( ...@@ -4,8 +4,8 @@ import (
"net" "net"
"sync" "sync"
manet "gx/ipfs/QmTrxSBY8Wqd5aBB4MeizeSzS5xFbK8dQBrYaMsiGnCBhb/go-multiaddr-net" ma "github.com/jbenet/go-multiaddr"
ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" manet "github.com/jbenet/go-multiaddr-net"
) )
type Filters struct { type Filters struct {
......
p2p/net/filter/filter_test.go
View file @ 17632a3b
...@@ -4,7 +4,7 @@ import ( ...@@ -4,7 +4,7 @@ import (
"net" "net"
"testing" "testing"
ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" ma "github.com/jbenet/go-multiaddr"
) )
func TestFilter(t *testing.T) { func TestFilter(t *testing.T) {
......
p2p/net/interface.go
View file @ 17632a3b
...@@ -3,11 +3,11 @@ package net ...@@ -3,11 +3,11 @@ package net
import ( import (
"io" "io"
peer "github.com/ipfs/go-libp2p-peer"
conn "github.com/ipfs/go-libp2p/p2p/net/conn" conn "github.com/ipfs/go-libp2p/p2p/net/conn"
"gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess" ma "github.com/jbenet/go-multiaddr"
peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" "github.com/jbenet/goprocess"
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" context "golang.org/x/net/context"
ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr"
) )
// MessageSizeMax is a soft (recommended) maximum for network messages. // MessageSizeMax is a soft (recommended) maximum for network messages.
......
p2p/net/mock/interface.go
View file @ 17632a3b
...@@ -7,14 +7,14 @@ ...@@ -7,14 +7,14 @@
package mocknet package mocknet
import ( import (
ic "github.com/ipfs/go-libp2p-crypto"
peer "github.com/ipfs/go-libp2p-peer"
host "github.com/ipfs/go-libp2p/p2p/host" host "github.com/ipfs/go-libp2p/p2p/host"
inet "github.com/ipfs/go-libp2p/p2p/net" inet "github.com/ipfs/go-libp2p/p2p/net"
ic "gx/ipfs/QmUEUu1CM8bxBJxc3ZLojAi8evhTr4byQogWstABet79oY/go-libp2p-crypto"
peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer"
"io" "io"
"time" "time"
ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" ma "github.com/jbenet/go-multiaddr"
) )
type Mocknet interface { type Mocknet interface {
......
p2p/net/mock/mock.go
View file @ 17632a3b
package mocknet package mocknet
import ( import (
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" logging "github.com/ipfs/go-log"
logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" context "golang.org/x/net/context"
) )
var log = logging.Logger("mocknet") var log = logging.Logger("mocknet")
......
p2p/net/mock/mock_conn.go
View file @ 17632a3b
...@@ -4,11 +4,11 @@ import ( ...@@ -4,11 +4,11 @@ import (
"container/list" "container/list"
"sync" "sync"
ic "github.com/ipfs/go-libp2p-crypto"
peer "github.com/ipfs/go-libp2p-peer"
inet "github.com/ipfs/go-libp2p/p2p/net" inet "github.com/ipfs/go-libp2p/p2p/net"
process "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess" ma "github.com/jbenet/go-multiaddr"
ic "gx/ipfs/QmUEUu1CM8bxBJxc3ZLojAi8evhTr4byQogWstABet79oY/go-libp2p-crypto" process "github.com/jbenet/goprocess"
peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer"
ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr"
) )
// conn represents one side's perspective of a // conn represents one side's perspective of a
......
p2p/net/mock/mock_link.go
View file @ 17632a3b
...@@ -6,8 +6,8 @@ import ( ...@@ -6,8 +6,8 @@ import (
"sync" "sync"
"time" "time"
peer "github.com/ipfs/go-libp2p-peer"
inet "github.com/ipfs/go-libp2p/p2p/net" inet "github.com/ipfs/go-libp2p/p2p/net"
peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer"
) )
// link implements mocknet.Link // link implements mocknet.Link
......
p2p/net/mock/mock_net.go
View file @ 17632a3b
...@@ -5,18 +5,18 @@ import ( ...@@ -5,18 +5,18 @@ import (
"sort" "sort"
"sync" "sync"
ic "github.com/ipfs/go-libp2p-crypto"
peer "github.com/ipfs/go-libp2p-peer"
host "github.com/ipfs/go-libp2p/p2p/host" host "github.com/ipfs/go-libp2p/p2p/host"
bhost "github.com/ipfs/go-libp2p/p2p/host/basic" bhost "github.com/ipfs/go-libp2p/p2p/host/basic"
inet "github.com/ipfs/go-libp2p/p2p/net" inet "github.com/ipfs/go-libp2p/p2p/net"
p2putil "github.com/ipfs/go-libp2p/p2p/test/util" p2putil "github.com/ipfs/go-libp2p/p2p/test/util"
testutil "github.com/ipfs/go-libp2p/testutil" testutil "github.com/ipfs/go-libp2p/testutil"
ic "gx/ipfs/QmUEUu1CM8bxBJxc3ZLojAi8evhTr4byQogWstABet79oY/go-libp2p-crypto"
peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer"
"gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess" ma "github.com/jbenet/go-multiaddr"
goprocessctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context" "github.com/jbenet/goprocess"
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" goprocessctx "github.com/jbenet/goprocess/context"
ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" context "golang.org/x/net/context"
) )
// mocknet implements mocknet.Mocknet // mocknet implements mocknet.Mocknet
......
p2p/net/mock/mock_notif_test.go
View file @ 17632a3b
...@@ -4,10 +4,10 @@ import ( ...@@ -4,10 +4,10 @@ import (
"testing" "testing"
"time" "time"
peer "github.com/ipfs/go-libp2p-peer"
inet "github.com/ipfs/go-libp2p/p2p/net" inet "github.com/ipfs/go-libp2p/p2p/net"
peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" ma "github.com/jbenet/go-multiaddr"
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" context "golang.org/x/net/context"
ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr"
) )
func TestNotifications(t *testing.T) { func TestNotifications(t *testing.T) {
......
p2p/net/mock/mock_peernet.go
View file @ 17632a3b
...@@ -5,12 +5,12 @@ import ( ...@@ -5,12 +5,12 @@ import (
"math/rand" "math/rand"
"sync" "sync"
peer "github.com/ipfs/go-libp2p-peer"
inet "github.com/ipfs/go-libp2p/p2p/net" inet "github.com/ipfs/go-libp2p/p2p/net"
"gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess" ma "github.com/jbenet/go-multiaddr"
goprocessctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context" "github.com/jbenet/goprocess"
peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" goprocessctx "github.com/jbenet/goprocess/context"
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" context "golang.org/x/net/context"
ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr"
) )
// peernet implements inet.Network // peernet implements inet.Network
......
p2p/net/mock/mock_printer.go
View file @ 17632a3b
...@@ -4,8 +4,8 @@ import ( ...@@ -4,8 +4,8 @@ import (
"fmt" "fmt"
"io" "io"
peer "github.com/ipfs/go-libp2p-peer"
inet "github.com/ipfs/go-libp2p/p2p/net" inet "github.com/ipfs/go-libp2p/p2p/net"
peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer"
) )
// separate object so our interfaces are separate :) // separate object so our interfaces are separate :)
......
p2p/net/mock/mock_stream.go
View file @ 17632a3b
...@@ -6,7 +6,7 @@ import ( ...@@ -6,7 +6,7 @@ import (
"time" "time"
inet "github.com/ipfs/go-libp2p/p2p/net" inet "github.com/ipfs/go-libp2p/p2p/net"
process "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess" process "github.com/jbenet/goprocess"
) )
// stream implements inet.Stream // stream implements inet.Stream
......
p2p/net/mock/mock_test.go
View file @ 17632a3b
...@@ -9,13 +9,13 @@ import ( ...@@ -9,13 +9,13 @@ import (
"testing" "testing"
"time" "time"
peer "github.com/ipfs/go-libp2p-peer"
inet "github.com/ipfs/go-libp2p/p2p/net" inet "github.com/ipfs/go-libp2p/p2p/net"
protocol "github.com/ipfs/go-libp2p/p2p/protocol" protocol "github.com/ipfs/go-libp2p/p2p/protocol"
testutil "github.com/ipfs/go-libp2p/testutil" testutil "github.com/ipfs/go-libp2p/testutil"
peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer"
detectrace "gx/ipfs/QmQHGMVmrsgmqUG8ih3puNXUJneSpi13dkcZpzLKkskUkH/go-detect-race" detectrace "github.com/jbenet/go-detect-race"
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" context "golang.org/x/net/context"
) )
func randPeer(t *testing.T) peer.ID { func randPeer(t *testing.T) peer.ID {
......
p2p/net/swarm/addr/addr.go
View file @ 17632a3b
...@@ -3,10 +3,10 @@ package addrutil ...@@ -3,10 +3,10 @@ package addrutil
import ( import (
"fmt" "fmt"
manet "gx/ipfs/QmTrxSBY8Wqd5aBB4MeizeSzS5xFbK8dQBrYaMsiGnCBhb/go-multiaddr-net" logging "github.com/ipfs/go-log"
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ma "github.com/jbenet/go-multiaddr"
logging "gx/ipfs/Qmazh5oNUVsDZTs2g59rq8aYQqwpss8tcUWQzor5sCCEuH/go-log" manet "github.com/jbenet/go-multiaddr-net"
ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" context "golang.org/x/net/context"
) )
var log = logging.Logger("github.com/ipfs/go-libp2p/p2p/net/swarm/addr") var log = logging.Logger("github.com/ipfs/go-libp2p/p2p/net/swarm/addr")
......
p2p/net/swarm/addr/addr_test.go
View file @ 17632a3b
...@@ -3,8 +3,8 @@ package addrutil ...@@ -3,8 +3,8 @@ package addrutil
import ( import (
"testing" "testing"
manet "gx/ipfs/QmTrxSBY8Wqd5aBB4MeizeSzS5xFbK8dQBrYaMsiGnCBhb/go-multiaddr-net" ma "github.com/jbenet/go-multiaddr"
ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" manet "github.com/jbenet/go-multiaddr-net"
) )
func newMultiaddr(t *testing.T, s string) ma.Multiaddr { func newMultiaddr(t *testing.T, s string) ma.Multiaddr {
......
p2p/net/swarm/dial_test.go
View file @ 17632a3b
...@@ -7,14 +7,14 @@ import ( ...@@ -7,14 +7,14 @@ import (
"testing" "testing"
"time" "time"
peer "github.com/ipfs/go-libp2p-peer"
addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr" addrutil "github.com/ipfs/go-libp2p/p2p/net/swarm/addr"
testutil "github.com/ipfs/go-libp2p/testutil" testutil "github.com/ipfs/go-libp2p/testutil"
ci "github.com/ipfs/go-libp2p/testutil/ci" ci "github.com/ipfs/go-libp2p/testutil/ci"
peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer"
manet "gx/ipfs/QmTrxSBY8Wqd5aBB4MeizeSzS5xFbK8dQBrYaMsiGnCBhb/go-multiaddr-net" ma "github.com/jbenet/go-multiaddr"
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" manet "github.com/jbenet/go-multiaddr-net"
ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" context "golang.org/x/net/context"
) )
func closeSwarms(swarms []*Swarm) { func closeSwarms(swarms []*Swarm) {
......
p2p/net/swarm/peers_test.go
View file @ 17632a3b
...@@ -3,9 +3,9 @@ package swarm ...@@ -3,9 +3,9 @@ package swarm
import ( import (
"testing" "testing"
peer "gx/ipfs/QmZwZjMVGss5rqYsJVGy18gNbkTJffFyq2x1uJ4e4p3ZAt/go-libp2p-peer" peer "github.com/ipfs/go-libp2p-peer"
context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context" ma "github.com/jbenet/go-multiaddr"
ma "gx/ipfs/QmcobAGsCjYt5DXoq9et9L8yR8er7o7Cu3DTvpaq12jYSz/go-multiaddr" context "golang.org/x/net/context"
) )
func TestPeers(t *testing.T) { func TestPeers(t *testing.T) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment