Skip to content

Commit a7fc609

Browse files
authored
fix off-by-one in sv node indices (#1804)
Signed-off-by: Itai Segall <itai.segall@digitalasset.com>
1 parent 6a48239 commit a7fc609

File tree

9 files changed

+266
-45
lines changed

9 files changed

+266
-45
lines changed

cluster/expected/canton-network/expected.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,25 +268,50 @@
268268
"number": 26006,
269269
"protocol": "TCP"
270270
},
271+
{
272+
"name": "cometbft-0-1-p2p",
273+
"number": 26016,
274+
"protocol": "TCP"
275+
},
271276
{
272277
"name": "cometbft-1-0-p2p",
273278
"number": 26106,
274279
"protocol": "TCP"
275280
},
281+
{
282+
"name": "cometbft-1-1-p2p",
283+
"number": 26116,
284+
"protocol": "TCP"
285+
},
276286
{
277287
"name": "cometbft-2-0-p2p",
278288
"number": 26206,
279289
"protocol": "TCP"
280290
},
291+
{
292+
"name": "cometbft-2-1-p2p",
293+
"number": 26216,
294+
"protocol": "TCP"
295+
},
281296
{
282297
"name": "cometbft-3-0-p2p",
283298
"number": 26306,
284299
"protocol": "TCP"
285300
},
301+
{
302+
"name": "cometbft-3-1-p2p",
303+
"number": 26316,
304+
"protocol": "TCP"
305+
},
286306
{
287307
"name": "cometbft-4-0-p2p",
288308
"number": 26406,
289309
"protocol": "TCP"
310+
},
311+
{
312+
"name": "cometbft-4-1-p2p",
313+
"number": 26416,
314+
"protocol": "TCP"
290315
}
291316
],
292317
"resolution": "DNS"

cluster/expected/infra/expected.json

Lines changed: 75 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -620,8 +620,8 @@
620620
"*"
621621
],
622622
"port": {
623-
"name": "cometbft-0-0-gw",
624-
"number": 26006,
623+
"name": "cometbft-0-1-gw",
624+
"number": 26016,
625625
"protocol": "TCP"
626626
}
627627
},
@@ -630,8 +630,8 @@
630630
"*"
631631
],
632632
"port": {
633-
"name": "cometbft-1-0-gw",
634-
"number": 26106,
633+
"name": "cometbft-0-1-gw",
634+
"number": 26016,
635635
"protocol": "TCP"
636636
}
637637
},
@@ -640,8 +640,8 @@
640640
"*"
641641
],
642642
"port": {
643-
"name": "cometbft-2-0-gw",
644-
"number": 26206,
643+
"name": "cometbft-1-1-gw",
644+
"number": 26116,
645645
"protocol": "TCP"
646646
}
647647
},
@@ -650,8 +650,8 @@
650650
"*"
651651
],
652652
"port": {
653-
"name": "cometbft-3-0-gw",
654-
"number": 26306,
653+
"name": "cometbft-1-1-gw",
654+
"number": 26116,
655655
"protocol": "TCP"
656656
}
657657
},
@@ -660,8 +660,58 @@
660660
"*"
661661
],
662662
"port": {
663-
"name": "cometbft-4-0-gw",
664-
"number": 26406,
663+
"name": "cometbft-2-1-gw",
664+
"number": 26216,
665+
"protocol": "TCP"
666+
}
667+
},
668+
{
669+
"hosts": [
670+
"*"
671+
],
672+
"port": {
673+
"name": "cometbft-2-1-gw",
674+
"number": 26216,
675+
"protocol": "TCP"
676+
}
677+
},
678+
{
679+
"hosts": [
680+
"*"
681+
],
682+
"port": {
683+
"name": "cometbft-3-1-gw",
684+
"number": 26316,
685+
"protocol": "TCP"
686+
}
687+
},
688+
{
689+
"hosts": [
690+
"*"
691+
],
692+
"port": {
693+
"name": "cometbft-3-1-gw",
694+
"number": 26316,
695+
"protocol": "TCP"
696+
}
697+
},
698+
{
699+
"hosts": [
700+
"*"
701+
],
702+
"port": {
703+
"name": "cometbft-4-1-gw",
704+
"number": 26416,
705+
"protocol": "TCP"
706+
}
707+
},
708+
{
709+
"hosts": [
710+
"*"
711+
],
712+
"port": {
713+
"name": "cometbft-4-1-gw",
714+
"number": 26416,
665715
"protocol": "TCP"
666716
}
667717
}
@@ -1670,34 +1720,34 @@
16701720
"targetPort": 443
16711721
},
16721722
{
1673-
"name": "cometbft-0-0-gw",
1674-
"port": 26006,
1723+
"name": "cometbft-0-1-gw",
1724+
"port": 26016,
16751725
"protocol": "TCP",
1676-
"targetPort": 26006
1726+
"targetPort": 26016
16771727
},
16781728
{
1679-
"name": "cometbft-1-0-gw",
1680-
"port": 26106,
1729+
"name": "cometbft-1-1-gw",
1730+
"port": 26116,
16811731
"protocol": "TCP",
1682-
"targetPort": 26106
1732+
"targetPort": 26116
16831733
},
16841734
{
1685-
"name": "cometbft-2-0-gw",
1686-
"port": 26206,
1735+
"name": "cometbft-2-1-gw",
1736+
"port": 26216,
16871737
"protocol": "TCP",
1688-
"targetPort": 26206
1738+
"targetPort": 26216
16891739
},
16901740
{
1691-
"name": "cometbft-3-0-gw",
1692-
"port": 26306,
1741+
"name": "cometbft-3-1-gw",
1742+
"port": 26316,
16931743
"protocol": "TCP",
1694-
"targetPort": 26306
1744+
"targetPort": 26316
16951745
},
16961746
{
1697-
"name": "cometbft-4-0-gw",
1698-
"port": 26406,
1747+
"name": "cometbft-4-1-gw",
1748+
"port": 26416,
16991749
"protocol": "TCP",
1700-
"targetPort": 26406
1750+
"targetPort": 26416
17011751
}
17021752
]
17031753
},

