remove unneeded dependencies

- xerrors is obsolete and no longer needed
- go-detect-race is no longer needed as this only saves about 1s with recent golang versions

Author: gammazero

go.mod

@@ -2,13 +2,11 @@ module github.com/ipfs/go-datastore
 
 require (
 	github.com/google/uuid v1.6.0
-	github.com/ipfs/go-detect-race v0.0.1
 	github.com/ipfs/go-ipfs-delay v0.0.1
 	github.com/jbenet/goprocess v0.1.4
 	go.opentelemetry.io/otel v1.16.0
 	go.opentelemetry.io/otel/trace v1.16.0
 	go.uber.org/multierr v1.11.0
-	golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7
 	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15
 )
 

go.sum

@@ -9,8 +9,6 @@ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-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-ipfs-delay v0.0.1 h1:r/UXYyRcddO6thwOnhiznIAiSvxMECGgtv35Xs1IeRQ=
 github.com/ipfs/go-ipfs-delay v0.0.1/go.mod h1:8SP1YXK1M1kXuc4KJZINY3TQQ03J2rwBG9QfXmbRPrw=
 github.com/jbenet/go-cienv v0.1.0/go.mod h1:TqNnHUmJgXau0nCzC7kXWeotg3J9W34CUv5Djy1+FlA=
@@ -33,8 +31,6 @@ go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZE
 go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

retrystore/retrystore.go

@@ -4,10 +4,10 @@ package retrystore
 
 import (
 	"context"
+	"fmt"
 	"time"
 
 	ds "github.com/ipfs/go-datastore"
-	xerrors "golang.org/x/xerrors"
 )
 
 // Datastore wraps a Batching datastore with a
@@ -28,8 +28,6 @@ var _ ds.Datastore = (*Datastore)(nil)
 var _ ds.Batching = (*Datastore)(nil)
 var _ ds.PersistentDatastore = (*Datastore)(nil)
 
-var errFmtString = "ran out of retries trying to get past temporary error: %w"
-
 func (d *Datastore) runOp(op func() error) error {
 	err := op()
 	if err == nil || !d.TempErrFunc(err) {
@@ -45,7 +43,7 @@ func (d *Datastore) runOp(op func() error) error {
 		}
 	}
 
-	return xerrors.Errorf(errFmtString, err)
+	return fmt.Errorf("ran out of retries trying to get past temporary error: %w", err)
 }
 
 // DiskUsage implements the PersistentDatastore interface.

test/basic_tests.go

@@ -9,8 +9,6 @@ import (
 	"strings"
 	"testing"
 
-	detectrace "github.com/ipfs/go-detect-race"
-
 	dstore "github.com/ipfs/go-datastore"
 	dsq "github.com/ipfs/go-datastore/query"
 )
@@ -20,14 +18,6 @@ import (
 // 20, 30, 40... and at least to 20.
 var ElemCount = 100
 
-func init() {
-	// Reduce the default element count when the race detector is enabled so these tests don't
-	// take forever.
-	if detectrace.WithRace() {
-		ElemCount = 20
-	}
-}
-
 func TestElemCount(t *testing.T) {
 	if ElemCount < 20 {
 		t.Fatal("ElemCount should be set to 20 at least")

test/suite.go

@@ -6,8 +6,6 @@ import (
 	"runtime"
 	"testing"
 
-	detectrace "github.com/ipfs/go-detect-race"
-
 	dstore "github.com/ipfs/go-datastore"
 	query "github.com/ipfs/go-datastore/query"
 )
@@ -23,13 +21,7 @@ var BasicSubtests = []func(t *testing.T, ds dstore.Datastore){
 	SubtestManyKeysAndQuery,
 	SubtestReturnSizes,
 	SubtestBasicSync,
-}
-
-// Only enable the expensive "combinations" test when not running the race detector.
-func init() {
-	if !detectrace.WithRace() {
-		BasicSubtests = append(BasicSubtests, SubtestCombinations)
-	}
+	SubtestCombinations,
 }
 
 // BatchSubtests is a list of all basic batching datastore tests.