Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

support single collator config in toml #253

Merged
merged 1 commit into from
Aug 28, 2024
Merged

Conversation

pepoviola
Copy link
Collaborator

v1 version support define a parachain with a single collator using [parachain.collator] (note this is a map and not a sequence). But in the sdk we drop support in favor of always use a vec. This pr allow to use the old toml definition only with the load_from_toml method.

cc: @AlexD10S

Copy link

Coverage after merging toml-load-single-collator into main

50.62%

Coverage Report
FileStmtsBranchesFuncsLinesUncovered Lines
crates/configuration/src
   global_settings.rs100%100%100%100%
   hrmp_channel.rs100%100%100%100%
   network.rs98.88%100%100%98.78%118, 123, 131, 178, 81, 89
   parachain.rs93.98%100%96.88%93.71%384–396, 398–405, 408, 46–47, 60–62, 663–672, 76–79
   relaychain.rs94.12%100%96.88%93.82%383–392, 93–95
   utils.rs50%100%50%50%15–17, 19–21, 23–25
crates/configuration/src/shared
   errors.rs100%100%100%100%
   helpers.rs100%100%100%100%
   node.rs95.85%100%96.88%95.77%119, 136, 142, 388–406, 408, 44
   resources.rs97.10%100%97.56%97.04%102, 114, 126–128, 147–150
   types.rs94.81%100%92.31%95.22%284–286, 355–357, 383–384, 386–388, 407, 60–62
crates/file-server/src
   main.rs0%100%0%0%22–49, 51–58, 60–61, 63–65, 67–70, 72–73, 75, 77–81, 83–88
crates/orchestrator/src
   errors.rs0%100%0%0%8
   lib.rs36%100%38.78%35.76%100–103, 106–109, 111, 114–115, 117–119, 121–128, 130, 132–136, 138–142, 145–159, 163–172, 175–179, 181–202, 204–209, 211–226, 228, 230–236, 239, 243–247, 249–254, 256–259, 262, 264–267, 270–274, 276, 278–292, 294, 296–299, 302–306, 308–326, 336–360, 364–371, 378–384, 386, 388–394, 397–409, 439, 455, 469–470, 497, 500, 503, 52, 525–527, 529, 53, 530–539, 54, 541–542, 544–545, 547–548, 55, 550, 552–554, 556–559, 56, 560–563, 565–569, 57, 570–572, 574–579, 581–582, 584, 587–588, 59–64, 66–73, 75–87, 89–94, 97–99
   network.rs0%100%0%0%126–136, 138–139, 141–145, 148–154, 156–157, 159–162, 165–183, 185, 198–201, 228–241, 243, 245–255, 257–271, 273–274, 276–280, 283–286, 288–295, 297, 300–305, 307–308, 310–313, 316–322, 328–331, 366–371, 373–377, 380, 382–387, 389–397, 400–402, 405–406, 408, 411, 413–429, 43, 430, 432–434, 437–439, 44, 440–441, 443, 445–449, 45, 454–459, 46, 460–469, 47, 470–479, 48, 480–488, 49, 491–494, 496–499, 50, 500–501, 503–504, 509, 51, 510–525, 527–535, 537–539, 541–543, 546–550, 552, 554–556, 558–560, 562–564, 566–568, 570–572, 574–576, 578–583, 585–591, 64–78, 81–83, 85–87, 89–91, 94–96
   network_spec.rs33.24%100%28.57%33.77%100–103, 106–108, 110–115, 118–121, 124–130, 133–134, 140–142, 144–146, 148–150, 152–154, 156–165, 167–168, 170, 174–191, 194–195, 198–209, 212–228, 231–235, 237–240, 242–266, 268–277, 279–281, 283, 48, 64–69, 73–80, 82–84, 86–92, 95–99
   pjs_helper.rs0%100%0%0%10–13, 15, 17, 21, 24–45, 49–52, 54–59, 6, 60–63, 7–9
   spawner.rs0%100%0%0%100–105, 107, 109–114, 116–119, 122–131, 133, 136–138, 141–145, 147, 152–156, 159, 161–165, 167–171, 174–184, 186–187, 189, 193–196, 198–203, 205–215, 217–220, 223–224, 227–231, 234, 236, 238–245, 44–57, 59–60, 62, 64–75, 79–80, 82, 85–99
