fix(test): fix test with rdv point

go/internal/handshake/handshake_util_test.go

@@ -30,6 +30,8 @@ type mockedPeer struct {
 type mockedHandshake struct {
 	requester *mockedPeer
 	responder *mockedPeer
+
+	cleanup func()
 }
 
 type requesterTestFunc func(
@@ -64,26 +66,37 @@ func newMockedPeer(t *testing.T, ctx context.Context, ipfsOpts *ipfsutil.Testing
 func newMockedHandshake(t *testing.T, ctx context.Context) *mockedHandshake {
 	t.Helper()
 
+	mn := p2pmocknet.New(ctx)
+	rdvp, err := mn.GenPeer()
+	require.NoError(t, err, "failed to generate mocked peer")
+
+	_, rdv_cleanup := ipfsutil.TestingRDVP(ctx, t, rdvp)
+
 	opts := &ipfsutil.TestingAPIOpts{
-		Mocknet: p2pmocknet.New(ctx),
+		Mocknet: mn,
+		RDVPeer: rdvp.ID(),
 	}
-	requester, cleanup := newMockedPeer(t, ctx, opts)
-	defer cleanup()
-
-	responder, cleanup := newMockedPeer(t, ctx, opts)
-	defer cleanup()
+	requester, req_cleanup := newMockedPeer(t, ctx, opts)
+	responder, res_cleanup := newMockedPeer(t, ctx, opts)
 
 	// link responder & requester
-	err := opts.Mocknet.LinkAll()
+	err = opts.Mocknet.LinkAll()
 	require.NoError(t, err, "can't link peers")
 
 	// connect responder & requester
 	err = opts.Mocknet.ConnectAllButSelf()
 	require.NoError(t, err, "can't connect peers")
 
+	cleanup := func() {
+		res_cleanup()
+		req_cleanup()
+		rdv_cleanup()
+	}
+
 	return &mockedHandshake{
 		requester: requester,
 		responder: responder,
+		cleanup:   cleanup,
 	}
 }
 
@@ -92,6 +105,7 @@ func (mh *mockedHandshake) close(t *testing.T) {
 
 	mh.requester.coreAPI.Close()
 	mh.responder.coreAPI.Close()
+	mh.cleanup()
 }
 
 func newTestHandshakeContext(stream p2pnetwork.Stream, ownAccountID p2pcrypto.PrivKey, peerAccountID p2pcrypto.PubKey) *handshakeContext {

go/internal/testutil/logging.go

@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"testing"
 
-	"berty.tech/berty/v2/go/internal/ipfsutil"
+	ipfs_log "github.com/ipfs/go-log"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 )
@@ -41,9 +41,7 @@ func Logger(t *testing.T) *zap.Logger {
 	}
 
 	if libp2pDebug {
-		if err := ipfsutil.ConfigureLogger("*", logger, "debug"); err != nil {
-			logger.Error("setup libp2p logger", zap.Error(err))
-		}
+		ipfs_log.SetDebugLogging()
 	}
 
 	if orbitdbDebug {

go/internal/tinder/driver_multi_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 	"time"
 
+	"berty.tech/berty/v2/go/internal/testutil"
 	p2p_discovery "github.com/libp2p/go-libp2p-core/discovery"
 	p2p_host "github.com/libp2p/go-libp2p-core/host"
 	p2p_disc "github.com/libp2p/go-libp2p-discovery"
@@ -38,6 +39,7 @@ func TestMultiDriver_Advertise(t *testing.T) {
 		},
 	}
 
+	logger := testutil.Logger(t)
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
@@ -54,7 +56,7 @@ func TestMultiDriver_Advertise(t *testing.T) {
 
 			peers := testingPeers(t, mn, tc.NMock)
 			drivers := testingMockedDriverClients(t, ms, peers...)
-			md := NewMultiDriver(drivers...)
+			md := NewMultiDriver(logger, drivers...)
 
 			const testKey = "testkey"
 
@@ -96,6 +98,7 @@ func TestMultiDriver_FindPeers(t *testing.T) {
 		},
 	}
 
+	logger := testutil.Logger(t)
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
@@ -112,7 +115,7 @@ func TestMultiDriver_FindPeers(t *testing.T) {
 
 			peers := testingPeers(t, mn, tc.NMock)
 			drivers := testingMockedDriverClients(t, ms, peers...)
-			md := NewMultiDriver(drivers...)
+			md := NewMultiDriver(logger, drivers...)
 
 			const testKey = "testkey"
 			_, err = md.Advertise(ctx, testKey, tc.Opts...)
@@ -147,6 +150,7 @@ func TestMultiDriver_Unregister(t *testing.T) {
 		},
 	}
 
+	logger := testutil.Logger(t)
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
@@ -159,7 +163,7 @@ func TestMultiDriver_Unregister(t *testing.T) {
 
 			peers := testingPeers(t, mn, tc.NMock)
 			drivers := testingMockedDriverClients(t, ms, peers...)
-			md := NewMultiDriver(drivers...)
+			md := NewMultiDriver(logger, drivers...)
 
 			const testKey = "testkey"
 			_, err := md.Advertise(ctx, testKey, tc.Opts...)

go/pkg/bertyprotocol/orbitdb_utils_test.go

@@ -74,8 +74,15 @@ func createPeersWithGroup(ctx context.Context, t testing.TB, pathBase string, me
 		t.Fatal(err)
 	}
 
+	mn := mocknet.New(ctx)
+	rdvp, err := mn.GenPeer()
+	require.NoError(t, err, "failed to generate mocked peer")
+
+	_, _ = ipfsutil.TestingRDVP(ctx, t, rdvp)
+
 	ipfsopts := ipfsutil.TestingAPIOpts{
-		Mocknet: mocknet.New(ctx),
+		Mocknet: mn,
+		RDVPeer: rdvp.ID(),
 	}
 	deviceIndex := 0
 
@@ -117,7 +124,8 @@ func createPeersWithGroup(ctx context.Context, t testing.TB, pathBase string, me
 				DevKS:   devKS,
 			}
 
-			cls = append(cls, func() {
+			// setup cleanup
+			cls[i] = func() {
 				if ms := mp.GC.MetadataStore(); ms != nil {
 					err := ms.Drop()
 					assert.NoError(t, err)
@@ -129,7 +137,7 @@ func createPeersWithGroup(ctx context.Context, t testing.TB, pathBase string, me
 				}
 
 				cleanupNode()
-			})
+			}
 
 			mockedPeers[deviceIndex] = mp
 			deviceIndex++