Skip to content

Commit 7c38f2d

Browse files
josibakejosibake
committed
remove more version
1 parent 21b49fe commit 7c38f2d

File tree

7 files changed

+26
-32
lines changed

7 files changed

+26
-32
lines changed

‎test/data/6_node_ring.graphml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?><graphml xmlns="http://graphml.graphdrawing.org/xmlns">
22
<key id="services" attr.name="services" attr.type="string" for="graph" />
3-
<key id="version" attr.name="version" attr.type="string" for="node" />
43
<key id="image" attr.name="image" attr.type="string" for="node" />
54
<key id="bitcoin_config" attr.name="bitcoin_config" attr.type="string" for="node" />
65
<key id="tc_netem" attr.name="tc_netem" attr.type="string" for="node" />
@@ -17,27 +16,27 @@
1716
<key id="target_policy" attr.name="target_policy" attr.type="string" for="edge" />
1817
<graph edgedefault="directed">
1918
<node id="0">
20-
<data key="version">27.0</data>
19+
<data key="image">bitcoindevproject/bitcoin:27.0</data>
2120
<data key="bitcoin_config">-uacomment=w0 -debug=validation</data>
2221
</node>
2322
<node id="1">
24-
<data key="version">27.0</data>
23+
<data key="image">bitcoindevproject/bitcoin:27.0</data>
2524
<data key="bitcoin_config">-uacomment=w1 -debug=validation</data>
2625
</node>
2726
<node id="2">
28-
<data key="version">27.0</data>
27+
<data key="image">bitcoindevproject/bitcoin:27.0</data>
2928
<data key="bitcoin_config">-uacomment=w2 -debug=validation</data>
3029
</node>
3130
<node id="3">
32-
<data key="version">27.0</data>
31+
<data key="image">bitcoindevproject/bitcoin:27.0</data>
3332
<data key="bitcoin_config">-uacomment=w3</data>
3433
</node>
3534
<node id="4">
36-
<data key="version">27.0</data>
35+
<data key="image">bitcoindevproject/bitcoin:27.0</data>
3736
<data key="bitcoin_config">-uacomment=w4</data>
3837
</node>
3938
<node id="5">
40-
<data key="version">27.0</data>
39+
<data key="image">bitcoindevproject/bitcoin:27.0</data>
4140
<!-- no bitcoin_config to test unused options -->
4241
</node>
4342
<!-- connect the nodes in a ring to start -->

‎test/data/ln.graphml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?><graphml xmlns="http://graphml.graphdrawing.org/xmlns">
22
<key id="services" attr.name="services" attr.type="string" for="graph" />
3-
<key id="version" attr.name="version" attr.type="string" for="node" />
43
<key id="image" attr.name="image" attr.type="string" for="node" />
54
<key id="bitcoin_config" attr.name="bitcoin_config" attr.type="string" for="node" />
65
<key id="tc_netem" attr.name="tc_netem" attr.type="string" for="node" />
@@ -18,34 +17,34 @@
1817
<graph edgedefault="directed">
1918
<data key="services">simln</data>
2019
<node id="0">
21-
<data key="version">27.0</data>
20+
<data key="image">bitcoindevproject/bitcoin:27.0</data>
2221
<data key="bitcoin_config">-uacomment=w0</data>
2322
<data key="ln">lnd</data>
2423
<data key="ln_image">lightninglabs/lnd:v0.17.5-beta</data>
2524
<data key="collect_logs">true</data>
2625
</node>
2726
<node id="1">
28-
<data key="version">27.0</data>
27+
<data key="image">bitcoindevproject/bitcoin:27.0</data>
2928
<data key="bitcoin_config">-uacomment=w1</data>
3029
<data key="ln">lnd</data>
3130
<data key="ln_cb_image">pinheadmz/circuitbreaker:278737d</data>
3231
<data key="collect_logs">true</data>
3332
</node>
3433
<node id="2">
35-
<data key="version">27.0</data>
34+
<data key="image">bitcoindevproject/bitcoin:27.0</data>
3635
<data key="bitcoin_config">-uacomment=w2</data>
3736
<data key="ln">lnd</data>
3837
<data key="ln_cb_image">pinheadmz/circuitbreaker:278737d</data>
3938
<data key="ln_config">--bitcoin.timelockdelta=33</data>
4039
</node>
4140
<node id="3">
42-
<data key="version">27.0</data>
41+
<data key="image">bitcoindevproject/bitcoin:27.0</data>
4342
<data key="bitcoin_config">-uacomment=w2</data>
4443
<data key="ln">cln</data>
4544
<data key="ln_config">--cltv-delta=33</data>
4645
</node>
4746
<node id="4">
48-
<data key="version">27.0</data>
47+
<data key="image">bitcoindevproject/bitcoin:27.0</data>
4948
<data key="bitcoin_config">-uacomment=w3</data>
5049
</node>
5150
<edge id="1" source="0" target="1"></edge>
@@ -68,4 +67,4 @@
6867
<data key="source_policy"> feebase=5500 feeppm=3</data>
6968
</edge>
7069
</graph>
71-
</graphml>
70+
</graphml>