crates/orchestrator/src/generators
   bootnode_addr.rs96.94%100%100%96.67%
   chain_spec.rs31.59%100%23.68%32.17%100, 1000–1008, 101, 1010, 1012–1031, 1034–1036, 1038, 1041, 1043, 108–111, 115, 129–145, 147–160, 162, 166–171, 175, 177, 179, 182–186, 188–192, 194, 196–198, 200, 203–204, 208–219, 221–226, 228–237, 240–257, 260–266, 268–270, 272–277, 279, 282–290, 292–296, 298, 300, 302, 304, 307–317, 320–323, 325–327, 329–331, 333–342, 344–356, 358, 361–366, 368–369, 371–384, 386, 389–394, 396–397, 400–413, 415–420, 422–424, 426–428, 431–435, 437–459, 463–472, 475–478, 480, 482–483, 485–499, 50, 500, 502, 504–508, 51, 510, 513, 516–517, 52, 520–524, 527–529, 53, 530–539, 54, 540–551, 555–557, 560–568, 578–586, 588–600, 602–610, 613–615, 619–622, 624–625, 628–635, 637–639, 642–644, 646, 651–657, 660–672, 674–681, 683–688, 690, 692–703, 707–720, 722, 725–726, 729–735, 737–742, 744–749, 751, 753, 755–764, 766–769, 772–773, 776–780, 782–783, 785–786, 788–792, 794–796, 799, 802, 804–805, 807–808, 810–812, 814–816, 818–820, 823–825, 828–832, 834, 836, 855, 879, 917–935, 937, 95–96, 961, 965–969, 97, 970–987, 989, 99, 998–999
   command.rs0%100%0%0%100–106, 109–121, 123–129, 131, 134–139, 141, 144–157, 159, 162–164, 166, 169, 17, 170–179, 18, 180–189, 19, 190–199, 20, 200–206, 208, 21, 210, 212–219, 22, 220–229, 23, 230–233, 235–238, 24, 240–245, 247–249, 25, 250–255, 258–259, 26, 260–268, 27, 270–274, 276, 279–287, 289, 292–308, 311–316, 318, 321–323, 325, 328–348, 350–352, 354–355, 357, 359, 362–364, 366, 368, 47–65, 67–69, 71–79, 82–99
   errors.rs0%100%0%0%4
   identity.rs81.25%100%50%85.71%13
   key.rs93.97%100%72.73%96.19%36
   keystore.rs0%100%0%0%19–32, 35–43, 45–52, 54–61, 63–70, 72, 74–92
   para_artifact.rs19.77%100%40%18.52%101–106, 108, 111–117, 119, 122–132, 136–137, 55–57, 59–73, 75–78, 82–83, 85, 87–97, 99
   port.rs93.33%100%75%96.15%
crates/orchestrator/src/network
   node.rs0%100%0%0%100–103, 106–116, 122–125, 129–132, 135–138, 147–152, 162–169, 173–181, 184–187, 189, 19, 194–200, 202–207, 209–213, 215–220, 222, 229, 231, 235–248, 250–253, 257–259, 261, 267–269, 272–281, 283–284, 288–298, 301, 303, 307–321, 333–343, 346–347, 355–363, 365–371, 373–380, 382–385, 387–390, 392, 394, 398–406, 41–56, 58–60, 62–64, 66–68, 70–72, 77–79, 82–86, 88, 90, 93–98
   parachain.rs57.21%100%60%57.01%101–106, 109–130, 132, 135–140, 143–144, 146–151, 155–158, 162–166, 168–171, 173, 177–178, 180–182, 184–186, 188–190, 67, 70–75, 77–84, 94–98
   relaychain.rs0%100%0%0%16–23, 26–28, 30–32
crates/orchestrator/src/network_helper
   metrics.rs0%100%0%0%20–24, 26–31, 33–41, 43, 45, 50–53, 58–61
   verifier.rs0%100%0%0%10–12, 17, 19–25, 27–32, 34, 8–9
