Rename GRPCTransportTypeDefault to GRPCTransportTypeChttp2CFStream

pull/16190/head
Muxi Yan 6 years ago
parent bca7e68ccb
commit 8592dc2722
  1. 2
      src/objective-c/GRPCClient/GRPCCallOptions.h
  2. 2
      src/objective-c/GRPCClient/GRPCCallOptions.m
  3. 2
      src/objective-c/GRPCClient/private/GRPCChannelPool.m
  4. 2
      src/objective-c/tests/ChannelTests/ChannelPoolTest.m
  5. 4
      src/objective-c/tests/ChannelTests/ChannelTests.m
  6. 2
      src/objective-c/tests/InteropTests.m
  7. 2
      src/objective-c/tests/InteropTestsLocalSSL.m
  8. 2
      src/objective-c/tests/InteropTestsMultipleChannels/InteropTestsMultipleChannels.m
  9. 2
      src/objective-c/tests/InteropTestsRemote.m

@ -42,7 +42,7 @@ typedef NS_ENUM(NSInteger, GRPCCompressAlgorithm) {
// The transport to be used by a gRPC call
typedef NS_ENUM(NSInteger, GRPCTransportType) {
// gRPC internal HTTP/2 stack with BoringSSL
GRPCTransportTypeDefault = 0,
GRPCTransportTypeChttp2BoringSSL = 0,
// Cronet stack
GRPCTransportTypeCronet,
// Insecure channel. FOR TEST ONLY!

@ -37,7 +37,7 @@ static NSString *const kDefaultPemPrivateKey = nil;
static NSString *const kDefaultPemCertChain = nil;
static NSString *const kDefaultOauth2AccessToken = nil;
static const id<GRPCAuthorizationProtocol> kDefaultAuthTokenProvider = nil;
static const GRPCTransportType kDefaultTransportType = GRPCTransportTypeDefault;
static const GRPCTransportType kDefaultTransportType = GRPCTransportTypeChttp2BoringSSL;
static NSString *const kDefaultHostNameOverride = nil;
static const id kDefaultLogContext = nil;
static NSString *kDefaultChannelPoolDomain = nil;

@ -49,7 +49,7 @@ const NSTimeInterval kChannelDestroyDelay = 30;
id<GRPCChannelFactory> factory;
GRPCTransportType type = _callOptions.transportType;
switch (type) {
case GRPCTransportTypeDefault:
case GRPCTransportTypeChttp2BoringSSL:
// TODO (mxyan): Remove when the API is deprecated
#ifdef GRPC_COMPILE_WITH_CRONET
if (![GRPCCall isUsingCronet]) {

@ -127,7 +127,7 @@ NSString *kDummyHost = @"dummy.host";
GRPCMutableCallOptions *options1 = [[GRPCMutableCallOptions alloc] init];
options1.transportType = GRPCTransportTypeInsecure;
GRPCMutableCallOptions *options2 = [[GRPCMutableCallOptions alloc] init];
options2.transportType = GRPCTransportTypeDefault;
options2.transportType = GRPCTransportTypeChttp2BoringSSL;
GRPCChannelConfiguration *config1 =
[[GRPCChannelConfiguration alloc] initWithHost:kDummyHost callOptions:options1];
GRPCChannelConfiguration *config2 =

@ -72,7 +72,7 @@
- (void)testDifferentChannelParameters {
NSString *host = @"grpc-test.sandbox.googleapis.com";
GRPCMutableCallOptions *options1 = [[GRPCMutableCallOptions alloc] init];
options1.transportType = GRPCTransportTypeDefault;
options1.transportType = GRPCTransportTypeChttp2BoringSSL;
NSMutableDictionary *args = [NSMutableDictionary new];
args[@"abc"] = @"xyz";
options1.additionalChannelArgs = [args copy];
@ -80,7 +80,7 @@
options2.transportType = GRPCTransportTypeInsecure;
options2.additionalChannelArgs = [args copy];
GRPCMutableCallOptions *options3 = [[GRPCMutableCallOptions alloc] init];
options3.transportType = GRPCTransportTypeDefault;
options3.transportType = GRPCTransportTypeChttp2BoringSSL;
args[@"def"] = @"uvw";
options3.additionalChannelArgs = [args copy];
GRPCChannel *channel1 = [GRPCChannel channelWithHost:host callOptions:options1];

@ -144,7 +144,7 @@ BOOL isRemoteInteropTest(NSString *host) {
}
+ (GRPCTransportType)transportType {
return GRPCTransportTypeDefault;
return GRPCTransportTypeChttp2BoringSSL;
}
+ (NSString *)pemRootCert {

@ -57,7 +57,7 @@ static int32_t kLocalInteropServerOverhead = 10;
}
+ (GRPCTransportType)transportType {
return GRPCTransportTypeDefault;
return GRPCTransportTypeChttp2BoringSSL;
}
- (void)setUp {

@ -114,7 +114,7 @@ dispatch_once_t initCronet;
XCTAssertNil(error);
options = [[GRPCCallOptions alloc] init];
options.transportType = GRPCTransportTypeDefault;
options.transportType = GRPCTransportTypeChttp2BoringSSL;
options.pemRootCert = certs;
options.hostNameOverride = @"foo.test.google.fr";
_localSSLService.options = options;

@ -59,7 +59,7 @@ static int32_t kRemoteInteropServerOverhead = 12;
}
#else
+ (GRPCTransportType)transportType {
return GRPCTransportTypeDefault;
return GRPCTransportTypeChttp2BoringSSL;
}
#endif

Loading…
Cancel
Save