switch from github.com/libp2p/go-libp2p-core to core

config/config.go

@@ -5,18 +5,17 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/libp2p/go-libp2p-core/connmgr"
-	"github.com/libp2p/go-libp2p-core/crypto"
-	"github.com/libp2p/go-libp2p-core/host"
-	"github.com/libp2p/go-libp2p-core/metrics"
-	"github.com/libp2p/go-libp2p-core/network"
-	"github.com/libp2p/go-libp2p-core/peer"
-	"github.com/libp2p/go-libp2p-core/peerstore"
-	"github.com/libp2p/go-libp2p-core/pnet"
-	"github.com/libp2p/go-libp2p-core/routing"
-	"github.com/libp2p/go-libp2p-core/sec"
-	"github.com/libp2p/go-libp2p-core/transport"
-
+	"github.com/libp2p/go-libp2p/core/connmgr"
+	"github.com/libp2p/go-libp2p/core/crypto"
+	"github.com/libp2p/go-libp2p/core/host"
+	"github.com/libp2p/go-libp2p/core/metrics"
+	"github.com/libp2p/go-libp2p/core/network"
+	"github.com/libp2p/go-libp2p/core/peer"
+	"github.com/libp2p/go-libp2p/core/peerstore"
+	"github.com/libp2p/go-libp2p/core/pnet"
+	"github.com/libp2p/go-libp2p/core/routing"
+	"github.com/libp2p/go-libp2p/core/sec"
+	"github.com/libp2p/go-libp2p/core/transport"
 	"github.com/libp2p/go-libp2p/p2p/host/autonat"
 	"github.com/libp2p/go-libp2p/p2p/host/autorelay"
 	bhost "github.com/libp2p/go-libp2p/p2p/host/basic"

config/constructor_types.go