crates/orchestrator/src/network_spec
   node.rs35.29%100%25%35.86%128–129, 131–134, 148, 159–160, 194–198, 200–201, 203, 206, 208–211, 213–216, 219, 223–228, 230, 233, 235–267, 269, 27, 271–278, 28–39, 48
   parachain.rs51.12%100%36.36%52.10%100, 109, 118, 128, 151, 156–159, 162, 174–177, 180, 215–217, 219–235, 237–239, 241–243, 245–247, 253–266, 268–280, 282, 284–285, 80, 85–88
   relaychain.rs85.71%100%75%86.84%115, 122, 140–142, 144–146, 82, 94
crates/orchestrator/src/shared
   types.rs50%100%33.33%55.56%16, 31, 37, 49–53
crates/prom-metrics-parser/src
   lib.rs93.22%100%85.71%93.69%103, 125, 53–55, 7, 79
crates/provider/src
   lib.rs0%100%0%0%142–145, 147–150, 199–201, 208–210, 25
crates/provider/src/docker
   client.rs0%100%0%0%100, 103–109, 11, 110–122, 124–134, 136–147, 149–155, 157–163, 165–168, 170–173, 175–178, 182–183, 185–186, 188–190, 192, 194, 196–200, 203–212, 214–215, 219–221, 223–229, 231–240, 242–248, 250–252, 254–260, 262–273, 275–281, 283–289, 291–302, 304–315, 317–321, 323–325, 327–336, 338–348, 350–358, 360–380, 382–392, 394–400, 402–411, 413–419, 42, 420–424, 426, 428–433, 435, 437–445, 447–448, 450–452, 454–462, 464–467, 469–472, 475–477, 479–485, 487–491, 494–495, 497–502, 504, 506–507, 509–510, 512–525, 529–530, 532–535, 537–539, 54, 541–545, 547–551, 554–556, 558–560, 562, 564–567, 65, 81–91, 93–99
   namespace.rs0%100%0%0%101–110, 112–122, 124–130, 132–143, 146–153, 155–162, 165–175, 177–178, 180–187, 190–211, 214–224, 226–227, 229–231, 233–235, 238, 240, 248–250, 252–254, 256–258, 260–262, 264–266, 268–275, 280–300, 302–331, 333–384, 386–388, 390–402, 409–431, 435–436, 438, 440–441, 50–61, 63–65, 68, 70–72, 75–87, 89–90, 92–96, 98–99
   node.rs0%100%0%0%100–119, 121–123, 125, 127, 129–130, 132–166, 169–178, 180–181, 183–187, 225–234, 236–237, 239–259, 261–262, 264–267, 270–272, 274–275, 277–296, 298–299, 301–306, 314–316, 318–320, 322–324, 326–328, 330–332, 334–336, 338–340, 342–344, 346–352, 354–358, 360–362, 364–366, 371–399, 404–406, 413–456, 462–464, 466–480, 482–500, 502–520, 522–544, 546–557, 73–78, 80–84, 86–91, 98
   provider.rs0%100%0%0%100–113, 118–135, 34–55, 57–58, 62–66, 68–71, 79–81, 83–85, 87–94, 96–99
