From 473041e06b728414799bca7f6ca4a53ac504ce32 Mon Sep 17 00:00:00 2001 From: Michael Behr Date: Wed, 27 Feb 2019 10:52:45 -0500 Subject: [PATCH] Format code. --- test/cpp/util/create_test_channel.cc | 29 ++++++++++++++-------------- test/cpp/util/create_test_channel.h | 3 +-- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/test/cpp/util/create_test_channel.cc b/test/cpp/util/create_test_channel.cc index e0c0bd064fc..79a5e13d993 100644 --- a/test/cpp/util/create_test_channel.cc +++ b/test/cpp/util/create_test_channel.cc @@ -71,8 +71,8 @@ std::shared_ptr CreateTestChannel( const grpc::string& override_hostname, bool use_prod_roots, const std::shared_ptr& creds, const ChannelArguments& args) { - return CreateTestChannel(server, cred_type, override_hostname, - use_prod_roots, creds, args, + return CreateTestChannel(server, cred_type, override_hostname, use_prod_roots, + creds, args, /*interceptor_creators=*/{}); } @@ -124,11 +124,10 @@ std::shared_ptr CreateTestChannel( std::shared_ptr CreateTestChannel( const grpc::string& server, const grpc::string& cred_type, const grpc::string& override_hostname, bool use_prod_roots, - const std::shared_ptr& creds, - const ChannelArguments& args, + const std::shared_ptr& creds, const ChannelArguments& args, std::vector< std::unique_ptr> - interceptor_creators) { + interceptor_creators) { ChannelArguments channel_args(args); std::shared_ptr channel_creds; if (cred_type.empty()) { @@ -174,8 +173,8 @@ std::shared_ptr CreateTestChannel( if (interceptor_creators.empty()) { return CreateCustomChannel(server, channel_creds, args); } else { - return experimental::CreateCustomChannelWithInterceptors( - server, channel_creds, args, std::move(interceptor_creators)); + return experimental::CreateCustomChannelWithInterceptors( + server, channel_creds, args, std::move(interceptor_creators)); } } } @@ -186,15 +185,15 @@ std::shared_ptr CreateTestChannel( const std::shared_ptr& creds, const ChannelArguments& args, std::vector< std::unique_ptr> - interceptor_creators) { + interceptor_creators) { grpc::string credential_type = security_type == testing::ALTS ? testing::kAltsCredentialsType : (security_type == testing::TLS ? testing::kTlsCredentialsType : testing::kInsecureCredentialsType); - return CreateTestChannel( - server, credential_type, override_hostname, use_prod_roots, creds, args, - std::move(interceptor_creators)); + return CreateTestChannel(server, credential_type, override_hostname, + use_prod_roots, creds, args, + std::move(interceptor_creators)); } std::shared_ptr CreateTestChannel( @@ -204,9 +203,9 @@ std::shared_ptr CreateTestChannel( std::vector< std::unique_ptr> interceptor_creators) { - return CreateTestChannel( - server, override_hostname, security_type, use_prod_roots, creds, - ChannelArguments(), std::move(interceptor_creators)); + return CreateTestChannel(server, override_hostname, security_type, + use_prod_roots, creds, ChannelArguments(), + std::move(interceptor_creators)); } std::shared_ptr CreateTestChannel( @@ -214,7 +213,7 @@ std::shared_ptr CreateTestChannel( const std::shared_ptr& creds, std::vector< std::unique_ptr> - interceptor_creators) { + interceptor_creators) { ChannelArguments channel_args; std::shared_ptr channel_creds = testing::GetCredentialsProvider()->GetChannelCredentials(credential_type, diff --git a/test/cpp/util/create_test_channel.h b/test/cpp/util/create_test_channel.h index e706acc6072..b50131b385c 100644 --- a/test/cpp/util/create_test_channel.h +++ b/test/cpp/util/create_test_channel.h @@ -80,8 +80,7 @@ std::shared_ptr CreateTestChannel( std::shared_ptr CreateTestChannel( const grpc::string& server, const grpc::string& cred_type, const grpc::string& override_hostname, bool use_prod_roots, - const std::shared_ptr& creds, - const ChannelArguments& args, + const std::shared_ptr& creds, const ChannelArguments& args, std::vector< std::unique_ptr> interceptor_creators);