Feat/remove signer 1

src/lib.rs

@@ -221,13 +221,6 @@ impl StacksDevnetApiK8sManager {
         )
         .await?;
 
-        self.deploy_stacks_signer(
-            &config,
-            SignerIdx::Signer1,
-            "530d9f61984c888536871c6573073bdfc0058896dc1adfe9a6a10dfacadc209101",
-        )
-        .await?;
-
         if !config.disable_stacks_api {
             self.deploy_stacks_blockchain_api(&config).await?;
         }
@@ -1316,11 +1309,6 @@ impl StacksDevnetApiK8sManager {
                         get_service_port(StacksDevnetService::StacksSigner0, ServicePort::Event)
                             .unwrap(),
                     ),
-                    SignerIdx::Signer1 => (
-                        get_service_url(namespace, StacksDevnetService::StacksSigner1),
-                        get_service_port(StacksDevnetService::StacksSigner1, ServicePort::Event)
-                            .unwrap(),
-                    ),
                 };
 
                 stacks_conf.push_str(&format!(
@@ -1478,24 +1466,18 @@ impl StacksDevnetApiK8sManager {
             SignerIdx::Signer0 => {
                 get_service_port(StacksDevnetService::StacksSigner0, ServicePort::Event).unwrap()
             }
-            SignerIdx::Signer1 => {
-                get_service_port(StacksDevnetService::StacksSigner1, ServicePort::Event).unwrap()
-            }
         };
 
         let configmap = match signer_idx {
             SignerIdx::Signer0 => StacksDevnetConfigmap::StacksSigner0,
-            SignerIdx::Signer1 => StacksDevnetConfigmap::StacksSigner1,
         };
 
         let sts = match signer_idx {
             SignerIdx::Signer0 => StacksDevnetStatefulSet::StacksSigner0,
-            SignerIdx::Signer1 => StacksDevnetStatefulSet::StacksSigner1,
         };
 
         let service = match signer_idx {
             SignerIdx::Signer0 => StacksDevnetService::StacksSigner0,
-            SignerIdx::Signer1 => StacksDevnetService::StacksSigner1,
         };
 
         // configmap env vars for api conatainer

src/resources/configmap.rs

@@ -8,7 +8,6 @@ pub enum StacksDevnetConfigmap {
     StacksBlockchainApi,
     StacksBlockchainApiPg,
     StacksSigner0,
-    StacksSigner1,
     DeploymentPlan,
     Devnet,
     ProjectDir,
@@ -23,7 +22,6 @@ impl fmt::Display for StacksDevnetConfigmap {
             StacksDevnetConfigmap::StacksBlockchainApi => write!(f, "stacks-blockchain-api"),
             StacksDevnetConfigmap::StacksBlockchainApiPg => write!(f, "stacks-blockchain-api-pg"),
             StacksDevnetConfigmap::StacksSigner0 => write!(f, "stacks-signer-0"),
-            StacksDevnetConfigmap::StacksSigner1 => write!(f, "stacks-signer-1"),
             StacksDevnetConfigmap::DeploymentPlan => write!(f, "deployment-plan"),
             StacksDevnetConfigmap::Devnet => write!(f, "devnet"),
             StacksDevnetConfigmap::ProjectDir => write!(f, "project-dir"),

src/resources/pod.rs

@@ -7,7 +7,6 @@ pub enum StacksDevnetPod {
     StacksBlockchain,
     StacksBlockchainApi,
     StacksSigner0,
-    StacksSigner1,
 }
 
 impl fmt::Display for StacksDevnetPod {
@@ -17,7 +16,6 @@ impl fmt::Display for StacksDevnetPod {
             StacksDevnetPod::StacksBlockchain => write!(f, "stacks-blockchain"),
             StacksDevnetPod::StacksBlockchainApi => write!(f, "stacks-blockchain-api"),
             StacksDevnetPod::StacksSigner0 => write!(f, "stacks-signer-0"),
-            StacksDevnetPod::StacksSigner1 => write!(f, "stacks-signer-1"),
         }
     }
 }

src/resources/pvc.rs

@@ -5,15 +5,13 @@ use strum::EnumIter;
 pub enum StacksDevnetPvc {
     StacksBlockchainApiPg,
     StacksSigner0,
-    StacksSigner1,
 }
 
 impl fmt::Display for StacksDevnetPvc {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
             StacksDevnetPvc::StacksBlockchainApiPg => write!(f, "stacks-blockchain-api"),
             StacksDevnetPvc::StacksSigner0 => write!(f, "stacks-signer-0"),
-            StacksDevnetPvc::StacksSigner1 => write!(f, "stacks-signer-1"),
         }
     }
 }

src/resources/service.rs

@@ -7,7 +7,6 @@ pub enum StacksDevnetService {
     StacksBlockchain,
     StacksBlockchainApi,
     StacksSigner0,
-    StacksSigner1,
 }
 
 pub enum ServicePort {
@@ -27,7 +26,6 @@ impl fmt::Display for StacksDevnetService {
             StacksDevnetService::StacksBlockchain => write!(f, "stacks-blockchain"),
             StacksDevnetService::StacksBlockchainApi => write!(f, "stacks-blockchain-api"),
             StacksDevnetService::StacksSigner0 => write!(f, "stacks-signer-0"),
-            StacksDevnetService::StacksSigner1 => write!(f, "stacks-signer-1"),
         }
     }
 }
