Consolidate abstractions and core types into go-libp2p-core (#27)

libp2p · May 25, 2019 · 3ca427f · 3ca427f
1 parent 6793f6f
commit 3ca427f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/p2p/net/pnet/protector.go b/p2p/net/pnet/protector.go
@@ -5,7 +5,7 @@ import (
 	"io"
 	"net"
 
-	ipnet "github.com/libp2p/go-libp2p-interface-pnet"
+	ipnet "github.com/libp2p/go-libp2p-core/pnet"
 )
 
 var _ ipnet.Protector = (*protector)(nil)

diff --git a/p2p/net/pnet/psk_conn.go b/p2p/net/pnet/psk_conn.go
@@ -6,17 +6,18 @@ import (
 	"io"
 	"net"
 
-	salsa20 "github.com/davidlazar/go-crypto/salsa20"
+	"github.com/libp2p/go-libp2p-core/pnet"
+
+	"github.com/davidlazar/go-crypto/salsa20"
 	pool "github.com/libp2p/go-buffer-pool"
-	ipnet "github.com/libp2p/go-libp2p-interface-pnet"
 )
 
 // we are using buffer pool as user needs their slice back
 // so we can't do XOR cripter in place
 var (
-	errShortNonce  = ipnet.NewError("could not read full nonce")
-	errInsecureNil = ipnet.NewError("insecure is nil")
-	errPSKNil      = ipnet.NewError("pre-shread key is nil")
+	errShortNonce  = pnet.NewError("could not read full nonce")
+	errInsecureNil = pnet.NewError("insecure is nil")
+	errPSKNil      = pnet.NewError("pre-shread key is nil")
 )
 
 type pskConn struct {