WIP: cli: ???

crates/repo-actor/src/tests.rs

@@ -716,7 +716,7 @@ pub mod given {
     pub fn a_git_dir(fs: &kxio::fs::FileSystem) -> GitDir {
         let dir_name = a_name();
         let dir = fs.base().join(dir_name);
-        GitDir::new(&dir)
+        GitDir::new(dir)
     }
 
     pub fn a_forge_config() -> ForgeConfig {
@@ -730,9 +730,9 @@ pub mod given {
     }
 
     pub fn a_server_repo_config() -> ServerRepoConfig {
-        let main = a_branch_name().into_string();
+        let main = a_branch_name().to_string();
-        let next = a_branch_name().into_string();
+        let next = a_branch_name().to_string();
-        let dev = a_branch_name().into_string();
+        let dev = a_branch_name().to_string();
         ServerRepoConfig::new(
             format!("{}/{}", a_name(), a_name()),
             main.clone(),

crates/server/src/actors/server.rs

@@ -101,19 +101,13 @@ impl Handler<ServerConfig> for Server {
 
         // Forge Actors
         for (forge_alias, forge_config) in server_config.forges() {
-            self.create_forge_repos(
+            self.create_forge_repos(forge_config, forge_alias.clone(), server_storage, webhook)
-                forge_config,
+                .into_iter()
-                forge_alias.clone(),
+                .map(|a| self.start_actor(a))
-                server_storage,
+                .map(|(repo_alias, addr)| {
-                webhook,
+                    AddWebhookRecipient::new(forge_alias.clone(), repo_alias, addr.recipient())
-                self.sleep_duration,
+                })
-            )
+                .for_each(|msg| webhook_router.do_send(msg));
-            .into_iter()
-            .map(|a| self.start_actor(a))
-            .map(|(repo_alias, addr)| {
-                AddWebhookRecipient::new(forge_alias.clone(), repo_alias, addr.recipient())
-            })
-            .for_each(|msg| webhook_router.do_send(msg));
         }
 
         let webhook = WebhookActor::new(socket_addr, webhook_router.recipient()).start();
@@ -164,7 +158,6 @@ impl Server {
         forge_name: ForgeAlias,
         server_storage: &ServerStorage,
         webhook: &Webhook,
-        sleep_duration: std::time::Duration,
     ) -> Vec<(ForgeAlias, RepoAlias, repo_actor::RepoActor)> {
         let span =
             tracing::info_span!("create_forge_repos", name = %forge_name, config = %forge_config);
@@ -172,13 +165,7 @@ impl Server {
         let _guard = span.enter();
         info!("Creating Forge");
         let mut repos = vec![];
-        let creator = self.create_actor(
+        let creator = self.create_actor(forge_name, forge_config.clone(), server_storage, webhook);
-            forge_name,
-            forge_config.clone(),
-            server_storage,
-            webhook,
-            sleep_duration,
-        );
         for (repo_alias, server_repo_config) in forge_config.repos() {
             let forge_repo = creator((repo_alias, server_repo_config));
             info!(
@@ -196,7 +183,6 @@ impl Server {
         forge_config: ForgeConfig,
         server_storage: &ServerStorage,
         webhook: &Webhook,
-        sleep_duration: std::time::Duration,
     ) -> impl Fn((RepoAlias, &ServerRepoConfig)) -> (ForgeAlias, RepoAlias, repo_actor::RepoActor)
     {
         let server_storage = server_storage.clone();
@@ -204,6 +190,7 @@ impl Server {
         let net = self.net.clone();
         let repo = self.repo.clone();
         let generation = self.generation;
+        let sleep_duration = self.sleep_duration;
         move |(repo_alias, server_repo_config)| {
             let span = tracing::info_span!("create_actor", alias = %repo_alias, config = %server_repo_config);
             let _guard = span.enter();