‎test/data/logging.graphml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?><graphml xmlns="http://graphml.graphdrawing.org/xmlns">
22
<key id="services" attr.name="services" attr.type="string" for="graph" />
3-
<key id="version" attr.name="version" attr.type="string" for="node" />
43
<key id="image" attr.name="image" attr.type="string" for="node" />
54
<key id="bitcoin_config" attr.name="bitcoin_config" attr.type="string" for="node" />
65
<key id="tc_netem" attr.name="tc_netem" attr.type="string" for="node" />
@@ -17,11 +16,11 @@
1716
<key id="target_policy" attr.name="target_policy" attr.type="string" for="edge" />
1817
<graph edgedefault="directed">
1918
<node id="0">
20-
<data key="version">27.0</data>
19+
<data key="image">bitcoindevproject/bitcoin:27.0</data>
2120
<data key="exporter">true</data>
2221
</node>
2322
<node id="1">
24-
<data key="version">27.0</data>
23+
<data key="image">bitcoindevproject/bitcoin:27.0</data>
2524
<data key="exporter">true</data>
2625
<data key="metrics">txrate=getchaintxstats(10)["txrate"]</data>
2726
</node>

‎test/data/permutations.graphml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?><graphml xmlns="http://graphml.graphdrawing.org/xmlns">
22
<key id="services" attr.name="services" attr.type="string" for="graph" />
3-
<key id="version" attr.name="version" attr.type="string" for="node" />
43
<key id="image" attr.name="image" attr.type="string" for="node" />
54
<key id="bitcoin_config" attr.name="bitcoin_config" attr.type="string" for="node" />
65
<key id="tc_netem" attr.name="tc_netem" attr.type="string" for="node" />
@@ -17,7 +16,7 @@
1716
<key id="target_policy" attr.name="target_policy" attr.type="string" for="edge" />
1817
<graph edgedefault="directed">
1918
<node id="0">
20-
<data key="version">27.0</data>
19+
<data key="image">bitcoindevproject/bitcoin:27.0</data>
2120
<data key="bitcoin_config" />
2221
<data key="tc_netem" />
2322
<data key="build_args" />
@@ -33,31 +32,31 @@
3332
<data key="collect_logs">False</data>
3433
</node>
3534
<node id="2">
36-
<data key="version">27.0</data>
35+
<data key="image">bitcoindevproject/bitcoin:27.0</data>
3736
<data key="bitcoin_config" />
3837
<data key="tc_netem" />
3938
<data key="build_args" />
4039
<data key="exporter">False</data>
4140
<data key="collect_logs">False</data>
4241
</node>
4342
<node id="3">
44-
<data key="version">27.0</data>
43+
<data key="image">bitcoindevproject/bitcoin:27.0</data>
4544
<data key="bitcoin_config" />
4645
<data key="tc_netem" />
4746
<data key="build_args" />
4847
<data key="exporter">False</data>
4948
<data key="collect_logs">False</data>
5049
</node>
5150
<node id="4">
52-
<data key="version">27.0</data>
51+
<data key="image">bitcoindevproject/bitcoin:27.0</data>
5352
<data key="bitcoin_config" />
5453
<data key="tc_netem" />
5554
<data key="build_args" />
5655
<data key="exporter">False</data>
5756
<data key="collect_logs">False</data>
5857
</node>
5958
<node id="5">
60-
<data key="version">27.0</data>
59+
<data key="image">bitcoindevproject/bitcoin:27.0</data>
6160
<data key="bitcoin_config" />
6261
<data key="tc_netem" />
6362
<data key="build_args" />

