diff options
Diffstat (limited to 'internal/gitaly/service/conflicts/testhelper_test.go')
| -rw-r--r-- | internal/gitaly/service/conflicts/testhelper_test.go | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/internal/gitaly/service/conflicts/testhelper_test.go b/internal/gitaly/service/conflicts/testhelper_test.go index 5dbda1816..ae8d5e1df 100644 --- a/internal/gitaly/service/conflicts/testhelper_test.go +++ b/internal/gitaly/service/conflicts/testhelper_test.go @@ -36,14 +36,7 @@ func setupConflictsService(tb testing.TB, hookManager hook.Manager) (config.Cfg, func runConflictsServer(tb testing.TB, cfg config.Cfg, hookManager hook.Manager) string { return testserver.RunGitalyServer(tb, cfg, func(srv *grpc.Server, deps *service.Dependencies) { - gitalypb.RegisterConflictsServiceServer(srv, NewServer( - deps.GetHookManager(), - deps.GetLocator(), - deps.GetGitCmdFactory(), - deps.GetCatfileCache(), - deps.GetConnsPool(), - deps.GetUpdaterWithHooks(), - )) + gitalypb.RegisterConflictsServiceServer(srv, NewServer(deps)) gitalypb.RegisterRepositoryServiceServer(srv, repository.NewServer(deps)) gitalypb.RegisterSSHServiceServer(srv, ssh.NewServer(deps)) gitalypb.RegisterHookServiceServer(srv, hookservice.NewServer( |