Do not return context from client Error hook.

keathley · Nov 28, 2019 · 89b596b · 89b596b
1 parent 33e3c73
commit 89b596b
Show file tree

Hide file tree

Showing 19 changed files with 53 additions and 54 deletions.
diff --git a/client.go b/client.go
@@ -34,7 +34,7 @@ type ClientHooks struct {
 
 	// Error hook is called whenever an error occurs during the sending of a request. The Error is passed
 	// as an argument to the hook.
-	Error func(context.Context, Error) context.Context
+	Error func(context.Context, Error)
 }
 
 func DefaultClientOptions() ClientOptions {

diff --git a/clientcompat/internal/clientcompat/clientcompat.twirp.go b/clientcompat/internal/clientcompat/clientcompat.twirp.go
diff --git a/example/service.twirp.go b/example/service.twirp.go
diff --git a/internal/twirptest/client_test.go b/internal/twirptest/client_test.go
@@ -270,9 +270,8 @@ func TestClientWithHooks(t *testing.T) {
 		RequestFinished: func(ctx context.Context) {
 			requestFinishedCalled = true
 		},
-		Error: func(ctx context.Context, err twirp.Error) context.Context {
+		Error: func(ctx context.Context, err twirp.Error) {
 			errorCalled = true
-			return ctx
 		},
 	}
 

diff --git a/internal/twirptest/empty_service/empty_service.twirp.go b/internal/twirptest/empty_service/empty_service.twirp.go
diff --git a/internal/twirptest/gogo_compat/service.twirp.go b/internal/twirptest/gogo_compat/service.twirp.go
diff --git a/internal/twirptest/google_protobuf_imports/service.twirp.go b/internal/twirptest/google_protobuf_imports/service.twirp.go
diff --git a/internal/twirptest/importable/importable.twirp.go b/internal/twirptest/importable/importable.twirp.go
diff --git a/internal/twirptest/importer/importer.twirp.go b/internal/twirptest/importer/importer.twirp.go
diff --git a/internal/twirptest/importmapping/x/x.twirp.go b/internal/twirptest/importmapping/x/x.twirp.go
diff --git a/internal/twirptest/multiple/multiple1.twirp.go b/internal/twirptest/multiple/multiple1.twirp.go
diff --git a/internal/twirptest/no_package_name/no_package_name.twirp.go b/internal/twirptest/no_package_name/no_package_name.twirp.go
diff --git a/internal/twirptest/no_package_name_importer/no_package_name_importer.twirp.go b/internal/twirptest/no_package_name_importer/no_package_name_importer.twirp.go
diff --git a/internal/twirptest/proto/proto.twirp.go b/internal/twirptest/proto/proto.twirp.go
diff --git a/internal/twirptest/service.twirp.go b/internal/twirptest/service.twirp.go
diff --git a/internal/twirptest/service_method_same_name/service_method_same_name.twirp.go b/internal/twirptest/service_method_same_name/service_method_same_name.twirp.go
diff --git a/internal/twirptest/snake_case_names/snake_case_names.twirp.go b/internal/twirptest/snake_case_names/snake_case_names.twirp.go
diff --git a/internal/twirptest/source_relative/source_relative.twirp.go b/internal/twirptest/source_relative/source_relative.twirp.go
diff --git a/protoc-gen-twirp/generator.go b/protoc-gen-twirp/generator.go
@@ -982,11 +982,11 @@ func (t *twirp) generateClientHooks() {
 	t.P(`  return h.RequestPrepared(ctx, req)`)
 	t.P(`}`)
 	t.P()
-	t.P(`func callClientError(ctx `, t.pkgs["context"], `.Context, h *`, t.pkgs["twirp"], `.ClientHooks, err `, t.pkgs["twirp"], `.Error) `, t.pkgs["context"], `.Context {`)
+	t.P(`func callClientError(ctx `, t.pkgs["context"], `.Context, h *`, t.pkgs["twirp"], `.ClientHooks, err `, t.pkgs["twirp"], `.Error) {`)
 	t.P(`  if h == nil || h.Error == nil {`)
-	t.P(`    return ctx`)
+	t.P(`    return`)
 	t.P(`  }`)
-	t.P(`  return h.Error(ctx, err)`)
+	t.P(`  h.Error(ctx, err)`)
 	t.P(`}`)
 }