initial port

.gitlab-ci.yml

+stages:
+  - build
+  - test
+
+variables:
+  BUILD_DIR: "/tmp/$CI_CONCURRENT_PROJECT_ID"
+
+before_script:
+  - mkdir -p $BUILD_DIR/src
+  - cd $BUILD_DIR/src
+  - if [ -d $CI_PROJECT_DIR ]
+  - then
+  -    echo "soft link $CI_PROJECT_DIR exists"
+  - else
+  -    echo "creating soft link $CI_PROJECT_DIR"
+  -    ln -s $CI_PROJECT_DIR
+  - fi
+  - cd $CI_PROJECT_DIR
+
+build:
+  stage: build
+  tags:
+    - testing
+  script:
+    - echo $CI_JOB_STAGE
+    - go build
+
+test:
+  stage: test
+  tags:
+    - testing
+  script:
+    - echo $CI_JOB_STAGE
+    - go test -cover
+  coverage: '/coverage: \d+.\d+% of statements/'

backoffcache.go

@@ -6,9 +6,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/libp2p/go-libp2p-core/discovery"
-	"github.com/libp2p/go-libp2p-core/peer"
-	"github.com/libp2p/go-libp2p-peerstore/addr"
+	"gitlab.dms3.io/p2p/go-p2p-core/discovery"
+	"gitlab.dms3.io/p2p/go-p2p-core/peer"
+	"gitlab.dms3.io/p2p/go-p2p-peerstore/addr"
 )
 
 // BackoffDiscovery is an implementation of discovery that caches peer data and attenuates repeated queries

backoffcache_test.go

