Skip to content

Commit fc234ed

Browse files
hugoclrdhugoclrd
committed
feat: remove signer 1
1 parent f9a1d3e commit fc234ed

File tree

13 files changed

+4
-164
lines changed

13 files changed

+4
-164
lines changed

‎src/lib.rs‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -221,13 +221,6 @@ impl StacksDevnetApiK8sManager {
221221
)
222222
.await?;
223223

224-
self.deploy_stacks_signer(
225-
&config,
226-
SignerIdx::Signer1,
227-
"530d9f61984c888536871c6573073bdfc0058896dc1adfe9a6a10dfacadc209101",
228-
)
229-
.await?;
230-
231224
if !config.disable_stacks_api {
232225
self.deploy_stacks_blockchain_api(&config).await?;
233226
}
@@ -1316,11 +1309,6 @@ impl StacksDevnetApiK8sManager {
13161309
get_service_port(StacksDevnetService::StacksSigner0, ServicePort::Event)
13171310
.unwrap(),
13181311
),
1319-
SignerIdx::Signer1 => (
1320-
get_service_url(namespace, StacksDevnetService::StacksSigner1),
1321-
get_service_port(StacksDevnetService::StacksSigner1, ServicePort::Event)
1322-
.unwrap(),
1323-
),
13241312
};
13251313

