Merge pull request #12437 from dgquintas/fix_concurrent_merges

Fix use of grpc_channel_filter from concurrent merges
8 years ago · 7e8dec3d44
parent 41630a2950 b9f99f0de2
commit 7e8dec3d44
1 changed files with 0 additions and 6 deletions
--- a/test/core/channel/channel_stack_builder_test.c
+++ b/test/core/channel/channel_stack_builder_test.c
@ -59,10 +59,6 @@ static void channel_func(grpc_exec_ctx *exec_ctx, grpc_channel_element *elem,
  GRPC_CLOSURE_SCHED(exec_ctx, op->on_consumed, GRPC_ERROR_NONE);
 }

-static char *get_peer(grpc_exec_ctx *exec_ctx, grpc_call_element *elem) {
-  return gpr_strdup("peer");
-}
-
 bool g_replacement_fn_called = false;
 bool g_original_fn_called = false;
 void set_arg_once_fn(grpc_channel_stack *channel_stack,
@ -94,7 +90,6 @@ const grpc_channel_filter replacement_filter = {
    0,
    channel_init_func,
    channel_destroy_func,
-    get_peer,
    grpc_channel_next_get_info,
    "filter_name"};

@ -108,7 +103,6 @@ const grpc_channel_filter original_filter = {
    0,
    channel_init_func,
    channel_destroy_func,
-    get_peer,
    grpc_channel_next_get_info,
    "filter_name"};