@@ -4,15 +4,15 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/libp2p/go-libp2p-core/connmgr"
-	"github.com/libp2p/go-libp2p-core/crypto"
-	"github.com/libp2p/go-libp2p-core/host"
-	"github.com/libp2p/go-libp2p-core/network"
-	"github.com/libp2p/go-libp2p-core/peer"
-	"github.com/libp2p/go-libp2p-core/peerstore"
-	"github.com/libp2p/go-libp2p-core/pnet"
-	"github.com/libp2p/go-libp2p-core/sec"
-	"github.com/libp2p/go-libp2p-core/transport"
+	"github.com/libp2p/go-libp2p/core/connmgr"
+	"github.com/libp2p/go-libp2p/core/crypto"
+	"github.com/libp2p/go-libp2p/core/host"
+	"github.com/libp2p/go-libp2p/core/network"
+	"github.com/libp2p/go-libp2p/core/peer"
+	"github.com/libp2p/go-libp2p/core/peerstore"
+	"github.com/libp2p/go-libp2p/core/pnet"
+	"github.com/libp2p/go-libp2p/core/sec"
+	"github.com/libp2p/go-libp2p/core/transport"
 )
 
 var (

config/muxer.go

@@ -3,11 +3,9 @@ package config
 import (
 	"fmt"
 
+	"github.com/libp2p/go-libp2p/core/host"
+	"github.com/libp2p/go-libp2p/core/network"
 	msmux "github.com/libp2p/go-libp2p/p2p/muxer/muxer-multistream"
-
-	"github.com/libp2p/go-libp2p-core/network"
-
-	"github.com/libp2p/go-libp2p-core/host"
 )
 
 // MuxC is a stream multiplex transport constructor.

config/muxer_test.go

@@ -3,13 +3,12 @@ package config
 import (
 	"testing"
 
+	"github.com/libp2p/go-libp2p/core/host"
+	"github.com/libp2p/go-libp2p/core/network"
+	"github.com/libp2p/go-libp2p/core/peer"
 	bhost "github.com/libp2p/go-libp2p/p2p/host/basic"
 	"github.com/libp2p/go-libp2p/p2p/muxer/yamux"
 	swarmt "github.com/libp2p/go-libp2p/p2p/net/swarm/testing"
-
-	"github.com/libp2p/go-libp2p-core/host"
-	"github.com/libp2p/go-libp2p-core/network"
-	"github.com/libp2p/go-libp2p-core/peer"
 )
 
 func TestMuxerSimple(t *testing.T) {

config/reflection_magic.go

@@ -6,13 +6,11 @@ import (
 	"reflect"
 	"runtime"
 
-	"github.com/libp2p/go-libp2p-core/network"
-
-	"github.com/libp2p/go-libp2p-core/pnet"
-
-	"github.com/libp2p/go-libp2p-core/connmgr"
-	"github.com/libp2p/go-libp2p-core/host"
-	"github.com/libp2p/go-libp2p-core/transport"
+	"github.com/libp2p/go-libp2p/core/connmgr"
+	"github.com/libp2p/go-libp2p/core/host"
+	"github.com/libp2p/go-libp2p/core/network"
+	"github.com/libp2p/go-libp2p/core/pnet"
+	"github.com/libp2p/go-libp2p/core/transport"
 )
 
 var errorType = reflect.TypeOf((*error)(nil)).Elem()

config/security.go

@@ -3,13 +3,12 @@ package config
 import (
 	"fmt"
 
+	"github.com/libp2p/go-libp2p/core/crypto"
+	"github.com/libp2p/go-libp2p/core/host"
+	"github.com/libp2p/go-libp2p/core/peer"
+	"github.com/libp2p/go-libp2p/core/sec"
+	"github.com/libp2p/go-libp2p/core/sec/insecure"
 	csms "github.com/libp2p/go-libp2p/p2p/net/conn-security-multistream"
-
-	"github.com/libp2p/go-libp2p-core/crypto"
-	"github.com/libp2p/go-libp2p-core/host"
-	"github.com/libp2p/go-libp2p-core/peer"
-	"github.com/libp2p/go-libp2p-core/sec"
-	"github.com/libp2p/go-libp2p-core/sec/insecure"
 )
 
 // SecC is a security transport constructor.

config/transport.go

@@ -1,11 +1,11 @@
 package config
 
 import (
-	"github.com/libp2p/go-libp2p-core/connmgr"
-	"github.com/libp2p/go-libp2p-core/host"
-	"github.com/libp2p/go-libp2p-core/network"
-	"github.com/libp2p/go-libp2p-core/pnet"
-	"github.com/libp2p/go-libp2p-core/transport"
+	"github.com/libp2p/go-libp2p/core/connmgr"
+	"github.com/libp2p/go-libp2p/core/host"
+	"github.com/libp2p/go-libp2p/core/network"
+	"github.com/libp2p/go-libp2p/core/pnet"
+	"github.com/libp2p/go-libp2p/core/transport"
 )
 
 // TptC is the type for libp2p transport constructors. You probably won't ever

config/transport_test.go

@@ -3,11 +3,10 @@ package config
 import (
 	"testing"
 
+	"github.com/libp2p/go-libp2p/core/peer"
+	"github.com/libp2p/go-libp2p/core/transport"
 	"github.com/libp2p/go-libp2p/p2p/transport/tcp"
 
-	"github.com/libp2p/go-libp2p-core/peer"
-	"github.com/libp2p/go-libp2p-core/transport"
-
 	"github.com/stretchr/testify/require"
 )
 

core/alias.go

@@ -2,10 +2,11 @@
 package core
 
 import (
-	"github.com/libp2p/go-libp2p-core/host"
-	"github.com/libp2p/go-libp2p-core/network"
-	"github.com/libp2p/go-libp2p-core/peer"
-	"github.com/libp2p/go-libp2p-core/protocol"
+	"github.com/libp2p/go-libp2p/core/host"
+	"github.com/libp2p/go-libp2p/core/network"
+	"github.com/libp2p/go-libp2p/core/peer"
+	"github.com/libp2p/go-libp2p/core/protocol"
+
 	"github.com/multiformats/go-multiaddr"
 )
 

core/canonicallog/canonicallog.go

@@ -6,8 +6,9 @@ import (
 	"net"
 	"strings"
 
+	"github.com/libp2p/go-libp2p/core/peer"
+
 	logging "github.com/ipfs/go-log/v2"
-	"github.com/libp2p/go-libp2p-core/peer"
 	"github.com/multiformats/go-multiaddr"
 	manet "github.com/multiformats/go-multiaddr/net"
 )

core/canonicallog/canonicallog_test.go

@@ -5,8 +5,9 @@ import (
 	"net"
 	"testing"
 
+	"github.com/libp2p/go-libp2p/core/test"
+
 	logging "github.com/ipfs/go-log/v2"
-	"github.com/libp2p/go-libp2p-core/test"
 	"github.com/multiformats/go-multiaddr"
 )
 

core/connmgr/decay.go

@@ -4,7 +4,7 @@ import (
 	"io"
 	"time"
 
-	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p/core/peer"
 )
 
 // Decayer is implemented by connection managers supporting decaying tags. A
@@ -22,10 +22,10 @@ import (
 // Such a pluggable design affords a great deal of flexibility and versatility.
 // Behaviours that are straightforward to implement include:
 //
-//  * Decay a tag by -1, or by half its current value, on every tick.
-//  * Every time a value is bumped, sum it to its current value.
-//  * Exponentially boost a score with every bump.
-//  * Sum the incoming score, but keep it within min, max bounds.
+//   - Decay a tag by -1, or by half its current value, on every tick.
+//   - Every time a value is bumped, sum it to its current value.
+//   - Exponentially boost a score with every bump.
+//   - Sum the incoming score, but keep it within min, max bounds.
 //
 // Commonly used DecayFns and BumpFns are provided in this package.
 type Decayer interface {

core/connmgr/gater.go

@@ -3,9 +3,9 @@ package connmgr
 import (
 	ma "github.com/multiformats/go-multiaddr"
 
-	"github.com/libp2p/go-libp2p-core/control"
-	"github.com/libp2p/go-libp2p-core/network"
-	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p/core/control"
+	"github.com/libp2p/go-libp2p/core/network"
+	"github.com/libp2p/go-libp2p/core/peer"
 )
 
 // ConnectionGater can be implemented by a type that supports active
@@ -17,25 +17,25 @@ import (
 // of a connection being established/upgraded. Specific functions will be called
 // throughout the process, to allow you to intercept the connection at that stage.
 //
-//  InterceptPeerDial is called on an imminent outbound peer dial request, prior
-//  to the addresses of that peer being available/resolved. Blocking connections
-//  at this stage is typical for blacklisting scenarios.
+//	InterceptPeerDial is called on an imminent outbound peer dial request, prior
+//	to the addresses of that peer being available/resolved. Blocking connections
+//	at this stage is typical for blacklisting scenarios.
 //
-//  InterceptAddrDial is called on an imminent outbound dial to a peer on a
-//  particular address. Blocking connections at this stage is typical for
-//  address filtering.
+//	InterceptAddrDial is called on an imminent outbound dial to a peer on a
+//	particular address. Blocking connections at this stage is typical for
+//	address filtering.
 //
-//  InterceptAccept is called as soon as a transport listener receives an
-//  inbound connection request, before any upgrade takes place. Transports who
-//  accept already secure and/or multiplexed connections (e.g. possibly QUIC)
-//  MUST call this method regardless, for correctness/consistency.
+//	InterceptAccept is called as soon as a transport listener receives an
+//	inbound connection request, before any upgrade takes place. Transports who
+//	accept already secure and/or multiplexed connections (e.g. possibly QUIC)
+//	MUST call this method regardless, for correctness/consistency.
 //
-//  InterceptSecured is called for both inbound and outbound connections,
-//  after a security handshake has taken place and we've authenticated the peer.
+//	InterceptSecured is called for both inbound and outbound connections,
+//	after a security handshake has taken place and we've authenticated the peer.
 //
-//  InterceptUpgraded is called for inbound and outbound connections, after
-//  libp2p has finished upgrading the connection entirely to a secure,
-//  multiplexed channel.
+//	InterceptUpgraded is called for inbound and outbound connections, after
+//	libp2p has finished upgrading the connection entirely to a secure,
+//	multiplexed channel.
 //
 // This interface can be used to implement *strict/active* connection management
 // policies, such as hard limiting of connections once a maximum count has been

core/connmgr/manager.go

@@ -10,8 +10,8 @@ import (
 	"context"
 	"time"
 
-	"github.com/libp2p/go-libp2p-core/network"
-	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p/core/network"
+	"github.com/libp2p/go-libp2p/core/peer"
 )
 
 // SupportsDecay evaluates if the provided ConnManager supports decay, and if

core/connmgr/null.go

@@ -3,8 +3,8 @@ package connmgr
 import (
 	"context"
 
-	"github.com/libp2p/go-libp2p-core/network"
-	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p/core/network"
+	"github.com/libp2p/go-libp2p/core/peer"
 )
 
 // NullConnMgr is a ConnMgr that provides no functionality.

core/crypto/ecdsa.go

@@ -10,8 +10,8 @@ import (
 	"io"
 	"math/big"
 
-	pb "github.com/libp2p/go-libp2p-core/crypto/pb"
-	"github.com/libp2p/go-libp2p-core/internal/catch"
+	pb "github.com/libp2p/go-libp2p/core/crypto/pb"
+	"github.com/libp2p/go-libp2p/core/internal/catch"
 
 	"github.com/minio/sha256-simd"
 )

core/crypto/ed25519.go

@@ -8,8 +8,8 @@ import (
 	"fmt"
 	"io"
 
-	pb "github.com/libp2p/go-libp2p-core/crypto/pb"
-	"github.com/libp2p/go-libp2p-core/internal/catch"
+	pb "github.com/libp2p/go-libp2p/core/crypto/pb"
+	"github.com/libp2p/go-libp2p/core/internal/catch"
 )
 
 // Ed25519PrivateKey is an ed25519 private key.

core/crypto/ed25519_test.go

@@ -5,7 +5,7 @@ import (
 	"crypto/rand"
 	"testing"
 
-	pb "github.com/libp2p/go-libp2p-core/crypto/pb"
+	pb "github.com/libp2p/go-libp2p/core/crypto/pb"
 )
 
 func TestBasicSignAndVerify(t *testing.T) {

core/crypto/fixture_test.go

@@ -8,8 +8,8 @@ import (
 	"io/ioutil"
 	"testing"
 
-	"github.com/libp2p/go-libp2p-core/crypto"
-	crypto_pb "github.com/libp2p/go-libp2p-core/crypto/pb"
+	"github.com/libp2p/go-libp2p/core/crypto"
+	crypto_pb "github.com/libp2p/go-libp2p/core/crypto/pb"
 )
 
 var message = []byte("Libp2p is the _best_!")

core/crypto/key.go

@@ -12,7 +12,7 @@ import (
 	"fmt"
 	"io"
 
-	pb "github.com/libp2p/go-libp2p-core/crypto/pb"
+	pb "github.com/libp2p/go-libp2p/core/crypto/pb"
 
 	"github.com/gogo/protobuf/proto"
 )

core/crypto/key_not_openssl.go

@@ -9,10 +9,10 @@ import (
 	"crypto/ed25519"
 	"crypto/rsa"
 
-	btcec "github.com/btcsuite/btcd/btcec/v2"
+	"github.com/btcsuite/btcd/btcec/v2"
 )
 
-// KeyPairFromStdKey wraps standard library (and secp256k1) private keys in libp2p/go-libp2p-core/crypto keys
+// KeyPairFromStdKey wraps standard library (and secp256k1) private keys in libp2p/go-libp2p/core/crypto keys
 func KeyPairFromStdKey(priv crypto.PrivateKey) (PrivKey, PubKey, error) {
 	if priv == nil {
 		return nil, nil, ErrNilPrivateKey
@@ -40,7 +40,7 @@ func KeyPairFromStdKey(priv crypto.PrivateKey) (PrivKey, PubKey, error) {
 	}
 }
 
-// PrivKeyToStdKey converts libp2p/go-libp2p-core/crypto private keys to standard library (and secp256k1) private keys
+// PrivKeyToStdKey converts libp2p/go-libp2p/core/crypto private keys to standard library (and secp256k1) private keys
 func PrivKeyToStdKey(priv PrivKey) (crypto.PrivateKey, error) {
 	if priv == nil {
 		return nil, ErrNilPrivateKey
@@ -60,7 +60,7 @@ func PrivKeyToStdKey(priv PrivKey) (crypto.PrivateKey, error) {
 	}
 }
 
-// PubKeyToStdKey converts libp2p/go-libp2p-core/crypto private keys to standard library (and secp256k1) public keys
+// PubKeyToStdKey converts libp2p/go-libp2p/core/crypto private keys to standard library (and secp256k1) public keys
 func PubKeyToStdKey(pub PubKey) (crypto.PublicKey, error) {
 	if pub == nil {
 		return nil, ErrNilPublicKey