@@ -6,10 +6,10 @@ import (
 	"testing"
 	"time"
 
-	bhost "github.com/libp2p/go-libp2p-blankhost"
-	"github.com/libp2p/go-libp2p-core/discovery"
-	"github.com/libp2p/go-libp2p-core/peer"
-	swarmt "github.com/libp2p/go-libp2p-swarm/testing"
+	bhost "gitlab.dms3.io/p2p/go-p2p-blankhost"
+	"gitlab.dms3.io/p2p/go-p2p-core/discovery"
+	"gitlab.dms3.io/p2p/go-p2p-core/peer"
+	swarmt "gitlab.dms3.io/p2p/go-p2p-swarm/testing"
 )
 
 type delayedDiscovery struct {
@@ -243,7 +243,7 @@ func TestBackoffDiscoveryCacheCapacity(t *testing.T) {
 
 	// Request peers with a lower limit this time using cache
 	// Here we are testing that the cache logic does not block when there are more peers known than the limit requested
-	// See https://github.com/libp2p/go-libp2p-discovery/issues/67
+	// See https://gitlab.dms3.io/p2p/go-p2p-discovery/issues/67
 	assertNumPeersWithLimit(t, ctx, dCache, ns, n-1, n-1)
 
 	// Wait for next discovery so next request will bypass cache

backoffconnector.go

@@ -2,12 +2,13 @@ package discovery
 
 import (
 	"context"
-	lru "github.com/hashicorp/golang-lru"
 	"sync"
 	"time"
 
-	"github.com/libp2p/go-libp2p-core/host"
-	"github.com/libp2p/go-libp2p-core/peer"
+	lru "github.com/hashicorp/golang-lru"
+
+	"gitlab.dms3.io/p2p/go-p2p-core/host"
+	"gitlab.dms3.io/p2p/go-p2p-core/peer"
 )
 
 // BackoffConnector is a utility to connect to peers, but only if we have not recently tried connecting to them already

backoffconnector_test.go

@@ -7,10 +7,10 @@ import (
 	"testing"
 	"time"
 
-	bhost "github.com/libp2p/go-libp2p-blankhost"
-	"github.com/libp2p/go-libp2p-core/host"
-	"github.com/libp2p/go-libp2p-core/peer"
-	swarmt "github.com/libp2p/go-libp2p-swarm/testing"
+	bhost "gitlab.dms3.io/p2p/go-p2p-blankhost"
+	"gitlab.dms3.io/p2p/go-p2p-core/host"
+	"gitlab.dms3.io/p2p/go-p2p-core/peer"
+	swarmt "gitlab.dms3.io/p2p/go-p2p-swarm/testing"
 )
 
 type maxDialHost struct {

deprecated.go

@@ -3,7 +3,7 @@ package discovery
 import (
 	"time"
 
-	core "github.com/libp2p/go-libp2p-core/discovery"
+	core "gitlab.dms3.io/p2p/go-p2p-core/discovery"
 )
 
 // Deprecated: use skel.Advertiser instead.
@@ -15,18 +15,18 @@ type Discoverer = core.Discoverer
 // Deprecated: use skel.Discovery instead.
 type Discovery = core.Discovery
 
-// Deprecated: use github.com/libp2p/go-libp2p-core/discovery.Option instead.
+// Deprecated: use gitlab.dms3.io/p2p/go-p2p-core/discovery.Option instead.
 type Option = core.Option
 
-// Deprecated: use github.com/libp2p/go-libp2p-core/discovery.Options instead.
+// Deprecated: use gitlab.dms3.io/p2p/go-p2p-core/discovery.Options instead.
 type Options = core.Options
 
-// Deprecated: use github.com/libp2p/go-libp2p-core/discovery.TTL instead.
+// Deprecated: use gitlab.dms3.io/p2p/go-p2p-core/discovery.TTL instead.
 func TTL(ttl time.Duration) core.Option {
 	return core.TTL(ttl)
 }
 
-// Deprecated: use github.com/libp2p/go-libp2p-core/discovery.Limit instead.
+// Deprecated: use gitlab.dms3.io/p2p/go-p2p-core/discovery.Limit instead.
 func Limit(limit int) core.Option {
 	return core.Limit(limit)
 }

go.mod

-module github.com/libp2p/go-libp2p-discovery
+module gitlab.dms3.io/p2p/go-p2p-discovery
 
 require (
 	github.com/hashicorp/golang-lru v0.5.4
-	github.com/ipfs/go-cid v0.0.6
-	github.com/ipfs/go-log v1.0.4
-	github.com/libp2p/go-libp2p-blankhost v0.2.0
-	github.com/libp2p/go-libp2p-core v0.6.0
-	github.com/libp2p/go-libp2p-peerstore v0.2.6
-	github.com/libp2p/go-libp2p-swarm v0.2.8
-	github.com/multiformats/go-multihash v0.0.13
-	golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a
+	github.com/multiformats/go-multihash v0.0.15
+	gitlab.dms3.io/dms3/public/go-cid v0.0.1
+	gitlab.dms3.io/dms3/public/go-log v0.0.1
+	gitlab.dms3.io/p2p/go-p2p-blankhost v0.0.1
+	gitlab.dms3.io/p2p/go-p2p-core v0.0.1
+	gitlab.dms3.io/p2p/go-p2p-peerstore v0.0.1
+	gitlab.dms3.io/p2p/go-p2p-swarm v0.0.1
+	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
 )
 
 go 1.15

mocks_test.go

@@ -5,9 +5,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/libp2p/go-libp2p-core/discovery"
-	"github.com/libp2p/go-libp2p-core/host"
-	"github.com/libp2p/go-libp2p-core/peer"
+	"gitlab.dms3.io/p2p/go-p2p-core/discovery"
+	"gitlab.dms3.io/p2p/go-p2p-core/host"
+	"gitlab.dms3.io/p2p/go-p2p-core/peer"
 )
 
 type mockDiscoveryServer struct {

routing.go

@@ -2,13 +2,14 @@ package discovery
 
 import (
 	"context"
-	"github.com/libp2p/go-libp2p-core/discovery"
 	"time"
 
-	cid "github.com/ipfs/go-cid"
+	"gitlab.dms3.io/p2p/go-p2p-core/discovery"
 
-	"github.com/libp2p/go-libp2p-core/peer"
-	"github.com/libp2p/go-libp2p-core/routing"
+	cid "gitlab.dms3.io/dms3/public/go-cid"
+
+	"gitlab.dms3.io/p2p/go-p2p-core/peer"
+	"gitlab.dms3.io/p2p/go-p2p-core/routing"
 
 	mh "github.com/multiformats/go-multihash"
 )

routing_test.go

@@ -6,12 +6,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ipfs/go-cid"
-	bhost "github.com/libp2p/go-libp2p-blankhost"
-	"github.com/libp2p/go-libp2p-core/discovery"
-	"github.com/libp2p/go-libp2p-core/host"
-	"github.com/libp2p/go-libp2p-core/peer"
-	swarmt "github.com/libp2p/go-libp2p-swarm/testing"
+	"gitlab.dms3.io/dms3/public/go-cid"
+	bhost "gitlab.dms3.io/p2p/go-p2p-blankhost"
+	"gitlab.dms3.io/p2p/go-p2p-core/discovery"
+	"gitlab.dms3.io/p2p/go-p2p-core/host"
+	"gitlab.dms3.io/p2p/go-p2p-core/peer"
+	swarmt "gitlab.dms3.io/p2p/go-p2p-swarm/testing"
 )
 
 type mockRoutingTable struct {

util.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"time"
 
-	"github.com/libp2p/go-libp2p-core/peer"
+	"gitlab.dms3.io/p2p/go-p2p-core/peer"
 
-	logging "github.com/ipfs/go-log"
+	logging "gitlab.dms3.io/dms3/public/go-log"
 )
 
 var log = logging.Logger("discovery")