Merge pull request #2626 from b-zee/refactor-remove-discord-owner

refactor(node): remove --owner (discord) flag
maidsafe · Jan 14, 2025 · 225a5ed · 225a5ed
2 parents 98bc1b3 + 95f2949
commit 225a5ed
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 549 deletions.
diff --git a/ant-node-manager/src/add_services/config.rs b/ant-node-manager/src/add_services/config.rs
@@ -85,7 +85,6 @@ pub struct InstallNodeServiceCtxBuilder {
     pub metrics_port: Option<u16>,
     pub node_ip: Option<Ipv4Addr>,
     pub node_port: Option<u16>,
-    pub owner: Option<String>,
     pub peers_args: PeersArgs,
     pub rewards_address: RewardsAddress,
     pub rpc_socket_addr: SocketAddr,
@@ -132,10 +131,6 @@ impl InstallNodeServiceCtxBuilder {
             args.push(OsString::from("--metrics-server-port"));
             args.push(OsString::from(metrics_port.to_string()));
         }
-        if let Some(owner) = self.owner {
-            args.push(OsString::from("--owner"));
-            args.push(OsString::from(owner));
-        }
         if let Some(log_files) = self.max_archived_log_files {
             args.push(OsString::from("--max-archived-log-files"));
             args.push(OsString::from(log_files.to_string()));
@@ -193,7 +188,6 @@ pub struct AddNodeServiceOptions {
     pub network_id: Option<u8>,
     pub node_ip: Option<Ipv4Addr>,
     pub node_port: Option<PortRange>,
-    pub owner: Option<String>,
     pub peers_args: PeersArgs,
     pub rewards_address: RewardsAddress,
     pub rpc_address: Option<Ipv4Addr>,
@@ -327,7 +321,6 @@ mod tests {
             network_id: None,
             node_ip: None,
             node_port: None,
-            owner: None,
             peers_args: PeersArgs::default(),
             rewards_address: RewardsAddress::from_str("0x03B770D9cD32077cC0bF330c13C114a87643B124")
                 .unwrap(),
@@ -363,7 +356,6 @@ mod tests {
             network_id: None,
             node_ip: None,
             node_port: None,
-            owner: None,
             peers_args: PeersArgs::default(),
             rewards_address: RewardsAddress::from_str("0x03B770D9cD32077cC0bF330c13C114a87643B124")
                 .unwrap(),
@@ -400,7 +392,6 @@ mod tests {
             network_id: Some(5),
             node_ip: None,
             node_port: None,
-            owner: None,
             peers_args: PeersArgs::default(),
             rewards_address: RewardsAddress::from_str("0x03B770D9cD32077cC0bF330c13C114a87643B124")
                 .unwrap(),
@@ -490,7 +481,6 @@ mod tests {
         builder.node_ip = Some(Ipv4Addr::new(192, 168, 1, 1));
         builder.node_port = Some(12345);
         builder.metrics_port = Some(9090);
-        builder.owner = Some("test-owner".to_string());
         builder.peers_args.addrs = vec![
             "/ip4/127.0.0.1/tcp/8080".parse().unwrap(),
             "/ip4/192.168.1.1/tcp/8081".parse().unwrap(),
@@ -531,8 +521,6 @@ mod tests {
             "12345",
             "--metrics-server-port",
             "9090",
-            "--owner",
-            "test-owner",
             "--max-archived-log-files",
             "10",
             "--max-log-files",

diff --git a/ant-node-manager/src/add_services/mod.rs b/ant-node-manager/src/add_services/mod.rs
@@ -78,16 +78,6 @@ pub async fn add_node(
         check_port_availability(port_option, &node_registry.nodes)?;
     }
 
-    let owner = match &options.owner {
-        Some(owner) => {
-            if owner.chars().any(|c| c.is_uppercase()) {
-                warn!("Owner name ({owner}) contains uppercase characters and will be converted to lowercase");
-            }
-            Some(owner.to_lowercase())
-        }
-        None => None,
-    };
-
     let antnode_file_name = options
         .antnode_src_path
         .file_name()
@@ -213,7 +203,6 @@ pub async fn add_node(
             network_id: options.network_id,
             node_ip: options.node_ip,
             node_port,
-            owner: owner.clone(),
             peers_args: options.peers_args.clone(),
             rewards_address: options.rewards_address,
             rpc_socket_addr,
@@ -254,7 +243,6 @@ pub async fn add_node(
                     rewards_address: options.rewards_address,
                     reward_balance: None,
                     rpc_socket_addr,
-                    owner: owner.clone(),
                     peer_id: None,
                     peers_args: options.peers_args.clone(),
                     pid: None,