@@ -43,10 +41,7 @@ pub fn get_service_port(service: StacksDevnetService, port_type: ServicePort) ->
         (StacksDevnetService::StacksBlockchainApi, ServicePort::API) => Some("3999".into()),
         (StacksDevnetService::StacksBlockchainApi, ServicePort::Event) => Some("3700".into()),
         (StacksDevnetService::StacksBlockchainApi, ServicePort::DB) => Some("5432".into()),
-        (
-            StacksDevnetService::StacksSigner0 | StacksDevnetService::StacksSigner1,
-            ServicePort::Event,
-        ) => Some("30001".into()),
+        (StacksDevnetService::StacksSigner0, ServicePort::Event) => Some("30001".into()),
         (_, _) => None,
     }
 }
@@ -57,7 +52,7 @@ pub fn get_user_facing_port(service: StacksDevnetService) -> Option<String> {
             get_service_port(service, ServicePort::RPC)
         }
         StacksDevnetService::StacksBlockchainApi => get_service_port(service, ServicePort::API),
-        StacksDevnetService::StacksSigner0 | StacksDevnetService::StacksSigner1 => None,
+        StacksDevnetService::StacksSigner0 => None,
     }
 }
 
@@ -71,7 +66,6 @@ pub fn get_service_from_path_part(path_part: &str) -> Option<StacksDevnetService
         "stacks-blockchain" => Some(StacksDevnetService::StacksBlockchain),
         "stacks-blockchain-api" => Some(StacksDevnetService::StacksBlockchainApi),
         "stacks-signer-0" => Some(StacksDevnetService::StacksSigner0),
-        "stacks-signer-1" => Some(StacksDevnetService::StacksSigner1),
         _ => None,
     }
 }

src/resources/stateful_set.rs

@@ -5,30 +5,26 @@ use strum::EnumIter;
 pub enum StacksDevnetStatefulSet {
     StacksBlockchainApi,
     StacksSigner0,
-    StacksSigner1,
 }
 
 impl fmt::Display for StacksDevnetStatefulSet {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
             StacksDevnetStatefulSet::StacksBlockchainApi => write!(f, "stacks-blockchain-api"),
             StacksDevnetStatefulSet::StacksSigner0 => write!(f, "stacks-signer-0"),
-            StacksDevnetStatefulSet::StacksSigner1 => write!(f, "stacks-signer-1"),
         }
     }
 }
 
 #[derive(EnumIter, Debug, Clone)]
 pub enum SignerIdx {
     Signer0,
-    Signer1,
 }
 
 impl fmt::Display for SignerIdx {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             SignerIdx::Signer0 => write!(f, "0"),
-            SignerIdx::Signer1 => write!(f, "1"),
         }
     }
 }

src/resources/tests.rs

@@ -11,7 +11,6 @@ use test_case::test_case;
 #[test_case(StacksDevnetConfigmap::StacksBlockchainApi => is equal_to "stacks-blockchain-api"; "for StacksBlockchainApi")]
 #[test_case(StacksDevnetConfigmap::StacksBlockchainApiPg => is equal_to "stacks-blockchain-api-pg"; "for StacksBlockchainApiPg")]
 #[test_case(StacksDevnetConfigmap::StacksSigner0 => is equal_to "stacks-signer-0"; "for StacksSigner0")]
-#[test_case(StacksDevnetConfigmap::StacksSigner1 => is equal_to "stacks-signer-1"; "for StacksSigner1")]
 #[test_case(StacksDevnetConfigmap::DeploymentPlan => is equal_to "deployment-plan"; "for DeploymentPlan")]
 #[test_case(StacksDevnetConfigmap::Devnet => is equal_to "devnet"; "for Devnet")]
 #[test_case(StacksDevnetConfigmap::ProjectDir => is equal_to "project-dir"; "for ProjectDir")]
@@ -35,7 +34,6 @@ fn it_prints_correct_name_for_deployment(deployment: StacksDevnetDeployment) ->
 
 #[test_case(StacksDevnetStatefulSet::StacksBlockchainApi => is equal_to  "stacks-blockchain-api"; "for StacksBlockchainApi")]
 #[test_case(StacksDevnetStatefulSet::StacksSigner0 => is equal_to  "stacks-signer-0"; "for StacksSigner0")]
-#[test_case(StacksDevnetStatefulSet::StacksSigner1 => is equal_to  "stacks-signer-1"; "for StacksSigner1")]
 fn it_prints_correct_name_for_stateful_set(pod: StacksDevnetStatefulSet) -> String {
     pod.to_string()
 }
