Merge branch 'port-2021-04-19'

test/mock.go

 package bstest
 
 import (
+	"time"
+
 	. "gitlab.dms3.io/dms3/go-blockservice"
 
+	bitswap "gitlab.dms3.io/dms3/go-bitswap"
 	testinstance "gitlab.dms3.io/dms3/go-bitswap/testinstance"
 	tn "gitlab.dms3.io/dms3/go-bitswap/testnet"
 	delay "gitlab.dms3.io/dms3/go-dms3-delay"
@@ -12,7 +15,8 @@ import (
 // Mocks returns |n| connected mock Blockservices
 func Mocks(n int) []BlockService {
 	net := tn.VirtualNetwork(mockrouting.NewServer(), delay.Fixed(0))
-	sg := testinstance.NewTestInstanceGenerator(net)
+	bsOpts := []bitswap.Option{bitswap.ProvideEnabled(false), bitswap.ProviderSearchDelay(50 * time.Millisecond)}
+	sg := testinstance.NewTestInstanceGenerator(net, nil, bsOpts)
 
 	instances := sg.Instances(n)