From 22b1351f66468ed7fcf795d1b7ec780d4bc93108 Mon Sep 17 00:00:00 2001
From: Jeromy <why@ipfs.io>
Date: Tue, 4 Oct 2016 13:50:34 -0700
Subject: [PATCH] extract net interface and metrics

---
 swarm.go            | 7 +++----
 swarm_addr_test.go  | 3 +--
 swarm_conn.go       | 2 +-
 swarm_listen.go     | 5 ++---
 swarm_net.go        | 7 +++----
 swarm_net_test.go   | 4 ++--
 swarm_notif_test.go | 2 +-
 swarm_stream.go     | 2 +-
 swarm_test.go       | 5 ++---
 9 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/swarm.go b/swarm.go
index 9107d71..77c7daf 100644
--- a/swarm.go
+++ b/swarm.go
@@ -11,10 +11,6 @@ import (
 	"sync"
 	"time"
 
-	metrics "github.com/libp2p/go-libp2p/p2p/metrics"
-	mconn "github.com/libp2p/go-libp2p/p2p/metrics/conn"
-	inet "github.com/libp2p/go-libp2p/p2p/net"
-
 	ci "github.com/ipfs/go-libp2p-crypto"
 	peer "github.com/ipfs/go-libp2p-peer"
 	pstore "github.com/ipfs/go-libp2p-peerstore"
@@ -26,6 +22,9 @@ import (
 	goprocessctx "github.com/jbenet/goprocess/context"
 	addrutil "github.com/libp2p/go-addr-util"
 	conn "github.com/libp2p/go-libp2p-conn"
+	metrics "github.com/libp2p/go-libp2p-metrics"
+	mconn "github.com/libp2p/go-libp2p-metrics/conn"
+	inet "github.com/libp2p/go-libp2p-net"
 	transport "github.com/libp2p/go-libp2p-transport"
 	filter "github.com/libp2p/go-maddr-filter"
 	tcpt "github.com/libp2p/go-tcp-transport"
diff --git a/swarm_addr_test.go b/swarm_addr_test.go
index bd48d4f..5d22254 100644
--- a/swarm_addr_test.go
+++ b/swarm_addr_test.go
@@ -4,11 +4,10 @@ import (
 	"context"
 	"testing"
 
-	metrics "github.com/libp2p/go-libp2p/p2p/metrics"
-
 	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"
 	testutil "github.com/libp2p/go-testutil"
 )
 
diff --git a/swarm_conn.go b/swarm_conn.go
index 30ef800..42fc890 100644
--- a/swarm_conn.go
+++ b/swarm_conn.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	inet "github.com/libp2p/go-libp2p/p2p/net"
+	inet "github.com/libp2p/go-libp2p-net"
 
 	ic "github.com/ipfs/go-libp2p-crypto"
 	peer "github.com/ipfs/go-libp2p-peer"
diff --git a/swarm_listen.go b/swarm_listen.go
index 702ef54..0c9d859 100644
--- a/swarm_listen.go
+++ b/swarm_listen.go
@@ -4,14 +4,13 @@ import (
 	"context"
 	"fmt"
 
-	inet "github.com/libp2p/go-libp2p/p2p/net"
-
 	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"
+	mconn "github.com/libp2p/go-libp2p-metrics/conn"
+	inet "github.com/libp2p/go-libp2p-net"
 	transport "github.com/libp2p/go-libp2p-transport"
-	mconn "github.com/libp2p/go-libp2p/p2p/metrics/conn"
 )
 
 func (s *Swarm) AddListenAddr(a ma.Multiaddr) error {
diff --git a/swarm_net.go b/swarm_net.go
index d9e83d5..86755cf 100644
--- a/swarm_net.go
+++ b/swarm_net.go
@@ -1,16 +1,15 @@
 package swarm
 
 import (
+	"context"
 	"fmt"
 
 	peer "github.com/ipfs/go-libp2p-peer"
 	pstore "github.com/ipfs/go-libp2p-peerstore"
-	metrics "github.com/libp2p/go-libp2p/p2p/metrics"
-	inet "github.com/libp2p/go-libp2p/p2p/net"
-
-	"context"
 	ma "github.com/jbenet/go-multiaddr"
 	"github.com/jbenet/goprocess"
+	metrics "github.com/libp2p/go-libp2p-metrics"
+	inet "github.com/libp2p/go-libp2p-net"
 )
 
 // Network implements the inet.Network interface.
diff --git a/swarm_net_test.go b/swarm_net_test.go
index 205b841..ebf3bb8 100644
--- a/swarm_net_test.go
+++ b/swarm_net_test.go
@@ -5,9 +5,9 @@ import (
 	"testing"
 	"time"
 
-	inet "github.com/libp2p/go-libp2p/p2p/net"
-	testutil "github.com/libp2p/go-libp2p/p2p/test/util"
 	"context"
+	inet "github.com/libp2p/go-libp2p-net"
+	testutil "github.com/libp2p/go-libp2p/p2p/test/util"
 )
 
 // TestConnectednessCorrect starts a few networks, connects a few
diff --git a/swarm_notif_test.go b/swarm_notif_test.go
index 2bc663e..9e914b8 100644
--- a/swarm_notif_test.go
+++ b/swarm_notif_test.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	peer "github.com/ipfs/go-libp2p-peer"
 	ma "github.com/jbenet/go-multiaddr"
-	inet "github.com/libp2p/go-libp2p/p2p/net"
+	inet "github.com/libp2p/go-libp2p-net"
 )
 
 func streamsSame(a, b inet.Stream) bool {
diff --git a/swarm_stream.go b/swarm_stream.go
index 51c8460..ef3ab3c 100644
--- a/swarm_stream.go
+++ b/swarm_stream.go
@@ -1,8 +1,8 @@
 package swarm
 
 import (
+	inet "github.com/libp2p/go-libp2p-net"
 	protocol "github.com/libp2p/go-libp2p-protocol"
-	inet "github.com/libp2p/go-libp2p/p2p/net"
 
 	ps "github.com/jbenet/go-peerstream"
 )
diff --git a/swarm_test.go b/swarm_test.go
index e709981..f0ed560 100644
--- a/swarm_test.go
+++ b/swarm_test.go
@@ -10,12 +10,11 @@ import (
 	"testing"
 	"time"
 
-	metrics "github.com/libp2p/go-libp2p/p2p/metrics"
-	inet "github.com/libp2p/go-libp2p/p2p/net"
-
 	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"
 	testutil "github.com/libp2p/go-testutil"
 )
 
-- 
GitLab