13261314
stacks_conf.push_str(&format!(
@@ -1478,24 +1466,18 @@ impl StacksDevnetApiK8sManager {
14781466
SignerIdx::Signer0 => {
14791467
get_service_port(StacksDevnetService::StacksSigner0, ServicePort::Event).unwrap()
14801468
}
1481-
SignerIdx::Signer1 => {
1482-
get_service_port(StacksDevnetService::StacksSigner1, ServicePort::Event).unwrap()
1483-
}
14841469
};
14851470

14861471
let configmap = match signer_idx {
14871472
SignerIdx::Signer0 => StacksDevnetConfigmap::StacksSigner0,
1488-
SignerIdx::Signer1 => StacksDevnetConfigmap::StacksSigner1,
14891473
};
14901474

14911475
let sts = match signer_idx {
14921476
SignerIdx::Signer0 => StacksDevnetStatefulSet::StacksSigner0,
1493-
SignerIdx::Signer1 => StacksDevnetStatefulSet::StacksSigner1,
14941477
};
14951478

14961479
let service = match signer_idx {
14971480
SignerIdx::Signer0 => StacksDevnetService::StacksSigner0,
1498-
SignerIdx::Signer1 => StacksDevnetService::StacksSigner1,
14991481
};
15001482

15011483
// configmap env vars for api conatainer

‎src/resources/configmap.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ pub enum StacksDevnetConfigmap {
88
StacksBlockchainApi,
99
StacksBlockchainApiPg,
1010
StacksSigner0,
11-
StacksSigner1,
1211
DeploymentPlan,
1312
Devnet,
1413
ProjectDir,
@@ -23,7 +22,6 @@ impl fmt::Display for StacksDevnetConfigmap {
2322
StacksDevnetConfigmap::StacksBlockchainApi => write!(f, "stacks-blockchain-api"),
2423
StacksDevnetConfigmap::StacksBlockchainApiPg => write!(f, "stacks-blockchain-api-pg"),
2524
StacksDevnetConfigmap::StacksSigner0 => write!(f, "stacks-signer-0"),
26-
StacksDevnetConfigmap::StacksSigner1 => write!(f, "stacks-signer-1"),
2725
StacksDevnetConfigmap::DeploymentPlan => write!(f, "deployment-plan"),
2826
StacksDevnetConfigmap::Devnet => write!(f, "devnet"),
2927
StacksDevnetConfigmap::ProjectDir => write!(f, "project-dir"),

‎src/resources/pod.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ pub enum StacksDevnetPod {
77
StacksBlockchain,
88
StacksBlockchainApi,
99
StacksSigner0,
10-
StacksSigner1,
1110
}
1211

1312
impl fmt::Display for StacksDevnetPod {
@@ -17,7 +16,6 @@ impl fmt::Display for StacksDevnetPod {
1716
StacksDevnetPod::StacksBlockchain => write!(f, "stacks-blockchain"),
1817
StacksDevnetPod::StacksBlockchainApi => write!(f, "stacks-blockchain-api"),
1918
StacksDevnetPod::StacksSigner0 => write!(f, "stacks-signer-0"),
20-
StacksDevnetPod::StacksSigner1 => write!(f, "stacks-signer-1"),
2119
}
2220
}
2321
}

‎src/resources/pvc.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,13 @@ use strum::EnumIter;
55
pub enum StacksDevnetPvc {
66
StacksBlockchainApiPg,
77
StacksSigner0,
8-
StacksSigner1,
98
}
109

1110
impl fmt::Display for StacksDevnetPvc {
1211
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
1312
match self {
1413
StacksDevnetPvc::StacksBlockchainApiPg => write!(f, "stacks-blockchain-api"),
1514
StacksDevnetPvc::StacksSigner0 => write!(f, "stacks-signer-0"),
16-
StacksDevnetPvc::StacksSigner1 => write!(f, "stacks-signer-1"),
1715
}
1816
}
1917
}

‎src/resources/service.rs‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ pub enum StacksDevnetService {
77
StacksBlockchain,
88
StacksBlockchainApi,
99
StacksSigner0,
10-
StacksSigner1,
1110
}
1211

1312
pub enum ServicePort {
@@ -27,7 +26,6 @@ impl fmt::Display for StacksDevnetService {
2726
StacksDevnetService::StacksBlockchain => write!(f, "stacks-blockchain"),
2827
StacksDevnetService::StacksBlockchainApi => write!(f, "stacks-blockchain-api"),
2928
StacksDevnetService::StacksSigner0 => write!(f, "stacks-signer-0"),
30-
StacksDevnetService::StacksSigner1 => write!(f, "stacks-signer-1"),
3129
}
3230
}
3331
}
@@ -43,10 +41,7 @@ pub fn get_service_port(service: StacksDevnetService, port_type: ServicePort) ->
4341
(StacksDevnetService::StacksBlockchainApi, ServicePort::API) => Some("3999".into()),
4442
(StacksDevnetService::StacksBlockchainApi, ServicePort::Event) => Some("3700".into()),
4543
(StacksDevnetService::StacksBlockchainApi, ServicePort::DB) => Some("5432".into()),
46-
(
47-
StacksDevnetService::StacksSigner0 | StacksDevnetService::StacksSigner1,
48-
ServicePort::Event,
49-
) => Some("30001".into()),
44+
(StacksDevnetService::StacksSigner0, ServicePort::Event) => Some("30001".into()),
5045
(_, _) => None,
5146
}
5247
}
@@ -57,7 +52,7 @@ pub fn get_user_facing_port(service: StacksDevnetService) -> Option<String> {
5752
get_service_port(service, ServicePort::RPC)
5853
}
5954
StacksDevnetService::StacksBlockchainApi => get_service_port(service, ServicePort::API),
60-
StacksDevnetService::StacksSigner0 | StacksDevnetService::StacksSigner1 => None,
55+
StacksDevnetService::StacksSigner0 => None,
6156
}
6257
}
6358

@@ -71,7 +66,6 @@ pub fn get_service_from_path_part(path_part: &str) -> Option<StacksDevnetService
7166
"stacks-blockchain" => Some(StacksDevnetService::StacksBlockchain),
7267
"stacks-blockchain-api" => Some(StacksDevnetService::StacksBlockchainApi),
7368
"stacks-signer-0" => Some(StacksDevnetService::StacksSigner0),
74-
"stacks-signer-1" => Some(StacksDevnetService::StacksSigner1),
7569
_ => None,
7670
}
7771
}

‎src/resources/stateful_set.rs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,26 @@ use strum::EnumIter;
55
pub enum StacksDevnetStatefulSet {
66
StacksBlockchainApi,
77
StacksSigner0,
8-
StacksSigner1,
98
}
109

