Fix various bugs #119

wirednkod · 2023-10-06T13:36:40Z

Based on the simple example, various bugs have been identified;
This PR resolves them

…function

github-actions · 2023-10-06T15:05:39Z

Coverage after merging nik-toml-example into main

77.16%

Coverage Report

File	Stmts	Branches	Funcs	Lines	Uncovered Lines
crates/configuration/src
global_settings.rs	98.46%	100%	93.33%	99.13%
hrmp_channel.rs	95.88%	100%	89.47%	97.44%
network.rs	99.22%	100%	97.78%	99.36%	117, 122, 130, 175, 80, 88
parachain.rs	97.59%	100%	95.19%	97.85%	51–53, 551–560, 67–70
relaychain.rs	96.60%	100%	92.65%	97.09%	338–347, 77–79
utils.rs	40%	100%	40%	40%	11–13, 15–17, 19–21
crates/configuration/src/shared
errors.rs	50%	100%	50%	50%
helpers.rs	100%	100%	100%	100%
node.rs	98.32%	100%	92.68%	98.93%	124, 130
resources.rs	96.09%	100%	94.52%	96.43%	102, 114, 126–128, 147–150
types.rs	90.18%	100%	84.16%	91.93%	279–281, 350–352, 361, 378–379, 381–383, 60–62
crates/orchestrator/src
errors.rs	0%	100%	0%	0%	8
lib.rs	0%	100%	0%	0%	100–103, 105–108, 112–115, 117–123, 125, 129, 131–146, 150–173, 177–186, 189, 192–196, 198, 200–204, 207–225, 227–232, 234–246, 249–255, 259–261, 264, 267–272, 274–277, 280–284, 287, 289–302, 304–306, 309–313, 315, 317–330, 332–335, 337–339, 343–345, 347–371, 379, 383–384, 394, 401–403, 405–414, 416–417, 419–427, 429–436, 438–439, 44, 440–445, 447–449, 45, 450–458, 46, 461, 47–49, 51–56, 58–64, 66–69, 75, 77–92, 98–99
network.rs	0%	100%	0%	0%	100–108, 111–117, 119–127, 130–155, 157, 159–168, 171, 173–177, 185–188, 190, 192, 194–196, 199–204, 206–208, 210–212, 214–216, 218–220, 222–224, 226–228, 230–232, 32–40, 43, 56–70, 77–82, 85–94, 96, 98–99
network_spec.rs	93.67%	100%	83.33%	95.52%	11, 38
spawner.rs	0%	100%	0%	0%	100–106, 108, 112–114, 117–119, 121, 127–147, 149, 151–168, 17, 40–53, 55–56, 58, 60–63, 67–68, 70, 73–93, 95–99
crates/orchestrator/src/generators
bootnode_addr.rs	97.20%	100%	100%	96.84%
chain_spec.rs	3.24%	100%	5%	3.08%	100–111, 113–128, 130, 135–148, 151–157, 159–161, 164–192, 194–197, 199–201, 203–216, 218–219, 22, 220, 223–225, 227, 229–241, 243, 246–251, 253–254, 256–269, 271, 274–279, 281–282, 285–298, 300–305, 307–309, 311–313, 316–321, 323–352, 355, 358–361, 364, 366–367, 369–379, 38, 380–384, 386, 388–389, 392–397, 405–443, 454–459, 46, 460–462, 472–480, 482–494, 496–504, 507–509, 513–516, 518–519, 524–535, 539–552, 554, 557–558, 561–567, 569–574, 580–585, 587, 589, 591–598, 600–603, 606–607, 611–612, 614, 616–617, 619–623, 625–628, 630, 632–633, 635–636, 638–640, 642–644, 646–648, 651–653, 656–660, 662, 664–672, 674–675, 680–687, 689–699, 703–706, 708, 710, 712–717, 719–729, 731–746, 748–749, 75, 750–755, 757, 76, 761–769, 77, 770–781, 783, 792–802, 804, 806–823, 825–829, 831, 833, 84–87, 95–99
command.rs	0%	100%	0%	0%	100–112, 114–120, 122, 125–130, 132–133, 136–148, 15, 150, 153–155, 157–158, 16, 161–169, 17, 170–179, 18, 180–189, 19, 190–197, 199, 20, 201, 203–209, 21, 210–219, 22, 220–224, 226–229, 23, 231–233, 235–239, 24, 240–243, 246–250, 252–256, 258, 261–269, 271, 274–290, 293–298, 300, 303–305, 307–308, 311–333, 335, 337, 44–62, 64–66, 68–76, 79–97
errors.rs	0%	100%	0%	0%	4
identity.rs	82.35%	100%	60%	86.21%	13
key.rs	95.05%	100%	84.62%	96.59%	31
keystore.rs	0%	100%	0%	0%	19–26, 28–31, 34–46, 48–55, 57–64, 66, 68–86
para_artifact.rs	15.94%	100%	10%	16.95%	12, 18, 25, 44–46, 48–64, 66–69, 72–81, 83–88, 92–93
port.rs	93.75%	100%	83.33%	96.15%
crates/orchestrator/src/network
node.rs	0%	100%	0%	0%	10, 100–105, 107–109, 111–114, 116–120, 124–132, 24–39, 43–46, 50–53, 56–59, 66–71, 81–90, 93–95, 97, 99
parachain.rs	0%	100%	0%	0%	100, 102–105, 15, 25–33, 35–47, 49–53, 56–60, 63–70, 72, 74, 77–82, 85–86, 88–93, 97–99
relaychain.rs	0%	100%	0%	0%	14–21, 5
crates/orchestrator/src/network_helper
verifier.rs	0%	100%	0%	0%	10–11, 16, 18–25, 27–32, 34, 7–9
crates/orchestrator/src/network_spec
node.rs	39.17%	100%	16.67%	40.35%	108, 146–150, 152–153, 155, 158, 16, 160–163, 165–168, 173–178, 180, 183, 185–215, 217, 90–91, 93–96
parachain.rs	72.04%	100%	50%	73.03%	100, 107, 125, 130–133, 136, 147–150, 153, 17, 71–73, 76, 78–80, 86, 95
relaychain.rs	88.71%	100%	66.67%	91.07%	100, 17, 70, 93
crates/orchestrator/src/shared
types.rs	26.09%	100%	11.76%	34.48%	15, 30, 36, 45–49, 52, 61, 72
crates/prom-metrics-parser/src
lib.rs	91.94%	100%	80%	92.98%	105, 127, 55–57, 7, 81
crates/provider/src
lib.rs	25%	100%	0%	50%
native.rs	90.40%	100%	81.88%	91.52%	1020, 1024, 1057, 1066, 1087, 1094, 1125, 1152, 1176, 1181, 1209, 1235, 1245, 1252, 1269, 1319, 132, 1376–1378, 1423, 1499–1500, 1524, 155, 1565, 190–194, 262, 281, 294, 296, 303, 305–306, 319, 341, 355–357, 359–361, 363–365, 387–389, 391–393, 41, 434, 454, 49, 503, 552, 581–582, 587–589, 707, 799, 806, 811, 816, 821, 828, 841, 90, 912, 936, 941, 945, 974, 990
crates/provider/src/shared
types.rs	84.47%	100%	74.29%	86.41%	123, 140–146, 15–18, 230, 249–256, 79
crates/support/src
fs.rs	75%	100%	66.67%	80%
net.rs	0%	100%	0%	0%	10, 4–9
crates/support/src/fs
in_memory.rs	95.55%	100%	96.48%	95.37%	149, 271, 321, 372, 424, 432, 440, 448, 470, 478, 593, 615, 643, 660, 678, 685, 704, 731, 748, 79–82, 84, 86–89, 91, 96
local.rs	98.25%	100%	96.30%	98.75%	51, 8
crates/test-runner/src
lib.rs	100%	100%	100%	100%

