diff --git a/ant-logging/README.md b/ant-logging/README.md index 92744390c8..28343d7e64 100644 --- a/ant-logging/README.md +++ b/ant-logging/README.md @@ -1,5 +1,5 @@ # ant_logging -Logging utilities for the `safe_network` repository. +Logging utilities for the `autonomi` repository. We define a logging approach that can be used across multiple crates or binaries. diff --git a/ant-node-manager/src/add_services/tests.rs b/ant-node-manager/src/add_services/tests.rs index bda83cd3fe..8a413a331e 100644 --- a/ant-node-manager/src/add_services/tests.rs +++ b/ant-node-manager/src/add_services/tests.rs @@ -296,7 +296,7 @@ async fn add_genesis_node_should_return_an_error_if_there_is_already_a_genesis_n antnode_path: PathBuf::from("/var/antctl/services/antnode1/antnode"), service_name: "antnode1".to_string(), upnp: false, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, version: latest_version.to_string(), }], @@ -1103,7 +1103,7 @@ async fn add_new_node_should_add_another_service() -> Result<()> { service_name: "antnode1".to_string(), status: ServiceStatus::Added, upnp: false, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, version: latest_version.to_string(), }], @@ -1831,7 +1831,7 @@ async fn add_node_should_return_an_error_if_duplicate_custom_port_is_used() -> R service_name: "antnode1".to_string(), status: ServiceStatus::Added, upnp: false, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, version: "0.98.1".to_string(), }], @@ -1952,7 +1952,7 @@ async fn add_node_should_return_an_error_if_duplicate_custom_port_in_range_is_us service_name: "antnode1".to_string(), status: ServiceStatus::Added, upnp: false, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, version: "0.98.1".to_string(), }], @@ -2923,7 +2923,7 @@ async fn add_node_should_return_an_error_if_duplicate_custom_metrics_port_is_use service_name: "antnode1".to_string(), status: ServiceStatus::Added, upnp: false, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, version: "0.98.1".to_string(), }], @@ -3045,7 +3045,7 @@ async fn add_node_should_return_an_error_if_duplicate_custom_metrics_port_in_ran service_name: "antnode1".to_string(), status: ServiceStatus::Added, upnp: false, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, version: "0.98.1".to_string(), }], @@ -3414,7 +3414,7 @@ async fn add_node_should_return_an_error_if_duplicate_custom_rpc_port_is_used() service_name: "antnode1".to_string(), status: ServiceStatus::Added, upnp: false, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, version: "0.98.1".to_string(), }], @@ -3536,7 +3536,7 @@ async fn add_node_should_return_an_error_if_duplicate_custom_rpc_port_in_range_i service_name: "antnode1".to_string(), status: ServiceStatus::Added, upnp: false, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, version: "0.98.1".to_string(), }], @@ -4210,7 +4210,7 @@ async fn add_auditor_should_return_an_error_if_a_auditor_service_was_already_cre pid: Some(1000), service_name: "auditor".to_string(), status: ServiceStatus::Running, - user: "safe".to_string(), + user: "ant".to_string(), version: latest_version.to_string(), }), faucet: None, @@ -4453,7 +4453,7 @@ async fn add_faucet_should_return_an_error_if_a_faucet_service_was_already_creat pid: Some(1000), service_name: "faucet".to_string(), status: ServiceStatus::Running, - user: "safe".to_string(), + user: "ant".to_string(), version: latest_version.to_string(), }), environment_variables: None, diff --git a/ant-node-manager/src/bin/cli/main.rs b/ant-node-manager/src/bin/cli/main.rs index 449bcbd36c..1e40d20589 100644 --- a/ant-node-manager/src/bin/cli/main.rs +++ b/ant-node-manager/src/bin/cli/main.rs @@ -1411,14 +1411,14 @@ async fn configure_winsw(verbosity: VerbosityLevel) -> Result<()> { use ant_node_manager::config::get_node_manager_path; // If the node manager was installed using `safeup`, it would have put the winsw.exe binary at - // `C:\Users\\safe\winsw.exe`, sitting it alongside the other safe-related binaries. + // `C:\Users\\autonomi\winsw.exe`, sitting it alongside the other safe-related binaries. // // However, if the node manager has been obtained by other means, we can put winsw.exe // alongside the directory where the services are defined. This prevents creation of what would - // seem like a random `safe` directory in the user's home directory. + // seem like a random `autonomi` directory in the user's home directory. let safeup_winsw_path = dirs_next::home_dir() .ok_or_else(|| eyre!("Could not obtain user home directory"))? - .join("safe") + .join("autonomi") .join("winsw.exe"); if safeup_winsw_path.exists() { ant_node_manager::helpers::configure_winsw(&safeup_winsw_path, verbosity).await?; diff --git a/ant-node-manager/src/cmd/daemon.rs b/ant-node-manager/src/cmd/daemon.rs index 4cd5eb9e17..e0ae05c677 100644 --- a/ant-node-manager/src/cmd/daemon.rs +++ b/ant-node-manager/src/cmd/daemon.rs @@ -38,7 +38,7 @@ pub async fn add( print_banner("Add Daemon Service"); } - let service_user = "safe"; + let service_user = "ant"; let service_manager = ServiceController {}; debug!("Trying to create service user '{service_user}' for the daemon"); service_manager.create_service_user(service_user)?; diff --git a/ant-node-manager/src/cmd/node.rs b/ant-node-manager/src/cmd/node.rs index 8a1b39c0ba..59a04ddc11 100644 --- a/ant-node-manager/src/cmd/node.rs +++ b/ant-node-manager/src/cmd/node.rs @@ -75,7 +75,7 @@ pub async fn add( let service_user = if user_mode { None } else { - let service_user = user.unwrap_or_else(|| "safe".to_string()); + let service_user = user.unwrap_or_else(|| "ant".to_string()); service_manager.create_service_user(&service_user)?; Some(service_user) }; diff --git a/ant-node-manager/src/lib.rs b/ant-node-manager/src/lib.rs index 59552b995c..696eb93463 100644 --- a/ant-node-manager/src/lib.rs +++ b/ant-node-manager/src/lib.rs @@ -783,7 +783,7 @@ mod tests { service_name: "antnode1".to_string(), status: ServiceStatus::Added, upnp: false, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, version: "0.98.1".to_string(), }; @@ -899,7 +899,7 @@ mod tests { service_name: "antnode1".to_string(), status: ServiceStatus::Stopped, upnp: false, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, version: "0.98.1".to_string(), }; @@ -978,7 +978,7 @@ mod tests { service_name: "antnode1".to_string(), status: ServiceStatus::Running, upnp: false, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, version: "0.98.1".to_string(), }; @@ -1097,7 +1097,7 @@ mod tests { service_name: "antnode1".to_string(), status: ServiceStatus::Running, upnp: false, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, version: "0.98.1".to_string(), }; @@ -1187,7 +1187,7 @@ mod tests { service_name: "antnode1".to_string(), status: ServiceStatus::Added, upnp: false, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, version: "0.98.1".to_string(), }; @@ -1289,7 +1289,7 @@ mod tests { service_name: "antnode1".to_string(), status: ServiceStatus::Added, upnp: false, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: true, version: "0.98.1".to_string(), }; @@ -1390,7 +1390,7 @@ mod tests { service_name: "antnode1".to_string(), status: ServiceStatus::Added, upnp: false, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, version: "0.98.1".to_string(), }; @@ -1463,7 +1463,7 @@ mod tests { service_name: "antnode1".to_string(), status: ServiceStatus::Running, upnp: false, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, version: "0.98.1".to_string(), }; @@ -1524,7 +1524,7 @@ mod tests { service_name: "antnode1".to_string(), status: ServiceStatus::Added, upnp: false, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, version: "0.98.1".to_string(), }; @@ -1587,7 +1587,7 @@ mod tests { service_name: "antnode1".to_string(), status: ServiceStatus::Stopped, upnp: false, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, version: "0.98.1".to_string(), }; @@ -1649,7 +1649,7 @@ mod tests { service_name: "antnode1".to_string(), status: ServiceStatus::Removed, upnp: false, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, version: "0.98.1".to_string(), }; @@ -1866,7 +1866,7 @@ mod tests { service_name: "antnode1".to_string(), status: ServiceStatus::Running, upnp: false, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, version: current_version.to_string(), }; @@ -1968,7 +1968,7 @@ mod tests { service_name: "antnode1".to_string(), status: ServiceStatus::Running, upnp: false, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, version: current_version.to_string(), }; @@ -2115,7 +2115,7 @@ mod tests { service_name: "antnode1".to_string(), status: ServiceStatus::Running, upnp: false, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, version: current_version.to_string(), }; @@ -2274,7 +2274,7 @@ mod tests { service_name: "antnode1".to_string(), status: ServiceStatus::Running, upnp: false, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, version: current_version.to_string(), }; @@ -2428,7 +2428,7 @@ mod tests { service_name: "antnode1".to_string(), status: ServiceStatus::Running, upnp: false, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, version: current_version.to_string(), }; @@ -2686,7 +2686,7 @@ mod tests { environment: None, label: "antnode1".parse()?, program: current_node_bin.to_path_buf(), - username: Some("safe".to_string()), + username: Some("ant".to_string()), working_directory: None, }), eq(false), @@ -2763,7 +2763,7 @@ mod tests { service_name: "antnode1".to_string(), status: ServiceStatus::Running, upnp: true, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, version: current_version.to_string(), }; @@ -2849,7 +2849,7 @@ mod tests { environment: None, label: "antnode1".parse()?, program: current_node_bin.to_path_buf(), - username: Some("safe".to_string()), + username: Some("ant".to_string()), working_directory: None, }), eq(false), @@ -2926,7 +2926,7 @@ mod tests { service_name: "antnode1".to_string(), status: ServiceStatus::Running, upnp: false, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, version: current_version.to_string(), }; @@ -3015,7 +3015,7 @@ mod tests { environment: None, label: "antnode1".parse()?, program: current_node_bin.to_path_buf(), - username: Some("safe".to_string()), + username: Some("ant".to_string()), working_directory: None, }), eq(false), @@ -3092,7 +3092,7 @@ mod tests { service_name: "antnode1".to_string(), status: ServiceStatus::Running, upnp: false, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, version: current_version.to_string(), }; @@ -3178,7 +3178,7 @@ mod tests { environment: None, label: "antnode1".parse()?, program: current_node_bin.to_path_buf(), - username: Some("safe".to_string()), + username: Some("ant".to_string()), working_directory: None, }), eq(false), @@ -3255,7 +3255,7 @@ mod tests { service_name: "antnode1".to_string(), status: ServiceStatus::Running, upnp: false, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, version: current_version.to_string(), }; @@ -3344,7 +3344,7 @@ mod tests { environment: None, label: "antnode1".parse()?, program: current_node_bin.to_path_buf(), - username: Some("safe".to_string()), + username: Some("ant".to_string()), working_directory: None, }), eq(false), @@ -3421,7 +3421,7 @@ mod tests { service_name: "antnode1".to_string(), status: ServiceStatus::Running, upnp: false, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, version: current_version.to_string(), }; @@ -3507,7 +3507,7 @@ mod tests { environment: None, label: "antnode1".parse()?, program: current_node_bin.to_path_buf(), - username: Some("safe".to_string()), + username: Some("ant".to_string()), working_directory: None, }), eq(false), @@ -3580,7 +3580,7 @@ mod tests { service_name: "antnode1".to_string(), status: ServiceStatus::Running, upnp: false, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, version: current_version.to_string(), evm_network: EvmNetwork::ArbitrumOne, @@ -3673,7 +3673,7 @@ mod tests { environment: None, label: "antnode1".parse()?, program: current_node_bin.to_path_buf(), - username: Some("safe".to_string()), + username: Some("ant".to_string()), working_directory: None, }), eq(false), @@ -3746,7 +3746,7 @@ mod tests { service_name: "antnode1".to_string(), status: ServiceStatus::Running, upnp: false, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, version: current_version.to_string(), evm_network: EvmNetwork::ArbitrumOne, @@ -3836,7 +3836,7 @@ mod tests { environment: None, label: "antnode1".parse()?, program: current_node_bin.to_path_buf(), - username: Some("safe".to_string()), + username: Some("ant".to_string()), working_directory: None, }), eq(false), @@ -3913,7 +3913,7 @@ mod tests { service_name: "antnode1".to_string(), status: ServiceStatus::Running, upnp: false, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, version: current_version.to_string(), }; @@ -4002,7 +4002,7 @@ mod tests { environment: None, label: "antnode1".parse()?, program: current_node_bin.to_path_buf(), - username: Some("safe".to_string()), + username: Some("ant".to_string()), working_directory: None, }), eq(false), @@ -4079,7 +4079,7 @@ mod tests { service_name: "antnode1".to_string(), status: ServiceStatus::Running, upnp: false, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, version: current_version.to_string(), }; @@ -4168,7 +4168,7 @@ mod tests { environment: None, label: "antnode1".parse()?, program: current_node_bin.to_path_buf(), - username: Some("safe".to_string()), + username: Some("ant".to_string()), working_directory: None, }), eq(false), @@ -4245,7 +4245,7 @@ mod tests { service_name: "antnode1".to_string(), status: ServiceStatus::Running, upnp: false, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, version: current_version.to_string(), }; @@ -4334,7 +4334,7 @@ mod tests { environment: None, label: "antnode1".parse()?, program: current_node_bin.to_path_buf(), - username: Some("safe".to_string()), + username: Some("ant".to_string()), working_directory: None, }), eq(false), @@ -4411,7 +4411,7 @@ mod tests { service_name: "antnode1".to_string(), status: ServiceStatus::Running, upnp: false, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, version: current_version.to_string(), }; @@ -4503,7 +4503,7 @@ mod tests { environment: None, label: "antnode1".parse()?, program: current_node_bin.to_path_buf(), - username: Some("safe".to_string()), + username: Some("ant".to_string()), working_directory: None, }), eq(false), @@ -4589,7 +4589,7 @@ mod tests { service_name: "antnode1".to_string(), status: ServiceStatus::Running, upnp: false, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, version: current_version.to_string(), }; @@ -4681,7 +4681,7 @@ mod tests { environment: None, label: "antnode1".parse()?, program: current_node_bin.to_path_buf(), - username: Some("safe".to_string()), + username: Some("ant".to_string()), working_directory: None, }), eq(false), @@ -4767,7 +4767,7 @@ mod tests { service_name: "antnode1".to_string(), status: ServiceStatus::Running, upnp: false, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, version: current_version.to_string(), }; @@ -4852,7 +4852,7 @@ mod tests { environment: None, label: "antnode1".parse()?, program: current_node_bin.to_path_buf(), - username: Some("safe".to_string()), + username: Some("ant".to_string()), working_directory: None, }), eq(false), @@ -4932,7 +4932,7 @@ mod tests { service_name: "antnode1".to_string(), status: ServiceStatus::Running, upnp: true, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, version: current_version.to_string(), }; @@ -5017,7 +5017,7 @@ mod tests { service_name: "antnode1".to_string(), version: "0.98.1".to_string(), upnp: false, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, }; let service = NodeService::new(&mut service_data, Box::new(MockRpcClient::new())); @@ -5087,7 +5087,7 @@ mod tests { service_name: "antnode1".to_string(), status: ServiceStatus::Running, upnp: false, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, version: "0.98.1".to_string(), }; @@ -5171,7 +5171,7 @@ mod tests { service_name: "antnode1".to_string(), status: ServiceStatus::Running, upnp: false, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, version: "0.98.1".to_string(), }; @@ -5248,7 +5248,7 @@ mod tests { service_name: "antnode1".to_string(), status: ServiceStatus::Stopped, upnp: false, - user: Some("safe".to_string()), + user: Some("ant".to_string()), user_mode: false, version: "0.98.1".to_string(), }; diff --git a/resources/scripts/find_prs.py b/resources/scripts/find_prs.py index dbfc3e8c03..e95ba7e09e 100755 --- a/resources/scripts/find_prs.py +++ b/resources/scripts/find_prs.py @@ -9,7 +9,7 @@ class GitHubPRFinder: def __init__(self, token: str): self.owner = "maidsafe" - self.repo = "safe_network" + self.repo = "autonomi" self.token = token self.api_url = f"https://api.github.com/repos/{self.owner}/{self.repo}/commits" @@ -129,4 +129,4 @@ def main(): print(entry) if __name__ == "__main__": - main() \ No newline at end of file + main()