Remove the RepositoryClient trait

Author: Kobzol

src/bors/context.rs

@@ -5,19 +5,19 @@ use std::{
 
 use crate::{bors::command::CommandParser, github::GithubRepoName, PgDbClient};
 
-use super::{RepositoryClient, RepositoryState};
+use super::RepositoryState;
 
-pub struct BorsContext<Client: RepositoryClient> {
+pub struct BorsContext {
     pub parser: CommandParser,
     pub db: Arc<PgDbClient>,
-    pub repositories: RwLock<HashMap<GithubRepoName, Arc<RepositoryState<Client>>>>,
+    pub repositories: RwLock<HashMap<GithubRepoName, Arc<RepositoryState>>>,
 }
 
-impl<Client: RepositoryClient> BorsContext<Client> {
+impl BorsContext {
     pub fn new(
         parser: CommandParser,
         db: Arc<PgDbClient>,
-        repositories: HashMap<GithubRepoName, Arc<RepositoryState<Client>>>,
+        repositories: HashMap<GithubRepoName, Arc<RepositoryState>>,
     ) -> Self {
         let repositories = RwLock::new(repositories);
         Self {

src/bors/handlers/help.rs

@@ -1,7 +1,6 @@
 use std::sync::Arc;
 
 use crate::bors::Comment;
-use crate::bors::RepositoryClient;
 use crate::bors::RepositoryState;
 use crate::github::PullRequest;
 
@@ -12,8 +11,8 @@ const HELP_MESSAGE: &str = r#"
 - help: Print this help message
 "#;
 
-pub(super) async fn command_help<Client: RepositoryClient>(
-    repo: Arc<RepositoryState<Client>>,
+pub(super) async fn command_help(
+    repo: Arc<RepositoryState>,
     pr: &PullRequest,
 ) -> anyhow::Result<()> {
     repo.client

src/bors/handlers/labels.rs

@@ -1,13 +1,13 @@
 use itertools::Itertools;
 use tracing::log;
 
-use crate::bors::{RepositoryClient, RepositoryState};
+use crate::bors::RepositoryState;
 use crate::github::{LabelModification, LabelTrigger, PullRequestNumber};
 
 /// If there are any label modifications that should be performed on the given PR when `trigger`
 /// happens, this function will perform them.
-pub async fn handle_label_trigger<Client: RepositoryClient>(
-    repo: &RepositoryState<Client>,
+pub async fn handle_label_trigger(
+    repo: &RepositoryState,
     pr: PullRequestNumber,
     trigger: LabelTrigger,
 ) -> anyhow::Result<()> {

src/bors/handlers/mod.rs

@@ -12,7 +12,7 @@ use crate::bors::handlers::trybuild::{command_try_build, command_try_cancel, TRY
 use crate::bors::handlers::workflow::{
     handle_check_suite_completed, handle_workflow_completed, handle_workflow_started,
 };
-use crate::bors::{BorsContext, Comment, RepositoryClient, RepositoryLoader, RepositoryState};
+use crate::bors::{BorsContext, Comment, RepositoryLoader, RepositoryState};
 use crate::{PgDbClient, TeamApiClient};
 
 #[cfg(test)]
@@ -29,9 +29,9 @@ mod workflow;
 pub static WAIT_FOR_WORKFLOW_STARTED: TestSyncMarker = TestSyncMarker::new();
 
 /// This function executes a single BORS repository event
-pub async fn handle_bors_repository_event<Client: RepositoryClient>(
+pub async fn handle_bors_repository_event(
     event: BorsRepositoryEvent,
-    ctx: Arc<BorsContext<Client>>,
+    ctx: Arc<BorsContext>,
 ) -> anyhow::Result<()> {
     let db = Arc::clone(&ctx.db);
     let Some(repo) = ctx
@@ -118,10 +118,10 @@ pub async fn handle_bors_repository_event<Client: RepositoryClient>(
 pub static WAIT_FOR_REFRESH: TestSyncMarker = TestSyncMarker::new();
 
 /// This function executes a single BORS global event
-pub async fn handle_bors_global_event<Client: RepositoryClient>(
+pub async fn handle_bors_global_event(
     event: BorsGlobalEvent,
-    ctx: Arc<BorsContext<Client>>,
-    repo_loader: &dyn RepositoryLoader<Client>,
+    ctx: Arc<BorsContext>,
+    repo_loader: &dyn RepositoryLoader,
     team_api_client: &TeamApiClient,
 ) -> anyhow::Result<()> {
     let db = Arc::clone(&ctx.db);
@@ -134,7 +134,7 @@ pub async fn handle_bors_global_event<Client: RepositoryClient>(
         }
         BorsGlobalEvent::Refresh => {
             let span = tracing::info_span!("Refresh");
-            let repos: Vec<Arc<RepositoryState<Client>>> =
+            let repos: Vec<Arc<RepositoryState>> =
                 ctx.repositories.read().unwrap().values().cloned().collect();
             futures::future::join_all(repos.into_iter().map(|repo| {
                 let repo = Arc::clone(&repo);
@@ -155,10 +155,10 @@ pub async fn handle_bors_global_event<Client: RepositoryClient>(
     Ok(())
 }
 
-async fn handle_comment<Client: RepositoryClient>(
-    repo: Arc<RepositoryState<Client>>,
+async fn handle_comment(
+    repo: Arc<RepositoryState>,
     database: Arc<PgDbClient>,
-    ctx: Arc<BorsContext<Client>>,
+    ctx: Arc<BorsContext>,
     comment: PullRequestComment,
 ) -> anyhow::Result<()> {
     let pr_number = comment.pr_number;
@@ -241,9 +241,9 @@ async fn handle_comment<Client: RepositoryClient>(
     Ok(())
 }
 
-async fn reload_repos<Client: RepositoryClient>(
-    ctx: Arc<BorsContext<Client>>,
-    repo_loader: &dyn RepositoryLoader<Client>,
+async fn reload_repos(
+    ctx: Arc<BorsContext>,
+    repo_loader: &dyn RepositoryLoader,
     team_api_client: &TeamApiClient,
 ) -> anyhow::Result<()> {
     let reloaded_repos = repo_loader.load_repositories(team_api_client).await?;

src/bors/handlers/ping.rs

@@ -1,12 +1,11 @@
 use std::sync::Arc;
 
 use crate::bors::Comment;
-use crate::bors::RepositoryClient;
 use crate::bors::RepositoryState;
 use crate::github::PullRequest;
 
-pub(super) async fn command_ping<Client: RepositoryClient>(
-    repo: Arc<RepositoryState<Client>>,
+pub(super) async fn command_ping(
+    repo: Arc<RepositoryState>,
     pr: &PullRequest,
 ) -> anyhow::Result<()> {
     repo.client

src/bors/handlers/refresh.rs

@@ -6,12 +6,12 @@ use chrono::{DateTime, Utc};
 
 use crate::bors::handlers::trybuild::cancel_build_workflows;
 use crate::bors::Comment;
-use crate::bors::{RepositoryClient, RepositoryState};
+use crate::bors::RepositoryState;
 use crate::database::BuildStatus;
 use crate::{PgDbClient, TeamApiClient};
 
-pub async fn refresh_repository<Client: RepositoryClient>(
-    repo: Arc<RepositoryState<Client>>,
+pub async fn refresh_repository(
+    repo: Arc<RepositoryState>,
     db: Arc<PgDbClient>,
     team_api_client: &TeamApiClient,
 ) -> anyhow::Result<()> {
@@ -28,10 +28,7 @@ pub async fn refresh_repository<Client: RepositoryClient>(
     }
 }
 
-async fn cancel_timed_out_builds<Client: RepositoryClient>(
-    repo: &RepositoryState<Client>,
-    db: &PgDbClient,
-) -> anyhow::Result<()> {
+async fn cancel_timed_out_builds(repo: &RepositoryState, db: &PgDbClient) -> anyhow::Result<()> {
     let running_builds = db.get_running_builds(&repo.repository).await?;
     tracing::info!("Found {} running build(s)", running_builds.len());
 
@@ -65,8 +62,8 @@ async fn cancel_timed_out_builds<Client: RepositoryClient>(
     Ok(())
 }
 
-async fn reload_permission<Client: RepositoryClient>(
-    repo: &RepositoryState<Client>,
+async fn reload_permission(
+    repo: &RepositoryState,
     team_api_client: &TeamApiClient,
 ) -> anyhow::Result<()> {
     let permissions = team_api_client
@@ -82,9 +79,7 @@ async fn reload_permission<Client: RepositoryClient>(
     Ok(())
 }
 
-async fn reload_config<Client: RepositoryClient>(
-    repo: &RepositoryState<Client>,
-) -> anyhow::Result<()> {
+async fn reload_config(repo: &RepositoryState) -> anyhow::Result<()> {
     let config = repo.client.load_config().await?;
     repo.config.store(Arc::new(config));
     Ok(())

src/bors/handlers/trybuild.rs

@@ -5,7 +5,6 @@ use anyhow::{anyhow, Context};
 use crate::bors::command::Parent;
 use crate::bors::handlers::labels::handle_label_trigger;
 use crate::bors::Comment;
-use crate::bors::RepositoryClient;
 use crate::bors::RepositoryState;
 use crate::database::RunId;
 use crate::database::{BuildModel, BuildStatus, PullRequestModel, WorkflowStatus, WorkflowType};
@@ -29,8 +28,8 @@ pub(super) const TRY_BRANCH_NAME: &str = "automation/bors/try";
 ///
 /// If `parent` is set, it will use it as a base commit for the merge.
 /// Otherwise, it will use the latest commit on the main repository branch.
-pub(super) async fn command_try_build<Client: RepositoryClient>(
-    repo: Arc<RepositoryState<Client>>,
+pub(super) async fn command_try_build(
+    repo: Arc<RepositoryState>,
     db: Arc<PgDbClient>,
     pr: &PullRequest,
     author: &GithubUser,
@@ -140,8 +139,8 @@ pub(super) async fn command_try_build<Client: RepositoryClient>(
     }
 }
 
-pub(super) async fn command_try_cancel<Client: RepositoryClient>(
-    repo: Arc<RepositoryState<Client>>,
+pub(super) async fn command_try_cancel(
+    repo: Arc<RepositoryState>,
     db: Arc<PgDbClient>,
     pr: &PullRequest,
     author: &GithubUser,
@@ -209,8 +208,8 @@ Cancelled workflows:"#
     Ok(())
 }
 
-pub async fn cancel_build_workflows<Client: RepositoryClient>(
-    repo: &RepositoryState<Client>,
+pub async fn cancel_build_workflows(
+    repo: &RepositoryState,
     db: &PgDbClient,
     build: &BuildModel,
 ) -> anyhow::Result<Vec<RunId>> {
@@ -285,8 +284,8 @@ handled during merge and rebase. This is normal, and you should still perform st
     )
 }
 
-async fn check_try_permissions<Client: RepositoryClient>(
-    repo: &RepositoryState<Client>,
+async fn check_try_permissions(
+    repo: &RepositoryState,
     pr: &PullRequest,
     author: &GithubUser,
 ) -> anyhow::Result<bool> {

src/bors/handlers/workflow.rs

@@ -4,8 +4,8 @@ use crate::bors::comment::try_build_succeeded_comment;
 use crate::bors::event::{CheckSuiteCompleted, WorkflowCompleted, WorkflowStarted};
 use crate::bors::handlers::is_bors_observed_branch;
 use crate::bors::handlers::labels::handle_label_trigger;
+use crate::bors::RepositoryState;
 use crate::bors::{CheckSuiteStatus, Comment};
-use crate::bors::{RepositoryClient, RepositoryState};
 use crate::database::{BuildStatus, WorkflowStatus};
 use crate::github::LabelTrigger;
 use crate::PgDbClient;
@@ -58,8 +58,8 @@ pub(super) async fn handle_workflow_started(
     Ok(())
 }
 
-pub(super) async fn handle_workflow_completed<Client: RepositoryClient>(
-    repo: Arc<RepositoryState<Client>>,
+pub(super) async fn handle_workflow_completed(
+    repo: Arc<RepositoryState>,
     db: Arc<PgDbClient>,
     payload: WorkflowCompleted,
 ) -> anyhow::Result<()> {
@@ -80,8 +80,8 @@ pub(super) async fn handle_workflow_completed<Client: RepositoryClient>(
     try_complete_build(repo.as_ref(), db.as_ref(), event).await
 }
 
-pub(super) async fn handle_check_suite_completed<Client: RepositoryClient>(
-    repo: Arc<RepositoryState<Client>>,
+pub(super) async fn handle_check_suite_completed(
+    repo: Arc<RepositoryState>,
     db: Arc<PgDbClient>,
     payload: CheckSuiteCompleted,
 ) -> anyhow::Result<()> {
@@ -98,8 +98,8 @@ pub(super) async fn handle_check_suite_completed<Client: RepositoryClient>(
 }
 
 /// Try to complete a pending build.
-async fn try_complete_build<Client: RepositoryClient>(
-    repo: &RepositoryState<Client>,
+async fn try_complete_build(
+    repo: &RepositoryState,
     db: &PgDbClient,
     payload: CheckSuiteCompleted,
 ) -> anyhow::Result<()> {