pepoviola · 2023-10-06T16:05:50Z

crates/configuration/src/shared/types.rs

+        // covers the "-lruntime=debug,parachain=trace" case
+        // TODO: Make this more generic by adding the scenario in the regex below
+        if (v.starts_with("-l") || v.starts_with("-log")) && v.contains(',') {
+            return Ok(Arg::Flag(v.to_string()));


So basically we are set this as flag instead of traing to parse it right? Did you try if there is no "," like -lparachain=debug ??

You are right. This should be better parsed

Is ok to treated as flag, but I think maybe there is a bug if isn't contains a ","

I tested the case of not containing "," and indeed it breaks; As a result I removed that || and retested the possible scenarions and now in both cases a Flag (as needed) returns

github-actions · 2023-10-06T17:16:05Z

Coverage after merging nik-toml-example into main

77.17%

Coverage Report

File	Stmts	Branches	Funcs	Lines	Uncovered Lines
crates/configuration/src
global_settings.rs	98.46%	100%	93.33%	99.13%
hrmp_channel.rs	95.88%	100%	89.47%	97.44%
network.rs	99.22%	100%	97.78%	99.36%	117, 122, 130, 175, 80, 88
parachain.rs	97.59%	100%	95.19%	97.85%	51–53, 551–560, 67–70
relaychain.rs	96.60%	100%	92.65%	97.09%	338–347, 77–79
utils.rs	40%	100%	40%	40%	11–13, 15–17, 19–21
crates/configuration/src/shared
errors.rs	50%	100%	50%	50%
helpers.rs	100%	100%	100%	100%
node.rs	98.32%	100%	92.68%	98.93%	124, 130
resources.rs	96.09%	100%	94.52%	96.43%	102, 114, 126–128, 147–150
types.rs	90.40%	100%	84.16%	92.22%	279–281, 350–352, 378–379, 381–383, 60–62
crates/orchestrator/src
errors.rs	0%	100%	0%	0%	8
lib.rs	0%	100%	0%	0%	100–103, 105–108, 112–115, 117–123, 125, 129, 131–146, 150–173, 177–186, 189, 192–196, 198, 200–204, 207–225, 227–232, 234–246, 249–255, 259–261, 264, 267–272, 274–277, 280–284, 287, 289–302, 304–306, 309–313, 315, 317–330, 332–335, 337–339, 343–345, 347–371, 379, 383–384, 394, 401–403, 405–414, 416–417, 419–427, 429–436, 438–439, 44, 440–445, 447–449, 45, 450–458, 46, 461, 47–49, 51–56, 58–64, 66–69, 75, 77–92, 98–99
network.rs	0%	100%	0%	0%	100–108, 111–117, 119–127, 130–155, 157, 159–168, 171, 173–177, 185–188, 190, 192, 194–196, 199–204, 206–208, 210–212, 214–216, 218–220, 222–224, 226–228, 230–232, 32–40, 43, 56–70, 77–82, 85–94, 96, 98–99
network_spec.rs	93.67%	100%	83.33%	95.52%	11, 38
spawner.rs	0%	100%	0%	0%	100–106, 108, 112–114, 117–119, 121, 127–147, 149, 151–168, 17, 40–53, 55–56, 58, 60–63, 67–68, 70, 73–93, 95–99
crates/orchestrator/src/generators
bootnode_addr.rs	97.20%	100%	100%	96.84%
chain_spec.rs	3.24%	100%	5%	3.08%	100–111, 113–128, 130, 135–148, 151–157, 159–161, 164–192, 194–197, 199–201, 203–216, 218–219, 22, 220, 223–225, 227, 229–241, 243, 246–251, 253–254, 256–269, 271, 274–279, 281–282, 285–298, 300–305, 307–309, 311–313, 316–321, 323–352, 355, 358–361, 364, 366–367, 369–379, 38, 380–384, 386, 388–389, 392–397, 405–443, 454–459, 46, 460–462, 472–480, 482–494, 496–504, 507–509, 513–516, 518–519, 524–535, 539–552, 554, 557–558, 561–567, 569–574, 580–585, 587, 589, 591–598, 600–603, 606–607, 611–612, 614, 616–617, 619–623, 625–628, 630, 632–633, 635–636, 638–640, 642–644, 646–648, 651–653, 656–660, 662, 664–672, 674–675, 680–687, 689–699, 703–706, 708, 710, 712–717, 719–729, 731–746, 748–749, 75, 750–755, 757, 76, 761–769, 77, 770–781, 783, 792–802, 804, 806–823, 825–829, 831, 833, 84–87, 95–99
command.rs	0%	100%	0%	0%	100–112, 114–120, 122, 125–130, 132–133, 136–148, 15, 150, 153–155, 157–158, 16, 161–169, 17, 170–179, 18, 180–189, 19, 190–197, 199, 20, 201, 203–209, 21, 210–219, 22, 220–224, 226–229, 23, 231–233, 235–239, 24, 240–243, 246–250, 252–256, 258, 261–269, 271, 274–290, 293–298, 300, 303–305, 307–308, 311–333, 335, 337, 44–62, 64–66, 68–76, 79–97
errors.rs	0%	100%	0%	0%	4
identity.rs	82.35%	100%	60%	86.21%	13
key.rs	95.05%	100%	84.62%	96.59%	31
keystore.rs	0%	100%	0%	0%	19–26, 28–31, 34–46, 48–55, 57–64, 66, 68–86
para_artifact.rs	15.94%	100%	10%	16.95%	12, 18, 25, 44–46, 48–64, 66–69, 72–81, 83–88, 92–93
port.rs	93.75%	100%	83.33%	96.15%
crates/orchestrator/src/network
node.rs	0%	100%	0%	0%	10, 100–105, 107–109, 111–114, 116–120, 124–132, 24–39, 43–46, 50–53, 56–59, 66–71, 81–90, 93–95, 97, 99
parachain.rs	0%	100%	0%	0%	100, 102–105, 15, 25–33, 35–47, 49–53, 56–60, 63–70, 72, 74, 77–82, 85–86, 88–93, 97–99
relaychain.rs	0%	100%	0%	0%	14–21, 5
crates/orchestrator/src/network_helper
verifier.rs	0%	100%	0%	0%	10–11, 16, 18–25, 27–32, 34, 7–9
crates/orchestrator/src/network_spec
node.rs	39.17%	100%	16.67%	40.35%	108, 146–150, 152–153, 155, 158, 16, 160–163, 165–168, 173–178, 180, 183, 185–215, 217, 90–91, 93–96
parachain.rs	72.04%	100%	50%	73.03%	100, 107, 125, 130–133, 136, 147–150, 153, 17, 71–73, 76, 78–80, 86, 95
relaychain.rs	88.71%	100%	66.67%	91.07%	100, 17, 70, 93
crates/orchestrator/src/shared
types.rs	26.09%	100%	11.76%	34.48%	15, 30, 36, 45–49, 52, 61, 72
crates/prom-metrics-parser/src
lib.rs	91.94%	100%	80%	92.98%	105, 127, 55–57, 7, 81
crates/provider/src
lib.rs	25%	100%	0%	50%
native.rs	90.40%	100%	81.88%	91.52%	1020, 1024, 1057, 1066, 1087, 1094, 1125, 1152, 1176, 1181, 1209, 1235, 1245, 1252, 1269, 1319, 132, 1376–1378, 1423, 1499–1500, 1524, 155, 1565, 190–194, 262, 281, 294, 296, 303, 305–306, 319, 341, 355–357, 359–361, 363–365, 387–389, 391–393, 41, 434, 454, 49, 503, 552, 581–582, 587–589, 707, 799, 806, 811, 816, 821, 828, 841, 90, 912, 936, 941, 945, 974, 990
crates/provider/src/shared
types.rs	84.47%	100%	74.29%	86.41%	123, 140–146, 15–18, 230, 249–256, 79
crates/support/src
fs.rs	75%	100%	66.67%	80%
net.rs	0%	100%	0%	0%	10, 4–9
crates/support/src/fs
in_memory.rs	95.55%	100%	96.48%	95.37%	149, 271, 321, 372, 424, 432, 440, 448, 470, 478, 593, 615, 643, 660, 678, 685, 704, 731, 748, 79–82, 84, 86–89, 91, 96
local.rs	98.25%	100%	96.30%	98.75%	51, 8
crates/test-runner/src
lib.rs	100%	100%	100%	100%

wirednkod added 13 commits October 5, 2023 11:16

add simple example

dac5721

tmp

28a106d

Fix the command to be used in case default_command is missing

ed31a0c

Fix is_bootnode to be optional

ea376aa

Fix the bootnode with serde-default

9b24cc7

Fix the default duration of node_spawn_timeout

0ea298b

make the duration node_spawn_timeout based on value input on default …

aed41e3

…function

Remove check on optional chain name of Parachain

21a1e57

Finalize example moved from polkadot-sdk

a5832f9

fmt

513246b

minor fix

bc0ac2f

various fixes

e6ec6ee

resolve conflicts

77ff963

wirednkod requested review from l0r1s and pepoviola October 6, 2023 13:36

wirednkod added 4 commits October 6, 2023 16:41

fmt

7803539

Run clippy

bce805b

Minor fixes and support backward compatibility

b1bd35e

Minor fixes and support backward compatibility

e8be448

pepoviola reviewed Oct 6, 2023

View reviewed changes

Address comment

79a0355

wirednkod requested a review from pepoviola October 6, 2023 16:27

pepoviola approved these changes Oct 6, 2023

View reviewed changes

fix test

a0c52d0

wirednkod merged commit 3807ece into main Oct 6, 2023

wirednkod deleted the nik-toml-example branch October 6, 2023 17:20

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix various bugs #119

Fix various bugs #119

wirednkod commented Oct 6, 2023

github-actions bot commented Oct 6, 2023

pepoviola Oct 6, 2023

wirednkod Oct 6, 2023

pepoviola Oct 6, 2023

wirednkod Oct 6, 2023

github-actions bot commented Oct 6, 2023

Fix various bugs #119

Fix various bugs #119

Conversation

wirednkod commented Oct 6, 2023

github-actions bot commented Oct 6, 2023

pepoviola Oct 6, 2023

Choose a reason for hiding this comment

wirednkod Oct 6, 2023

Choose a reason for hiding this comment

pepoviola Oct 6, 2023

Choose a reason for hiding this comment

wirednkod Oct 6, 2023

Choose a reason for hiding this comment

github-actions bot commented Oct 6, 2023