status-im
/
go-libp2p
mirror of https://github.com/status-im/go-libp2p.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1201 from libp2p/remove-detect-race 

remove dependency on github.com/ipfs/go-detect-race
This commit is contained in:
Marten Seemann 2021-09-26 12:13:00 +01:00 committed by GitHub
parent eba91ac63e 4975f0abe5
commit fa64faf44b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/pubsub/chat/go.sum
View File

@ -324,7 +324,6 @@ github.com/ipfs/go-datastore v0.4.1/go.mod h1:SX/xMIKoCszPqp+z9JhPYCmoOoXTvaa13X
github.com/ipfs/go-datastore v0.4.4/go.mod h1:SX/xMIKoCszPqp+z9JhPYCmoOoXTvaa13XEbGtsFUhA=
github.com/ipfs/go-datastore v0.4.5/go.mod h1:eXTcaaiN6uOlVCLS9GjJUJtlvJfM3xk23w3fyfrmmJs=
github.com/ipfs/go-datastore v0.4.6/go.mod h1:XSipLSc64rFKSFRFGo1ecQl+WhYce3K7frtpHkyPFUc=
github.com/ipfs/go-detect-race v0.0.1 h1:qX/xay2W3E4Q1U7d9lNs1sU9nvguX0a7319XbyQ6cOk=
github.com/ipfs/go-detect-race v0.0.1/go.mod h1:8BNT7shDZPo99Q74BpGMK+4D8Mn4j46UU0LZ723meps=
github.com/ipfs/go-ds-badger v0.2.3/go.mod h1:pEYw0rgg3FIrywKKnL+Snr+w/LjJZVMTBRn4FS6UHUk=
github.com/ipfs/go-ds-badger v0.2.7/go.mod h1:02rnztVKA4aZwDuaRPTf8mpqcKmXP7mLl6JPxd14JHA=

1
go.mod
View File

@ -10,7 +10,6 @@ require (
github.com/huin/goupnp v1.0.2 // indirect
github.com/ipfs/go-cid v0.0.7
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/v2 v2.3.0
github.com/jbenet/goprocess v0.1.4

6
p2p/net/mock/mock_test.go
View File

@ -11,12 +11,12 @@ import (
"testing"
"time"
detectrace "github.com/ipfs/go-detect-race"
"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-testing/ci"
tnet "github.com/libp2p/go-libp2p-testing/net"
"github.com/libp2p/go-libp2p-testing/race"
)
func TestNetworkSetup(t *testing.T) {
@ -358,7 +358,7 @@ func makePonger(t *testing.T, st string, errs chan<- error) func(network.Stream)
func TestStreamsStress(t *testing.T) {
ctx := context.Background()
nnodes := 100
if detectrace.WithRace() {
if race.WithRace() {
nnodes = 30
}
@ -594,7 +594,7 @@ func TestLimitedStreams(t *testing.T) {
}
func TestFuzzManyPeers(t *testing.T) {
peerCount := 500
if detectrace.WithRace() {
if race.WithRace() {
peerCount = 100
}
for i := 0; i < peerCount; i++ {

4
p2p/protocol/identify/id_test.go
View File

@ -9,7 +9,6 @@ import (
"testing"
"time"
detectrace "github.com/ipfs/go-detect-race"
ic "github.com/libp2p/go-libp2p-core/crypto"
"github.com/libp2p/go-libp2p-core/event"
"github.com/libp2p/go-libp2p-core/host"
@ -19,6 +18,7 @@ import (
"github.com/libp2p/go-libp2p-core/protocol"
"github.com/libp2p/go-libp2p-core/record"
coretest "github.com/libp2p/go-libp2p-core/test"
"github.com/libp2p/go-libp2p-testing/race"
"github.com/libp2p/go-eventbus"
"github.com/libp2p/go-libp2p"
@ -268,7 +268,7 @@ func emitAddrChangeEvt(t *testing.T, h host.Host) {
// id service is done.
func TestIDService(t *testing.T) {
// This test is highly timing dependent, waiting on timeouts/expiration.
if detectrace.WithRace() {
if race.WithRace() {
t.Skip("skipping highly timing dependent test when race detector is enabled")
}
oldTTL := peerstore.RecentlyConnectedAddrTTL