Merge pull request #1176 from libp2p/no-go-cienv

stop using jbenet/go-cienv
This commit is contained in:
Steven Allen 2021-09-05 21:31:54 +02:00 committed by GitHub
commit bf26124791
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 9 deletions

1
go.mod
View File

@ -13,7 +13,6 @@ require (
github.com/ipfs/go-detect-race v0.0.1
github.com/ipfs/go-ipfs-util v0.0.2
github.com/ipfs/go-log/v2 v2.3.0
github.com/jbenet/go-cienv v0.1.0
github.com/jbenet/goprocess v0.1.4
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
github.com/koron/go-ssdp v0.0.2 // indirect

View File

@ -8,17 +8,17 @@ import (
"testing"
"time"
cienv "github.com/jbenet/go-cienv"
libp2p "github.com/libp2p/go-libp2p"
relay "github.com/libp2p/go-libp2p/p2p/host/relay"
"github.com/libp2p/go-libp2p"
"github.com/libp2p/go-libp2p/p2p/host/relay"
cid "github.com/ipfs/go-cid"
circuit "github.com/libp2p/go-libp2p-circuit"
"github.com/libp2p/go-libp2p-core/event"
"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/routing"
"github.com/ipfs/go-cid"
ma "github.com/multiformats/go-multiaddr"
manet "github.com/multiformats/go-multiaddr/net"
)
@ -114,10 +114,6 @@ func connect(t *testing.T, a, b host.Host) {
// and the actual test!
func TestAutoRelay(t *testing.T) {
if cienv.IsRunning() {
t.Skip("disabled on CI: fails 99% of the time")
}
manet.Private4 = []*net.IPNet{}
ctx, cancel := context.WithCancel(context.Background())