Merge pull request #1189 from libp2p/fix/remove-v1-log-dep

fix: remove v1 go-log dep
libp2p · Sep 17, 2021 · 7cb03db · 7cb03db
2 parents 9d3fd8b + 2c69c99
commit 7cb03db
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/go.mod b/go.mod
@@ -12,7 +12,6 @@ require (
 	github.com/ipfs/go-datastore v0.4.6
 	github.com/ipfs/go-detect-race v0.0.1
 	github.com/ipfs/go-ipfs-util v0.0.2
-	github.com/ipfs/go-log v1.0.5
 	github.com/ipfs/go-log/v2 v2.3.0
 	github.com/jbenet/goprocess v0.1.4
 	github.com/klauspost/cpuid/v2 v2.0.9 // indirect

diff --git a/p2p/protocol/circuitv2/client/client.go b/p2p/protocol/circuitv2/client/client.go
@@ -9,7 +9,7 @@ import (
 	"github.com/libp2p/go-libp2p-core/host"
 	"github.com/libp2p/go-libp2p-core/peer"
 
-	logging "github.com/ipfs/go-log"
+	logging "github.com/ipfs/go-log/v2"
 	tptu "github.com/libp2p/go-libp2p-transport-upgrader"
 )
 

diff --git a/p2p/protocol/circuitv2/relay/relay.go b/p2p/protocol/circuitv2/relay/relay.go
@@ -17,7 +17,7 @@ import (
 	"github.com/libp2p/go-libp2p-core/peer"
 	"github.com/libp2p/go-libp2p-core/record"
 
-	logging "github.com/ipfs/go-log"
+	logging "github.com/ipfs/go-log/v2"
 	pool "github.com/libp2p/go-buffer-pool"
 	ma "github.com/multiformats/go-multiaddr"
 	manet "github.com/multiformats/go-multiaddr/net"

diff --git a/p2p/protocol/circuitv2/test/e2e_test.go b/p2p/protocol/circuitv2/test/e2e_test.go
@@ -18,7 +18,7 @@ import (
 	"github.com/libp2p/go-libp2p-core/network"
 	"github.com/libp2p/go-libp2p-core/peer"
 
-	logging "github.com/ipfs/go-log"
+	logging "github.com/ipfs/go-log/v2"
 	bhost "github.com/libp2p/go-libp2p-blankhost"
 	metrics "github.com/libp2p/go-libp2p-core/metrics"
 	pstoremem "github.com/libp2p/go-libp2p-peerstore/pstoremem"