‎test/data/services.graphml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?><graphml xmlns="http://graphml.graphdrawing.org/xmlns">
22
<key id="services" attr.name="services" attr.type="string" for="graph" />
3-
<key id="version" attr.name="version" attr.type="string" for="node" />
43
<key id="image" attr.name="image" attr.type="string" for="node" />
54
<key id="bitcoin_config" attr.name="bitcoin_config" attr.type="string" for="node" />
65
<key id="tc_netem" attr.name="tc_netem" attr.type="string" for="node" />
@@ -18,7 +17,7 @@
1817
<graph edgedefault="directed">
1918
<!-- <data key="services">cadvisor forkobserver addrmanobserver grafana nodeexporter prometheus</data> -->
2019
<node id="0">
21-
<data key="version">27.0</data>
20+
<data key="image">bitcoindevproject/bitcoin:27.0</data>
2221
<data key="bitcoin_config">-uacomment=w0 -debug=validation</data>
2322
<data key="exporter">true</data>
2423
<data key="ln">lnd</data>

‎test/data/six_semi_unconnected.graphml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?><graphml xmlns="http://graphml.graphdrawing.org/xmlns">
22
<key id="services" attr.name="services" attr.type="string" for="graph" />
3-
<key id="version" attr.name="version" attr.type="string" for="node" />
43
<key id="image" attr.name="image" attr.type="string" for="node" />
54
<key id="bitcoin_config" attr.name="bitcoin_config" attr.type="string" for="node" />
65
<key id="tc_netem" attr.name="tc_netem" attr.type="string" for="node" />
@@ -17,7 +16,7 @@
1716
<key id="target_policy" attr.name="target_policy" attr.type="string" for="edge" />
1817
<graph edgedefault="directed">
1918
<node id="0">
20-
<data key="version">26.0</data>
19+
<data key="image">bitcoindevproject/bitcoin:26.0</data>
2120
<data key="bitcoin_config" />
2221
<data key="tc_netem" />
2322
<data key="build_args" />
@@ -33,31 +32,31 @@
3332
<data key="collect_logs">False</data>
3433
</node>
3534
<node id="2">
36-
<data key="version">26.0</data>
35+
<data key="image">bitcoindevproject/bitcoin:26.0</data>
3736
<data key="bitcoin_config" />
3837
<data key="tc_netem" />
3938
<data key="build_args" />
4039
<data key="exporter">False</data>
4140
<data key="collect_logs">False</data>
4241
</node>
4342
<node id="3">
44-
<data key="version">26.0</data>
43+
<data key="image">bitcoindevproject/bitcoin:26.0</data>
4544
<data key="bitcoin_config" />
4645
<data key="tc_netem" />
4746
<data key="build_args" />
4847
<data key="exporter">False</data>
4948
<data key="collect_logs">False</data>
5049
</node>
5150
<node id="4">
52-
<data key="version">26.0</data>
51+
<data key="image">bitcoindevproject/bitcoin:26.0</data>
5352
<data key="bitcoin_config" />
5453
<data key="tc_netem" />
5554
<data key="build_args" />
5655
<data key="exporter">False</data>
5756
<data key="collect_logs">False</data>
5857
</node>
5958
<node id="5">
60-
<data key="version">26.0</data>
59+
<data key="image">bitcoindevproject/bitcoin:26.0</data>
6160
<data key="bitcoin_config" />
6261
<data key="tc_netem" />
6362
<data key="build_args" />

‎test/graph_test.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def test_graph_creation_and_import(self):
3737
self.log.info(f"CLI tool creating test graph file: {self.tf_create}")
3838
self.log.info(
3939
self.warcli(
40-
f"graph create 10 --outfile={self.tf_create} --version={DEFAULT_TAG}", network=False
40+
f"graph create 10 --outfile={self.tf_create}", network=False
4141
)
4242
)
4343
self.wait_for_predicate(lambda: Path(self.tf_create).exists())

0 commit comments

Comments
 (0)