cluster/expected/multi-validator/expected.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,25 +201,50 @@
201201
"number": 26006,
202202
"protocol": "TCP"
203203
},
204+
{
205+
"name": "cometbft-0-1-p2p",
206+
"number": 26016,
207+
"protocol": "TCP"
208+
},
204209
{
205210
"name": "cometbft-1-0-p2p",
206211
"number": 26106,
207212
"protocol": "TCP"
208213
},
214+
{
215+
"name": "cometbft-1-1-p2p",
216+
"number": 26116,
217+
"protocol": "TCP"
218+
},
209219
{
210220
"name": "cometbft-2-0-p2p",
211221
"number": 26206,
212222
"protocol": "TCP"
213223
},
224+
{
225+
"name": "cometbft-2-1-p2p",
226+
"number": 26216,
227+
"protocol": "TCP"
228+
},
214229
{
215230
"name": "cometbft-3-0-p2p",
216231
"number": 26306,
217232
"protocol": "TCP"
218233
},
234+
{
235+
"name": "cometbft-3-1-p2p",
236+
"number": 26316,
237+
"protocol": "TCP"
238+
},
219239
{
220240
"name": "cometbft-4-0-p2p",
221241
"number": 26406,
222242
"protocol": "TCP"
243+
},
244+
{
245+
"name": "cometbft-4-1-p2p",
246+
"number": 26416,
247+
"protocol": "TCP"
223248
}
224249
],
225250
"resolution": "DNS"

cluster/expected/splitwell/expected.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,25 +187,50 @@
187187
"number": 26006,
188188
"protocol": "TCP"
189189
},
190+
{
191+
"name": "cometbft-0-1-p2p",
192+
"number": 26016,
193+
"protocol": "TCP"
194+
},
190195
{
191196
"name": "cometbft-1-0-p2p",
192197
"number": 26106,
193198
"protocol": "TCP"
194199
},
200+
{
201+
"name": "cometbft-1-1-p2p",
202+
"number": 26116,
203+
"protocol": "TCP"
204+
},
195205
{
196206
"name": "cometbft-2-0-p2p",
197207
"number": 26206,
198208
"protocol": "TCP"
199209
},
210+
{
211+
"name": "cometbft-2-1-p2p",
212+
"number": 26216,
213+
"protocol": "TCP"
214+
},
200215
{
201216
"name": "cometbft-3-0-p2p",
202217
"number": 26306,
203218
"protocol": "TCP"
204219
},
220+
{
221+
"name": "cometbft-3-1-p2p",
222+
"number": 26316,
223+
"protocol": "TCP"
224+
},
205225
{
206226
"name": "cometbft-4-0-p2p",
207227
"number": 26406,
208228
"protocol": "TCP"
229+
},
230+
{
231+
"name": "cometbft-4-1-p2p",
232+
"number": 26416,
233+
"protocol": "TCP"
209234
}
210235
],
211236
"resolution": "DNS"

cluster/expected/sv-runbook/expected.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,25 +280,50 @@
280280
"number": 26006,
281281
"protocol": "TCP"
282282
},
283+
{
284+
"name": "cometbft-0-1-p2p",
285+
"number": 26016,
286+
"protocol": "TCP"
287+
},
283288
{
284289
"name": "cometbft-1-0-p2p",
285290
"number": 26106,
286291
"protocol": "TCP"
287292
},
293+
{
294+
"name": "cometbft-1-1-p2p",
295+
"number": 26116,
296+
"protocol": "TCP"
297+
},
288298
{
289299
"name": "cometbft-2-0-p2p",
290300
"number": 26206,
291301
"protocol": "TCP"
292302
},
303+
{
304+
"name": "cometbft-2-1-p2p",
305+
"number": 26216,
306+
"protocol": "TCP"
307+
},
293308
{
294309
"name": "cometbft-3-0-p2p",
295310
"number": 26306,
296311
"protocol": "TCP"
297312
},
313+
{
314+
"name": "cometbft-3-1-p2p",
315+
"number": 26316,
316+
"protocol": "TCP"
317+
},
298318
{
299319
"name": "cometbft-4-0-p2p",
300320
"number": 26406,
301321
"protocol": "TCP"
322+
},
323+
{
324+
"name": "cometbft-4-1-p2p",
325+
"number": 26416,
326+
"protocol": "TCP"
302327
}
303328
],
304329
"resolution": "DNS"

0 commit comments

Comments
 (0)