@@ -44,7 +42,6 @@ fn it_prints_correct_name_for_stateful_set(pod: StacksDevnetStatefulSet) -> Stri
 #[test_case(StacksDevnetService::StacksBlockchain => is equal_to  "stacks-blockchain"; "for StacksBlockchain")]
 #[test_case(StacksDevnetService::StacksBlockchainApi => is equal_to  "stacks-blockchain-api"; "for StacksBlockchainApi")]
 #[test_case(StacksDevnetService::StacksSigner0 => is equal_to  "stacks-signer-0"; "for StacksSigner0")]
-#[test_case(StacksDevnetService::StacksSigner1 => is equal_to  "stacks-signer-1"; "for StacksSigner1")]
 fn it_prints_correct_name_for_service(service: StacksDevnetService) -> String {
     service.to_string()
 }
@@ -59,7 +56,6 @@ fn it_prints_correct_name_for_service(service: StacksDevnetService) -> String {
 #[test_case(StacksDevnetService::StacksBlockchainApi, ServicePort::Event => is equal_to  Some("3700".to_string()); "for StacksBlockchainApi Event port")]
 #[test_case(StacksDevnetService::StacksBlockchainApi, ServicePort::DB => is equal_to  Some("5432".to_string()); "for StacksBlockchainApi DB port")]
 #[test_case(StacksDevnetService::StacksSigner0, ServicePort::Event => is equal_to  Some("30001".to_string()); "for StacksSigner0 Event port")]
-#[test_case(StacksDevnetService::StacksSigner1, ServicePort::Event => is equal_to  Some("30001".to_string()); "for StacksSigner1 Event port")]
 #[test_case(StacksDevnetService::StacksBlockchainApi, ServicePort::RPC => is equal_to  None; "invalid service port combination")]
 fn it_gets_correct_port_for_service(
     service: StacksDevnetService,
@@ -72,7 +68,6 @@ fn it_gets_correct_port_for_service(
 #[test_case("stacks-blockchain" => is equal_to Some(StacksDevnetService::StacksBlockchain); "for stacks-blockchain")]
 #[test_case("stacks-blockchain-api" => is equal_to Some(StacksDevnetService::StacksBlockchainApi); "for stacks-blockchain-api")]
 #[test_case("stacks-signer-0" => is equal_to Some(StacksDevnetService::StacksSigner0); "for stacks-signer-0")]
-#[test_case("stacks-signer-1" => is equal_to Some(StacksDevnetService::StacksSigner1); "for stacks-signer-1")]
 #[test_case("invalid" => is equal_to None; "returning None for invalid paths")]
 fn it_prints_service_from_path_part(path_part: &str) -> Option<StacksDevnetService> {
     get_service_from_path_part(path_part)
@@ -82,7 +77,6 @@ fn it_prints_service_from_path_part(path_part: &str) -> Option<StacksDevnetServi
 #[test_case(StacksDevnetService::StacksBlockchain => is equal_to Some("20443".to_string()); "for StacksBlockchain")]
 #[test_case(StacksDevnetService::StacksBlockchainApi => is equal_to Some("3999".to_string()); "for StacksBlockchainApi")]
 #[test_case(StacksDevnetService::StacksSigner0 => is equal_to None; "for StacksSigner0")]
-#[test_case(StacksDevnetService::StacksSigner1 => is equal_to None; "for StacksSigner1")]
 fn it_gets_user_facing_port_for_service(service: StacksDevnetService) -> Option<String> {
     get_user_facing_port(service)
 }

src/template_parser.rs

@@ -58,14 +58,5 @@ pub fn get_yaml_from_resource(resource: StacksDevnetResource) -> &'static str {
         StacksDevnetResource::Configmap(StacksDevnetConfigmap::StacksSigner0) => {
             include_str!("../templates/configmaps/stacks-signer-0.template.yaml")
         }
-        StacksDevnetResource::StatefulSet(StacksDevnetStatefulSet::StacksSigner1) => {
-            include_str!("../templates/stateful-sets/stacks-signer-1.template.yaml")
-        }
-        StacksDevnetResource::Service(StacksDevnetService::StacksSigner1) => {
-            include_str!("../templates/services/stacks-signer-1.template.yaml")
-        }
-        StacksDevnetResource::Configmap(StacksDevnetConfigmap::StacksSigner1) => {
-            include_str!("../templates/configmaps/stacks-signer-1.template.yaml")
-        }
     }
 }

src/tests/fixtures/left.txt

@@ -187,6 +187,7 @@ devnet_settings:
   epoch_2_4: 105
   epoch_2_5: 105
   epoch_3_0: 121
+  epoch_3_1: 122
   use_docker_gateway_routing: false
   docker_platform: linux/amd64
 "

src/tests/fixtures/right.txt

@@ -189,6 +189,7 @@ devnet_settings:
   epoch_2_4: 105
   epoch_2_5: 105
   epoch_3_0: 121
+  epoch_3_1: 122
   use_docker_gateway_routing: false
   docker_platform: linux/amd64
 "