diff options
author | 2018-10-11 13:31:07 -0700 | |
---|---|---|
committer | 2018-10-11 13:31:07 -0700 | |
commit | 8592dc27223e9ec41f4f52634f662c4485bd119b (patch) | |
tree | 592290594ece61762a0aad8b4b6669a53fb2fe8a | |
parent | bca7e68ccbf15eab3d3a8a09d0e3d50d7db49cf9 (diff) |
Rename GRPCTransportTypeDefault to GRPCTransportTypeChttp2CFStream
9 files changed, 10 insertions, 10 deletions
diff --git a/src/objective-c/GRPCClient/GRPCCallOptions.h b/src/objective-c/GRPCClient/GRPCCallOptions.h index 75b320ca6d..1093044c0c 100644 --- a/src/objective-c/GRPCClient/GRPCCallOptions.h +++ b/src/objective-c/GRPCClient/GRPCCallOptions.h @@ -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! diff --git a/src/objective-c/GRPCClient/GRPCCallOptions.m b/src/objective-c/GRPCClient/GRPCCallOptions.m index 072b980af4..0216342817 100644 --- a/src/objective-c/GRPCClient/GRPCCallOptions.m +++ b/src/objective-c/GRPCClient/GRPCCallOptions.m @@ -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; diff --git a/src/objective-c/GRPCClient/private/GRPCChannelPool.m b/src/objective-c/GRPCClient/private/GRPCChannelPool.m index b5f0949ef7..340f4f3c83 100644 --- a/src/objective-c/GRPCClient/private/GRPCChannelPool.m +++ b/src/objective-c/GRPCClient/private/GRPCChannelPool.m @@ -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]) { diff --git a/src/objective-c/tests/ChannelTests/ChannelPoolTest.m b/src/objective-c/tests/ChannelTests/ChannelPoolTest.m index 3b6b10b1a5..9e1c9eca74 100644 --- a/src/objective-c/tests/ChannelTests/ChannelPoolTest.m +++ b/src/objective-c/tests/ChannelTests/ChannelPoolTest.m @@ -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 = diff --git a/src/objective-c/tests/ChannelTests/ChannelTests.m b/src/objective-c/tests/ChannelTests/ChannelTests.m index 0a8b7ae6ee..64c3356b13 100644 --- a/src/objective-c/tests/ChannelTests/ChannelTests.m +++ b/src/objective-c/tests/ChannelTests/ChannelTests.m @@ -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]; diff --git a/src/objective-c/tests/InteropTests.m b/src/objective-c/tests/InteropTests.m index 54af7036c3..16d5040a73 100644 --- a/src/objective-c/tests/InteropTests.m +++ b/src/objective-c/tests/InteropTests.m @@ -144,7 +144,7 @@ BOOL isRemoteInteropTest(NSString *host) { } + (GRPCTransportType)transportType { - return GRPCTransportTypeDefault; + return GRPCTransportTypeChttp2BoringSSL; } + (NSString *)pemRootCert { diff --git a/src/objective-c/tests/InteropTestsLocalSSL.m b/src/objective-c/tests/InteropTestsLocalSSL.m index eb72dd1d31..997dd87eee 100644 --- a/src/objective-c/tests/InteropTestsLocalSSL.m +++ b/src/objective-c/tests/InteropTestsLocalSSL.m @@ -57,7 +57,7 @@ static int32_t kLocalInteropServerOverhead = 10; } + (GRPCTransportType)transportType { - return GRPCTransportTypeDefault; + return GRPCTransportTypeChttp2BoringSSL; } - (void)setUp { diff --git a/src/objective-c/tests/InteropTestsMultipleChannels/InteropTestsMultipleChannels.m b/src/objective-c/tests/InteropTestsMultipleChannels/InteropTestsMultipleChannels.m index eb0ba7f34b..b1d663584c 100644 --- a/src/objective-c/tests/InteropTestsMultipleChannels/InteropTestsMultipleChannels.m +++ b/src/objective-c/tests/InteropTestsMultipleChannels/InteropTestsMultipleChannels.m @@ -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; diff --git a/src/objective-c/tests/InteropTestsRemote.m b/src/objective-c/tests/InteropTestsRemote.m index 516a1f432a..30670facad 100644 --- a/src/objective-c/tests/InteropTestsRemote.m +++ b/src/objective-c/tests/InteropTestsRemote.m @@ -59,7 +59,7 @@ static int32_t kRemoteInteropServerOverhead = 12; } #else + (GRPCTransportType)transportType { - return GRPCTransportTypeDefault; + return GRPCTransportTypeChttp2BoringSSL; } #endif |