fix: use berty custom mocknet

Signed-off-by: gfanton <8671905+gfanton@users.noreply.github.com>
berty · Jun 20, 2023 · ea21b64 · ea21b64
1 parent 82e525a
commit ea21b64
Show file tree

Hide file tree

Showing 19 changed files with 36 additions and 25 deletions.
diff --git a/account_export_test.go b/account_export_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/ipfs/go-cid"
 	ds "github.com/ipfs/go-datastore"
 	dsync "github.com/ipfs/go-datastore/sync"
-	mocknet "github.com/libp2p/go-libp2p/p2p/net/mock"
+	mocknet "github.com/berty/go-libp2p-mock"
 	"github.com/stretchr/testify/require"
 
 	orbitdb "berty.tech/go-orbit-db"

diff --git a/contact_request_manager_test.go b/contact_request_manager_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	libp2p_mocknet "github.com/libp2p/go-libp2p/p2p/net/mock"
+	libp2p_mocknet "github.com/berty/go-libp2p-mock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 

diff --git a/deactivate_test.go b/deactivate_test.go
@@ -7,7 +7,7 @@ import (
 
 	ds "github.com/ipfs/go-datastore"
 	dsync "github.com/ipfs/go-datastore/sync"
-	libp2p_mocknet "github.com/libp2p/go-libp2p/p2p/net/mock"
+	libp2p_mocknet "github.com/berty/go-libp2p-mock"
 	"github.com/stretchr/testify/require"
 
 	"berty.tech/weshnet"

diff --git a/go.mod b/go.mod
@@ -9,7 +9,8 @@ require (
 	filippo.io/edwards25519 v1.0.0
 	github.com/aead/ecdh v0.2.0
 	github.com/berty/emitter-go v0.0.0-20221031144724-5dae963c3622
-	github.com/berty/go-libp2p-rendezvous v0.4.1
+	github.com/berty/go-libp2p-mock v1.0.1
+	github.com/berty/go-libp2p-rendezvous v0.5.0
 	github.com/buicongtan1997/protoc-gen-swagger-config v0.0.0-20200705084907-1342b78c1a7e
 	github.com/daixiang0/gci v0.8.2
 	github.com/dgraph-io/badger/v2 v2.2007.3
@@ -28,7 +29,7 @@ require (
 	github.com/ipfs/interface-go-ipfs-core v0.11.1
 	github.com/ipfs/kubo v0.19.0
 	github.com/juju/fslock v0.0.0-20160525022230-4d5c94c67b4b
-	github.com/libp2p/go-libp2p v0.27.3
+	github.com/libp2p/go-libp2p v0.27.6
 	github.com/libp2p/go-libp2p-kad-dht v0.21.1
 	github.com/libp2p/go-libp2p-pubsub v0.9.3
 	github.com/libp2p/go-libp2p-record v0.2.0

diff --git a/go.sum b/go.sum
diff --git a/internal/handshake/handshake_util_test.go b/internal/handshake/handshake_util_test.go
@@ -11,7 +11,7 @@ import (
 	p2pcrypto "github.com/libp2p/go-libp2p/core/crypto"
 	p2pnetwork "github.com/libp2p/go-libp2p/core/network"
 	p2ppeer "github.com/libp2p/go-libp2p/core/peer"
-	p2pmocknet "github.com/libp2p/go-libp2p/p2p/net/mock"
+	p2pmocknet "github.com/berty/go-libp2p-mock"
 	"github.com/stretchr/testify/require"
 
 	"berty.tech/weshnet/pkg/ipfsutil"

diff --git a/message_marshaler_test.go b/message_marshaler_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	mocknet "github.com/libp2p/go-libp2p/p2p/net/mock"
+	mocknet "github.com/berty/go-libp2p-mock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 

diff --git a/orbitdb_test.go b/orbitdb_test.go
@@ -10,7 +10,7 @@ import (
 
 	datastore "github.com/ipfs/go-datastore"
 	sync_ds "github.com/ipfs/go-datastore/sync"
-	mocknet "github.com/libp2p/go-libp2p/p2p/net/mock"
+	mocknet "github.com/berty/go-libp2p-mock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"

diff --git a/pkg/ipfsutil/testing.go b/pkg/ipfsutil/testing.go
@@ -6,22 +6,24 @@ import (
 	"encoding/base64"
 	"testing"
 
+	p2p_mocknet "github.com/berty/go-libp2p-mock"
 	rendezvous "github.com/berty/go-libp2p-rendezvous"
 	p2p_rpdb "github.com/berty/go-libp2p-rendezvous/db/sqlcipher"
 	ds "github.com/ipfs/go-datastore"
 	dsync "github.com/ipfs/go-datastore/sync"
 	ipfs_cfg "github.com/ipfs/kubo/config"
 	ipfs_core "github.com/ipfs/kubo/core"
-	ipfs_mock "github.com/ipfs/kubo/core/mock"
 	ipfs_p2p "github.com/ipfs/kubo/core/node/libp2p"
 	ipfs_repo "github.com/ipfs/kubo/repo"
+	"github.com/libp2p/go-libp2p"
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
 	p2p_ci "github.com/libp2p/go-libp2p/core/crypto"
 	host "github.com/libp2p/go-libp2p/core/host"
 	p2pnetwork "github.com/libp2p/go-libp2p/core/network"
+	"github.com/libp2p/go-libp2p/core/peer"
 	p2p_peer "github.com/libp2p/go-libp2p/core/peer"
+	"github.com/libp2p/go-libp2p/core/peerstore"
 	"github.com/libp2p/go-libp2p/core/protocol"
-	p2p_mocknet "github.com/libp2p/go-libp2p/p2p/net/mock"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"
 
@@ -135,7 +137,7 @@ func TestingCoreAPIUsingMockNet(ctx context.Context, t testing.TB, opts *Testing
 	t.Cleanup(func() { mrepo.Close() })
 
 	mnode, err := NewIPFSMobile(ctx, mrepo, &MobileOptions{
-		HostOption:    ipfs_mock.MockHostOption(opts.Mocknet),
+		HostOption:    MockHostOption(opts.Mocknet),
 		RoutingOption: ipfs_p2p.NilRouterOption,
 		ExtraOpts: map[string]bool{
 			"pubsub": false,
@@ -257,3 +259,9 @@ func (m *coreAPIMock) Tinder() *tinder.Service {
 func (m *coreAPIMock) Close() {
 	m.node.Close()
 }
+
+func MockHostOption(mn p2p_mocknet.Mocknet) ipfs_p2p.HostOption {
+	return func(id peer.ID, ps peerstore.Peerstore, _ ...libp2p.Option) (host.Host, error) {
+		return mn.AddPeerWithPeerstore(id, ps)
+	}
+}
diff --git a/pkg/rendezvous/emitterio_sync_test.go b/pkg/rendezvous/emitterio_sync_test.go
@@ -12,7 +12,7 @@ import (
 	db "github.com/berty/go-libp2p-rendezvous/db/sqlcipher"
 	"github.com/berty/go-libp2p-rendezvous/test_utils"
 	"github.com/libp2p/go-libp2p/core/host"
-	mocknet "github.com/libp2p/go-libp2p/p2p/net/mock"
+	mocknet "github.com/berty/go-libp2p-mock"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"
 

diff --git a/pkg/tinder/driver_localdiscovery_test.go b/pkg/tinder/driver_localdiscovery_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	mocknet "github.com/libp2p/go-libp2p/p2p/net/mock"
+	mocknet "github.com/berty/go-libp2p-mock"
 	"github.com/stretchr/testify/require"
 
 	"berty.tech/weshnet/pkg/testutil"

diff --git a/pkg/tinder/driver_mock_test.go b/pkg/tinder/driver_mock_test.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/libp2p/go-libp2p/core/peer"
-	mocknet "github.com/libp2p/go-libp2p/p2p/net/mock"
+	mocknet "github.com/berty/go-libp2p-mock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

diff --git a/pkg/tinder/driver_service_test.go b/pkg/tinder/driver_service_test.go
@@ -11,7 +11,7 @@ import (
 	dht "github.com/libp2p/go-libp2p-kad-dht"
 	"github.com/libp2p/go-libp2p/core/host"
 	"github.com/libp2p/go-libp2p/core/peer"
-	mocknet "github.com/libp2p/go-libp2p/p2p/net/mock"
+	mocknet "github.com/berty/go-libp2p-mock"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"
 

diff --git a/pkg/tinder/service_mocked_test.go b/pkg/tinder/service_mocked_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/libp2p/go-libp2p/core/host"
 	"github.com/libp2p/go-libp2p/core/peer"
-	mocknet "github.com/libp2p/go-libp2p/p2p/net/mock"
+	mocknet "github.com/berty/go-libp2p-mock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"

diff --git a/pkg/tinder/testing_test.go b/pkg/tinder/testing_test.go
@@ -11,7 +11,7 @@ import (
 	p2putil "github.com/libp2p/go-libp2p-testing/netutil"
 	"github.com/libp2p/go-libp2p/core/host"
 	"github.com/libp2p/go-libp2p/core/peer"
-	mocknet "github.com/libp2p/go-libp2p/p2p/net/mock"
+	mocknet "github.com/berty/go-libp2p-mock"
 	ma "github.com/multiformats/go-multiaddr"
 	"github.com/stretchr/testify/require"
 )

diff --git a/scenario_test.go b/scenario_test.go
@@ -12,7 +12,7 @@ import (
 	"testing"
 	"time"
 
-	libp2p_mocknet "github.com/libp2p/go-libp2p/p2p/net/mock"
+	libp2p_mocknet "github.com/berty/go-libp2p-mock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/goleak"

diff --git a/store_metadata_test.go b/store_metadata_test.go
@@ -12,7 +12,7 @@ import (
 	datastore "github.com/ipfs/go-datastore"
 	ds_sync "github.com/ipfs/go-datastore/sync"
 	"github.com/libp2p/go-libp2p/core/crypto"
-	libp2p_mocknet "github.com/libp2p/go-libp2p/p2p/net/mock"
+	libp2p_mocknet "github.com/berty/go-libp2p-mock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"

diff --git a/testing.go b/testing.go
@@ -19,7 +19,7 @@ import (
 	ds_sync "github.com/ipfs/go-datastore/sync"
 	"github.com/libp2p/go-libp2p/core/crypto"
 	"github.com/libp2p/go-libp2p/core/peer"
-	libp2p_mocknet "github.com/libp2p/go-libp2p/p2p/net/mock"
+	libp2p_mocknet "github.com/berty/go-libp2p-mock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"

diff --git a/tinder_swiper_test.go b/tinder_swiper_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	p2pmocknet "github.com/libp2p/go-libp2p/p2p/net/mock"
+	p2pmocknet "github.com/berty/go-libp2p-mock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"