1110
impl fmt::Display for StacksDevnetStatefulSet {
1211
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
1312
match self {
1413
StacksDevnetStatefulSet::StacksBlockchainApi => write!(f, "stacks-blockchain-api"),
1514
StacksDevnetStatefulSet::StacksSigner0 => write!(f, "stacks-signer-0"),
16-
StacksDevnetStatefulSet::StacksSigner1 => write!(f, "stacks-signer-1"),
1715
}
1816
}
1917
}
2018

2119
#[derive(EnumIter, Debug, Clone)]
2220
pub enum SignerIdx {
2321
Signer0,
24-
Signer1,
2522
}
2623

2724
impl fmt::Display for SignerIdx {
2825
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
2926
match self {
3027
SignerIdx::Signer0 => write!(f, "0"),
31-
SignerIdx::Signer1 => write!(f, "1"),
3228
}
3329
}
3430
}

‎src/resources/tests.rs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ use test_case::test_case;
1111
#[test_case(StacksDevnetConfigmap::StacksBlockchainApi => is equal_to "stacks-blockchain-api"; "for StacksBlockchainApi")]
1212
#[test_case(StacksDevnetConfigmap::StacksBlockchainApiPg => is equal_to "stacks-blockchain-api-pg"; "for StacksBlockchainApiPg")]
1313
#[test_case(StacksDevnetConfigmap::StacksSigner0 => is equal_to "stacks-signer-0"; "for StacksSigner0")]
14-
#[test_case(StacksDevnetConfigmap::StacksSigner1 => is equal_to "stacks-signer-1"; "for StacksSigner1")]
1514
#[test_case(StacksDevnetConfigmap::DeploymentPlan => is equal_to "deployment-plan"; "for DeploymentPlan")]
1615
#[test_case(StacksDevnetConfigmap::Devnet => is equal_to "devnet"; "for Devnet")]
1716
#[test_case(StacksDevnetConfigmap::ProjectDir => is equal_to "project-dir"; "for ProjectDir")]
@@ -35,7 +34,6 @@ fn it_prints_correct_name_for_deployment(deployment: StacksDevnetDeployment) ->
3534

