Merge branch 'port-2021-05-05'

dms3ns.go

@@ -5,11 +5,11 @@ import (
 	"fmt"
 	"time"
 
-	pb "gitlab.dms3.io/dms3/public/go-dms3ns/pb"
+	pb "gitlab.dms3.io/dms3/go-dms3ns/pb"
 
-	ic "github.com/libp2p/go-libp2p-core/crypto"
-	peer "github.com/libp2p/go-libp2p-core/peer"
-	u "gitlab.dms3.io/dms3/public/go-dms3-util"
+	u "gitlab.dms3.io/dms3/go-dms3-util"
+	ic "gitlab.dms3.io/p2p/go-p2p-core/crypto"
+	peer "gitlab.dms3.io/p2p/go-p2p-core/peer"
 )
 
 // Create creates a new DMS3NS entry and signs it with the given private key.
@@ -127,7 +127,7 @@ func ExtractPublicKey(pid peer.ID, entry *pb.Dms3NsEntry) (ic.PubKey, error) {
 //
 // NOTE: If a and b cannot be ordered by this function, you can determine their
 // order by comparing their serialized byte representations (using
-// `bytes.Compare`). You must do this if you are implementing a libp2p record
+// `bytes.Compare`). You must do this if you are implementing a p2p record
 // validator (or you can just use the one provided for you by this package).
 func Compare(a, b *pb.Dms3NsEntry) (int, error) {
 	as := a.GetSequence()

dms3ns_test.go

@@ -5,9 +5,9 @@ import (
 	"testing"
 	"time"
 
-	u "gitlab.dms3.io/dms3/public/go-dms3-util"
-	ci "github.com/libp2p/go-libp2p-core/crypto"
-	peer "github.com/libp2p/go-libp2p-core/peer"
+	u "gitlab.dms3.io/dms3/go-dms3-util"
+	ci "gitlab.dms3.io/p2p/go-p2p-core/crypto"
+	peer "gitlab.dms3.io/p2p/go-p2p-core/peer"
 )
 
 func TestEmbedPublicKey(t *testing.T) {

errors.go

@@ -8,7 +8,7 @@ import (
 // invalid due to being too old
 var ErrExpiredRecord = errors.New("expired record")
 
-// ErrUnrecognizedValidity is returned when an IpnsRecord has an
+// ErrUnrecognizedValidity is returned when an Dms3NsRecord has an
 // unknown validity type.
 var ErrUnrecognizedValidity = errors.New("unrecognized validity type")
 

examples/embed.go

@@ -3,10 +3,10 @@ package examples
 import (
 	"time"
 
-	pb "gitlab.dms3.io/dms3/public/go-dms3ns/pb"
+	pb "gitlab.dms3.io/dms3/go-dms3ns/pb"
 
-	dms3ns "gitlab.dms3.io/dms3/public/go-dms3ns"
-	crypto "github.com/libp2p/go-libp2p-core/crypto"
+	dms3ns "gitlab.dms3.io/dms3/go-dms3ns"
+	crypto "gitlab.dms3.io/p2p/go-p2p-core/crypto"
 )
 
 // CreateEntryWithEmbed shows how you can create an DMS3NS entry

examples/examples_test.go

@@ -3,8 +3,8 @@ package examples_test
 import (
 	"testing"
 
-	crypto "github.com/libp2p/go-libp2p-core/crypto"
-	"gitlab.dms3.io/dms3/public/go-dms3ns/examples"
+	"gitlab.dms3.io/dms3/go-dms3ns/examples"
+	crypto "gitlab.dms3.io/p2p/go-p2p-core/crypto"
 )
 
 var testPath = "/dms3/Qme1knMqwt1hKZbc1BmQFmnm9f36nyQGwXxPGVpVJ9rMK5"

examples/key.go

 package examples
 
 import (
-	crypto "github.com/libp2p/go-libp2p-core/crypto"
+	crypto "gitlab.dms3.io/p2p/go-p2p-core/crypto"
 )
 
 // GenerateRSAKeyPair is used to generate an RSA key pair

go.mod

-module gitlab.dms3.io/dms3/public/go-dms3ns
+module gitlab.dms3.io/dms3/go-dms3ns
 
 require (
 	github.com/gogo/protobuf v1.3.1
-	github.com/libp2p/go-libp2p-core v0.2.5
-	github.com/libp2p/go-libp2p-peerstore v0.1.4
-	github.com/libp2p/go-libp2p-record v0.1.2
-	gitlab.dms3.io/dms3/public/go-dms3-util v0.0.1
-	gitlab.dms3.io/dms3/public/go-log v0.0.1
+	gitlab.dms3.io/dms3/go-dms3-util v0.0.2
+	gitlab.dms3.io/dms3/go-log v0.0.2
+	gitlab.dms3.io/p2p/go-p2p-core v0.0.2
+	gitlab.dms3.io/p2p/go-p2p-peerstore v0.0.2
+	gitlab.dms3.io/p2p/go-p2p-record v0.0.2
 )
 
 go 1.15

record.go

@@ -4,26 +4,26 @@ import (
 	"bytes"
 	"errors"
 
-	pb "gitlab.dms3.io/dms3/public/go-dms3ns/pb"
+	pb "gitlab.dms3.io/dms3/go-dms3ns/pb"
 
 	proto "github.com/gogo/protobuf/proto"
-	ic "github.com/libp2p/go-libp2p-core/crypto"
-	peer "github.com/libp2p/go-libp2p-core/peer"
-	pstore "github.com/libp2p/go-libp2p-core/peerstore"
-	record "github.com/libp2p/go-libp2p-record"
-	logging "gitlab.dms3.io/dms3/public/go-log"
+	logging "gitlab.dms3.io/dms3/go-log"
+	ic "gitlab.dms3.io/p2p/go-p2p-core/crypto"
+	peer "gitlab.dms3.io/p2p/go-p2p-core/peer"
+	pstore "gitlab.dms3.io/p2p/go-p2p-core/peerstore"
+	record "gitlab.dms3.io/p2p/go-p2p-record"
 )
 
 var log = logging.Logger("dms3ns")
 
 var _ record.Validator = Validator{}
 
-// RecordKey returns the libp2p record key for a given peer ID.
+// RecordKey returns the p2p record key for a given peer ID.
 func RecordKey(pid peer.ID) string {
 	return "/dms3ns/" + string(pid)
 }
 
-// Validator is an DMS3NS record validator that satisfies the libp2p record
+// Validator is an DMS3NS record validator that satisfies the p2p record
 // validator interface.
 type Validator struct {
 	// KeyBook, if non-nil, will be used to lookup keys for validating DMS3NS

select_test.go

@@ -6,11 +6,11 @@ import (
 	"testing"
 	"time"
 
-	pb "gitlab.dms3.io/dms3/public/go-dms3ns/pb"
+	pb "gitlab.dms3.io/dms3/go-dms3ns/pb"
 
 	proto "github.com/gogo/protobuf/proto"
-	ci "github.com/libp2p/go-libp2p-core/crypto"
-	u "gitlab.dms3.io/dms3/public/go-dms3-util"
+	u "gitlab.dms3.io/dms3/go-dms3-util"
+	ci "gitlab.dms3.io/p2p/go-p2p-core/crypto"
 )
 
 func shuffle(a []*pb.Dms3NsEntry) {

validate_test.go

@@ -7,14 +7,14 @@ import (
 	"testing"
 	"time"
 
-	pb "gitlab.dms3.io/dms3/public/go-dms3ns/pb"
+	pb "gitlab.dms3.io/dms3/go-dms3ns/pb"
 
 	proto "github.com/gogo/protobuf/proto"
-	u "gitlab.dms3.io/dms3/public/go-dms3-util"
-	ci "github.com/libp2p/go-libp2p-core/crypto"
-	peer "github.com/libp2p/go-libp2p-core/peer"
-	pstore "github.com/libp2p/go-libp2p-core/peerstore"
-	pstoremem "github.com/libp2p/go-libp2p-peerstore/pstoremem"
+	u "gitlab.dms3.io/dms3/go-dms3-util"
+	ci "gitlab.dms3.io/p2p/go-p2p-core/crypto"
+	peer "gitlab.dms3.io/p2p/go-p2p-core/peer"
+	pstore "gitlab.dms3.io/p2p/go-p2p-core/peerstore"
+	pstoremem "gitlab.dms3.io/p2p/go-p2p-peerstore/pstoremem"
 )
 
 func testValidatorCase(t *testing.T, priv ci.PrivKey, kbook pstore.KeyBook, key string, val []byte, eol time.Time, exp error) {
@@ -128,7 +128,7 @@ func TestEmbeddedPubKeyValidate(t *testing.T) {
 }
 
 func TestPeerIDPubKeyValidate(t *testing.T) {
-	t.Skip("disabled until libp2p/go-libp2p-crypto#51 is fixed")
+	t.Skip("disabled until p2p/go-p2p-crypto#51 is fixed")
 
 	goodeol := time.Now().Add(time.Hour)
 	kbook := pstoremem.NewPeerstore()