heal: fix TestNSMGR_HealForwarder and remove grpc.WaitTillReady() and…

… grpc.WithBlock() from sandbox.DialOptions()

Signed-off-by: Ed Warnicke <hagbard@gmail.com>

pkg/networkservice/chains/nsmgr/heal_test.go

@@ -175,8 +175,8 @@ func testNSMGRHealForwarder(t *testing.T, nodeNum int) {
 	domain.Nodes[nodeNum].NewForwarder(ctx, forwarderReg, sandbox.GenerateTestToken)
 
 	// Wait reconnecting through the new Forwarder
-	require.Eventually(t, checkSecondRequestsReceived(counter.UniqueRequests), timeout, tick)
-	require.Equal(t, 2, counter.UniqueRequests())
+	require.Eventually(t, checkSecondRequestsReceived(counter.Requests), timeout, tick)
+	require.Equal(t, 2, counter.Requests())
 	closes := counter.UniqueCloses()
 
 	// Check refresh
@@ -188,8 +188,8 @@ func testNSMGRHealForwarder(t *testing.T, nodeNum int) {
 	_, err = nsc.Close(ctx, conn)
 	require.NoError(t, err)
 
-	require.Equal(t, 2, counter.UniqueRequests())
-	require.Equal(t, closes+1, counter.UniqueCloses())
+	require.Equal(t, 3, counter.Requests())
+	require.Equal(t, closes+1, counter.Closes())
 }
 
 func TestNSMGR_HealNSMgr(t *testing.T) {

pkg/tools/sandbox/dial_options.go

@@ -55,9 +55,7 @@ func DialOptions(options ...DialOption) []grpc.DialOption {
 		grpc.WithTransportCredentials(
 			grpcfdTransportCredentials(insecure.NewCredentials()),
 		),
-		grpc.WithBlock(),
 		grpc.WithDefaultCallOptions(
-			grpc.WaitForReady(true),
 			grpc.PerRPCCredentials(token.NewPerRPCCredentials(opts.tokenGenerator)),
 		),
 		grpcfd.WithChainStreamInterceptor(),