3635
#[test_case(StacksDevnetStatefulSet::StacksBlockchainApi => is equal_to "stacks-blockchain-api"; "for StacksBlockchainApi")]
3736
#[test_case(StacksDevnetStatefulSet::StacksSigner0 => is equal_to "stacks-signer-0"; "for StacksSigner0")]
38-
#[test_case(StacksDevnetStatefulSet::StacksSigner1 => is equal_to "stacks-signer-1"; "for StacksSigner1")]
3937
fn it_prints_correct_name_for_stateful_set(pod: StacksDevnetStatefulSet) -> String {
4038
pod.to_string()
4139
}
@@ -44,7 +42,6 @@ fn it_prints_correct_name_for_stateful_set(pod: StacksDevnetStatefulSet) -> Stri
4442
#[test_case(StacksDevnetService::StacksBlockchain => is equal_to "stacks-blockchain"; "for StacksBlockchain")]
4543
#[test_case(StacksDevnetService::StacksBlockchainApi => is equal_to "stacks-blockchain-api"; "for StacksBlockchainApi")]
4644
#[test_case(StacksDevnetService::StacksSigner0 => is equal_to "stacks-signer-0"; "for StacksSigner0")]
47-
#[test_case(StacksDevnetService::StacksSigner1 => is equal_to "stacks-signer-1"; "for StacksSigner1")]
4845
fn it_prints_correct_name_for_service(service: StacksDevnetService) -> String {
4946
service.to_string()
5047
}
@@ -59,7 +56,6 @@ fn it_prints_correct_name_for_service(service: StacksDevnetService) -> String {
5956
#[test_case(StacksDevnetService::StacksBlockchainApi, ServicePort::Event => is equal_to Some("3700".to_string()); "for StacksBlockchainApi Event port")]
6057
#[test_case(StacksDevnetService::StacksBlockchainApi, ServicePort::DB => is equal_to Some("5432".to_string()); "for StacksBlockchainApi DB port")]
6158
#[test_case(StacksDevnetService::StacksSigner0, ServicePort::Event => is equal_to Some("30001".to_string()); "for StacksSigner0 Event port")]
62-
#[test_case(StacksDevnetService::StacksSigner1, ServicePort::Event => is equal_to Some("30001".to_string()); "for StacksSigner1 Event port")]
6359
#[test_case(StacksDevnetService::StacksBlockchainApi, ServicePort::RPC => is equal_to None; "invalid service port combination")]
6460
fn it_gets_correct_port_for_service(
6561
service: StacksDevnetService,
@@ -72,7 +68,6 @@ fn it_gets_correct_port_for_service(
7268
#[test_case("stacks-blockchain" => is equal_to Some(StacksDevnetService::StacksBlockchain); "for stacks-blockchain")]
7369
#[test_case("stacks-blockchain-api" => is equal_to Some(StacksDevnetService::StacksBlockchainApi); "for stacks-blockchain-api")]
7470
#[test_case("stacks-signer-0" => is equal_to Some(StacksDevnetService::StacksSigner0); "for stacks-signer-0")]
75-
#[test_case("stacks-signer-1" => is equal_to Some(StacksDevnetService::StacksSigner1); "for stacks-signer-1")]
7671
#[test_case("invalid" => is equal_to None; "returning None for invalid paths")]
7772
fn it_prints_service_from_path_part(path_part: &str) -> Option<StacksDevnetService> {
7873
get_service_from_path_part(path_part)
@@ -82,7 +77,6 @@ fn it_prints_service_from_path_part(path_part: &str) -> Option<StacksDevnetServi
8277
#[test_case(StacksDevnetService::StacksBlockchain => is equal_to Some("20443".to_string()); "for StacksBlockchain")]
8378
#[test_case(StacksDevnetService::StacksBlockchainApi => is equal_to Some("3999".to_string()); "for StacksBlockchainApi")]
8479
#[test_case(StacksDevnetService::StacksSigner0 => is equal_to None; "for StacksSigner0")]
85-
#[test_case(StacksDevnetService::StacksSigner1 => is equal_to None; "for StacksSigner1")]
8680
fn it_gets_user_facing_port_for_service(service: StacksDevnetService) -> Option<String> {
8781
get_user_facing_port(service)
8882
}

‎src/template_parser.rs‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,5 @@ pub fn get_yaml_from_resource(resource: StacksDevnetResource) -> &'static str {
5858
StacksDevnetResource::Configmap(StacksDevnetConfigmap::StacksSigner0) => {
5959
include_str!("../templates/configmaps/stacks-signer-0.template.yaml")
6060
}
61-
StacksDevnetResource::StatefulSet(StacksDevnetStatefulSet::StacksSigner1) => {
62-
include_str!("../templates/stateful-sets/stacks-signer-1.template.yaml")
63-
}
64-
StacksDevnetResource::Service(StacksDevnetService::StacksSigner1) => {
65-
include_str!("../templates/services/stacks-signer-1.template.yaml")
66-
}
67-
StacksDevnetResource::Configmap(StacksDevnetConfigmap::StacksSigner1) => {
68-
include_str!("../templates/configmaps/stacks-signer-1.template.yaml")
69-
}
7061
}
7162
}

‎src/tests/fixtures/left.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ devnet_settings:
187187
epoch_2_4: 105
188188
epoch_2_5: 105
189189
epoch_3_0: 121
190+
epoch_3_1: 122
190191
use_docker_gateway_routing: false
191192
docker_platform: linux/amd64
192193
"

‎src/tests/fixtures/right.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ devnet_settings:
189189
epoch_2_4: 105
190190
epoch_2_5: 105
191191
epoch_3_0: 121
192+
epoch_3_1: 122
192193
use_docker_gateway_routing: false
193194
docker_platform: linux/amd64
194195
"

0 commit comments

Comments
 (0)