crates/provider/src/kubernetes
   client.rs0%100%0%0%100–101, 103–134, 136, 138–139, 141–163, 165–172, 174–176, 178–190, 192–196, 198–202, 205–227, 229, 231–247, 249–259, 26, 260–264, 266–271, 274–278, 280, 282–283, 286–287, 289–305, 308–310, 312, 317, 320, 323, 325–330, 332–338, 340–341, 343–366, 368–369, 373–379, 38, 380–389, 39, 390–393, 395–399, 40, 400–409, 41, 410–413, 415, 417–419, 42, 422–429, 43, 430–436, 438–449, 45, 450, 452–453, 455–468, 470–479, 48, 480–483, 487–488, 49, 498–499, 50, 500–509, 51, 510–516, 52–53, 56–64, 66–85, 87, 89–90, 92–98
   namespace.rs0%100%0%0%100–102, 104–111, 113–120, 122–123, 125–140, 142–148, 150–152, 154–159, 162–166, 168–180, 183–193, 195–230, 232–236, 239–240, 242–249, 251–258, 260–264, 266–267, 269–276, 278–282, 284–285, 287–288, 290–309, 311–313, 315–319, 321–322, 324–326, 328–330, 333, 335, 342–353, 355–358, 360–361, 369–371, 373–375, 377–379, 381–383, 385–387, 389–396, 401–422, 424–452, 454–505, 507–509, 511–523, 56–67, 69–71, 74, 76–78, 81–95, 97–98
   node.rs0%100%0%0%105, 107–127, 129–131, 133, 135, 137–138, 140–160, 162–166, 168–169, 171–179, 182–207, 209–213, 215–216, 218–225, 227–228, 230–237, 242–266, 268–269, 271–280, 282–283, 285–304, 306–307, 309–312, 315–317, 319–320, 322–340, 342–343, 345–350, 352–359, 361–364, 366–369, 371, 373–381, 383–384, 386–391, 393–396, 404–406, 408–410, 412–414, 416–418, 420–422, 424–426, 428–430, 432–434, 436–438, 440–444, 447–452, 454–463, 469–487, 492–519, 524–540, 547–615, 621–623, 625–646, 648–665, 667–684, 686–707, 709–720, 80–85, 87–91, 93–98
   pod_spec_builder.rs0%100%0%0%100–125, 127–149, 15, 150–152, 154–159, 16, 160–166, 168–169, 17, 170–172, 174–176, 178–179, 18, 180, 182–183, 185, 187, 19–32, 34–71, 73–90, 92–99
   provider.rs0%100%0%0%102–119, 34–50, 52–55, 63–65, 67–69, 71–78, 80–97
crates/provider/src/native
   namespace.rs0%100%0%0%100–101, 106–124, 126–151, 153–209, 211–214, 216–226, 41–51, 53–55, 58, 60–62, 65–74, 82–84, 86–88, 90–92, 94–99
   node.rs0%100%0%0%100–102, 108–109, 111–131, 133–135, 137, 139, 141–142, 144–152, 154–155, 157–168, 170–171, 173–177, 180–184, 188–190, 192–193, 195–203, 205–215, 217–219, 221–222, 226–227, 229–232, 234–258, 260–279, 281, 283, 285, 287–288, 290–297, 300, 302–303, 305–306, 308–310, 314–315, 317–324, 326–327, 329–357, 359–360, 362–367, 375–377, 379–381, 383–385, 387–389, 391–393, 395–397, 399–401, 403–405, 407–413, 415–422, 424–426, 428–430, 435–458, 463–497, 504–529, 535–547, 549–556, 558–565, 567–584, 586–596, 84–93, 95–99
   provider.rs0%100%0%0%101–117, 33–50, 52–55, 63–65, 67–69, 71–78, 80–96
crates/provider/src/shared
   helpers.rs100%100%100%100%
   types.rs4%100%2.86%4.17%101–111, 113–119, 121–131, 133–136, 148–159, 161–168, 170–180, 193–203, 205–219, 221–227, 229–235, 237–240, 251–260, 262–269, 271–281, 291–300, 302–309, 311–321, 345–351, 355–362, 56–72, 74–80, 82–85, 87–90, 92–99
crates/sdk/src
   environment.rs0%100%0%0%23–27, 29, 32–36, 38–40, 43–49, 51
   lib.rs0%100%0%0%37–42, 44–49, 51–56
crates/support/src
   fs.rs100%100%100%100%
   net.rs0%100%0%0%10–16, 18–22, 24, 26–30, 32–35, 37–42, 46, 49–50, 52–60
   replacer.rs96.67%100%85.71%98.11%
crates/support/src/fs
   in_memory.rs96.66%100%95.56%96.74%248–253, 41–44, 46, 48–51, 53, 55–58, 60
   local.rs99.27%100%98.04%99.40%92–94

@pepoviola pepoviola merged commit 9f8845d into main Aug 28, 2024
7 checks passed
@pepoviola pepoviola deleted the toml-load-single-collator branch August 28, 2024 21:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant