Skip to content

Commit 793bfa3

Browse files
ArturWieczorekArturWieczorek
authored
Merge branch 'master' into artur/update_cabal_build_tests
2 parents 0c32015 + ce7a12a commit 793bfa3

15 files changed

+178
-130
lines changed

‎.github/workflows/regression-dbsync.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,14 @@ on:
4343
- legacy
4444
- mixed
4545
default: p2p
46+
utxo_backend:
47+
type: choice
48+
description: "UTxO backend"
49+
options:
50+
- ""
51+
- mem
52+
- disk
53+
default: ""
4654
byron_cluster:
4755
type: boolean
4856
default: false
@@ -68,6 +76,7 @@ jobs:
6876
cluster_era: ${{ inputs.cluster_era }}
6977
markexpr: ${{ inputs.markexpr }}
7078
topology: ${{ inputs.topology }}
79+
utxo_backend: ${{ inputs.utxo_backend }}
7180
byron_cluster: ${{ inputs.byron_cluster }}
7281
testrun_name: ${{ inputs.testrun_name }}
7382
skip_passed: ${{ inputs.skip_passed }}

‎.github/workflows/regression.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,14 @@ on:
3636
- legacy
3737
- mixed
3838
default: p2p
39+
utxo_backend:
40+
type: choice
41+
description: "UTxO backend"
42+
options:
43+
- ""
44+
- mem
45+
- disk
46+
default: ""
3947
byron_cluster:
4048
type: boolean
4149
default: false
@@ -60,6 +68,7 @@ jobs:
6068
cluster_era: ${{ inputs.cluster_era }}
6169
markexpr: ${{ inputs.markexpr }}
6270
topology: ${{ inputs.topology }}
71+
utxo_backend: ${{ inputs.utxo_backend }}
6372
byron_cluster: ${{ inputs.byron_cluster }}
6473
testrun_name: ${{ inputs.testrun_name }}
6574
skip_passed: ${{ inputs.skip_passed }}

‎.github/workflows/regression_reusable.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ on:
3535
required: false
3636
type: string
3737
default: ""
38+
utxo_backend:
39+
required: false
40+
type: string
41+
default: ""
3842
scripts_dirname:
3943
required: false
4044
type: string
@@ -94,6 +98,7 @@ jobs:
9498
echo "MARKEXPR=${{ inputs.markexpr }}" >> .github_ci_env
9599
echo "SCRIPTS_DIRNAME=${{ inputs.scripts_dirname }}" >> .github_ci_env
96100
echo "CI_TOPOLOGY=${{ inputs.topology }}" >> .github_ci_env
101+
echo "UTXO_BACKEND=${{ inputs.utxo_backend }}" >> .github_ci_env
97102
echo "CI_BYRON_CLUSTER=${{ inputs.byron_cluster }}" >> .github_ci_env
98103
echo "CI_TESTRUN_NAME=${{ inputs.testrun_name }}" >> .github_ci_env
99104
echo "CI_SKIP_PASSED=${{ inputs.skip_passed }}" >> .github_ci_env

‎cardano_node_tests/cluster_scripts/conway/cardano-node-bft1

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,5 @@
11
#!/usr/bin/env bash
22

3-
if [ -e ./state-cluster%%INSTANCE_NUM%%/utxo_backend ]; then
4-
UTXO_BACKEND="$(<./state-cluster%%INSTANCE_NUM%%/utxo_backend)"
5-
fi
6-
7-
case "${UTXO_BACKEND:-""}" in
8-
mem)
9-
UTXO_BACKEND_ARGS=("--utxos-in-memory")
10-
;;
11-
disk)
12-
UTXO_BACKEND_ARGS=("--utxos-on-disk")
13-
;;
14-
*)
15-
UTXO_BACKEND_ARGS=()
16-
;;
17-
esac
18-
193
echo "Starting cardano-node run with PID $$: cardano-node run"
204
echo "--config ./state-cluster%%INSTANCE_NUM%%/config-bft1.json"
215
echo "--database-path ./state-cluster%%INSTANCE_NUM%%/db-bft1"
@@ -27,10 +11,10 @@ echo "Starting cardano-node run with PID $$: cardano-node run"
2711
echo "--delegation-certificate ./state-cluster%%INSTANCE_NUM%%/nodes/node-bft1/byron-deleg.json"
2812
echo "--shelley-vrf-key ./state-cluster%%INSTANCE_NUM%%/nodes/node-bft1/vrf.skey"
2913
echo "--shelley-kes-key ./state-cluster%%INSTANCE_NUM%%/nodes/node-bft1/kes.skey"
30-
echo "--shelley-operational-certificate ./state-cluster%%INSTANCE_NUM%%/nodes/node-bft1/op.cert ${UTXO_BACKEND_ARGS[*]} $*"
14+
echo "--shelley-operational-certificate ./state-cluster%%INSTANCE_NUM%%/nodes/node-bft1/op.cert $*"
3115

3216
echo "..or, once again, in a single line:"
33-
echo "cardano-node run --config ./state-cluster%%INSTANCE_NUM%%/config-bft1.json --database-path ./state-cluster%%INSTANCE_NUM%%/db-bft1 --topology ./state-cluster%%INSTANCE_NUM%%/topology-bft1.json --host-addr 127.0.0.1 --port %%NODE_PORT_BASE%% --socket-path ./state-cluster%%INSTANCE_NUM%%/bft1.socket --signing-key ./state-cluster%%INSTANCE_NUM%%/nodes/node-bft1/byron-deleg.key --delegation-certificate ./state-cluster%%INSTANCE_NUM%%/nodes/node-bft1/byron-deleg.json --shelley-vrf-key ./state-cluster%%INSTANCE_NUM%%/nodes/node-bft1/vrf.skey --shelley-kes-key ./state-cluster%%INSTANCE_NUM%%/nodes/node-bft1/kes.skey --shelley-operational-certificate ./state-cluster%%INSTANCE_NUM%%/nodes/node-bft1/op.cert ${UTXO_BACKEND_ARGS[*]} $*"
17+
echo "cardano-node run --config ./state-cluster%%INSTANCE_NUM%%/config-bft1.json --database-path ./state-cluster%%INSTANCE_NUM%%/db-bft1 --topology ./state-cluster%%INSTANCE_NUM%%/topology-bft1.json --host-addr 127.0.0.1 --port %%NODE_PORT_BASE%% --socket-path ./state-cluster%%INSTANCE_NUM%%/bft1.socket --signing-key ./state-cluster%%INSTANCE_NUM%%/nodes/node-bft1/byron-deleg.key --delegation-certificate ./state-cluster%%INSTANCE_NUM%%/nodes/node-bft1/byron-deleg.json --shelley-vrf-key ./state-cluster%%INSTANCE_NUM%%/nodes/node-bft1/vrf.skey --shelley-kes-key ./state-cluster%%INSTANCE_NUM%%/nodes/node-bft1/kes.skey --shelley-operational-certificate ./state-cluster%%INSTANCE_NUM%%/nodes/node-bft1/op.cert $*"
3418

3519

36-
exec cardano-node run --config ./state-cluster%%INSTANCE_NUM%%/config-bft1.json --database-path ./state-cluster%%INSTANCE_NUM%%/db-bft1 --topology ./state-cluster%%INSTANCE_NUM%%/topology-bft1.json --host-addr 127.0.0.1 --port %%NODE_PORT_BASE%% --socket-path ./state-cluster%%INSTANCE_NUM%%/bft1.socket --signing-key ./state-cluster%%INSTANCE_NUM%%/nodes/node-bft1/byron-deleg.key --delegation-certificate ./state-cluster%%INSTANCE_NUM%%/nodes/node-bft1/byron-deleg.json --shelley-vrf-key ./state-cluster%%INSTANCE_NUM%%/nodes/node-bft1/vrf.skey --shelley-kes-key ./state-cluster%%INSTANCE_NUM%%/nodes/node-bft1/kes.skey --shelley-operational-certificate ./state-cluster%%INSTANCE_NUM%%/nodes/node-bft1/op.cert "${UTXO_BACKEND_ARGS[@]}" "$@"
20+
exec cardano-node run --config ./state-cluster%%INSTANCE_NUM%%/config-bft1.json --database-path ./state-cluster%%INSTANCE_NUM%%/db-bft1 --topology ./state-cluster%%INSTANCE_NUM%%/topology-bft1.json --host-addr 127.0.0.1 --port %%NODE_PORT_BASE%% --socket-path ./state-cluster%%INSTANCE_NUM%%/bft1.socket --signing-key ./state-cluster%%INSTANCE_NUM%%/nodes/node-bft1/byron-deleg.key --delegation-certificate ./state-cluster%%INSTANCE_NUM%%/nodes/node-bft1/byron-deleg.json --shelley-vrf-key ./state-cluster%%INSTANCE_NUM%%/nodes/node-bft1/vrf.skey --shelley-kes-key ./state-cluster%%INSTANCE_NUM%%/nodes/node-bft1/kes.skey --shelley-operational-certificate ./state-cluster%%INSTANCE_NUM%%/nodes/node-bft1/op.cert "$@"

‎cardano_node_tests/cluster_scripts/conway/start-cluster

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,9 +229,9 @@ else
229229
cp "$SCRIPT_DIR"/topology-*.json "$STATE_CLUSTER"
230230
fi
231231

232+
LIVE_TABLES_BASE="${STATE_CLUSTER_NAME}/lmdb"
232233
case "${UTXO_BACKEND:=""}" in
233234
"" | mem | disk)
234-
echo "$UTXO_BACKEND" > "${STATE_CLUSTER}/utxo_backend"
235235
;;
236236
*)
237237
echo "Unknown \`UTXO_BACKEND\`: '$UTXO_BACKEND', line $LINENO" >&2
@@ -390,16 +390,32 @@ CONWAY_GENESIS_HASH="$(cardano_cli_log latest genesis hash --genesis \
390390

391391
for conf in "$SCRIPT_DIR"/config-*.json; do
392392
fname="${conf##*/}"
393+
node_name="${fname##config-}"
394+
node_name="${node_name%.json}"
395+
393396
jq \
394397
--arg byron_hash "$BYRON_GENESIS_HASH" \
395398
--arg shelley_hash "$SHELLEY_GENESIS_HASH" \
396399
--arg alonzo_hash "$ALONZO_GENESIS_HASH" \
397400
--arg conway_hash "$CONWAY_GENESIS_HASH" \
401+
--arg backend "$UTXO_BACKEND" \
402+
--arg live_tables_path "${LIVE_TABLES_BASE}-${node_name}" \
398403
'.ByronGenesisHash = $byron_hash
399404
| .ShelleyGenesisHash = $shelley_hash
400405
| .AlonzoGenesisHash = $alonzo_hash
401-
| .ConwayGenesisHash = $conway_hash' \
402-
"$conf" > "${STATE_CLUSTER}/${fname}"
406+
| .ConwayGenesisHash = $conway_hash
407+
| if $backend == "mem" then
408+
.LedgerDB.Backend = "V2InMemory"
409+
elif $backend == "disk" then
410+
(.LedgerDB.Backend = "V1LMDB"
411+
| .LedgerDB.LiveTablesPath = $live_tables_path)
412+
elif has("LedgerDB") then
413+
.LedgerDB |= del(.Backend)
414+
else
415+
.
416+
end
417+
| if (.LedgerDB? // {}) == {} then del(.LedgerDB) else . end
418+
' "$conf" > "${STATE_CLUSTER}/${fname}"
403419

404420
# enable P2P
405421
if [ -z "${ENABLE_LEGACY:-""}" ]; then

‎cardano_node_tests/cluster_scripts/conway/template-cardano-node-pool

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,5 @@
11
#!/usr/bin/env bash
22

3-
if [ -e ./state-cluster%%INSTANCE_NUM%%/utxo_backend ]; then
4-
UTXO_BACKEND="$(<./state-cluster%%INSTANCE_NUM%%/utxo_backend)"
5-
fi
6-
7-
case "${UTXO_BACKEND:-""}" in
8-
mem)
9-
UTXO_BACKEND_ARGS=("--utxos-in-memory")
10-
;;
11-
disk)
12-
UTXO_BACKEND_ARGS=("--utxos-on-disk")
13-
;;
14-
*)
15-
UTXO_BACKEND_ARGS=()
16-
;;
17-
esac
18-
193
echo "Starting cardano-node run with PID $$: cardano-node run"
204
echo "--config ./state-cluster%%INSTANCE_NUM%%/config-pool%%POOL_NUM%%.json"
215
echo "--database-path ./state-cluster%%INSTANCE_NUM%%/db-pool%%POOL_NUM%%"
@@ -25,10 +9,10 @@ echo "Starting cardano-node run with PID $$: cardano-node run"
259
echo "--socket-path ./state-cluster%%INSTANCE_NUM%%/pool%%POOL_NUM%%.socket"
2610
echo "--shelley-vrf-key ./state-cluster%%INSTANCE_NUM%%/nodes/node-pool%%POOL_NUM%%/vrf.skey"
2711
echo "--shelley-kes-key ./state-cluster%%INSTANCE_NUM%%/nodes/node-pool%%POOL_NUM%%/kes.skey"
28-
echo "--shelley-operational-certificate ./state-cluster%%INSTANCE_NUM%%/nodes/node-pool%%POOL_NUM%%/op.cert ${UTXO_BACKEND_ARGS[*]} $*"
12+
echo "--shelley-operational-certificate ./state-cluster%%INSTANCE_NUM%%/nodes/node-pool%%POOL_NUM%%/op.cert $*"
2913

3014
echo "..or, once again, in a single line:"
31-
echo "cardano-node run --config ./state-cluster%%INSTANCE_NUM%%/config-pool%%POOL_NUM%%.json --database-path ./state-cluster%%INSTANCE_NUM%%/db-pool%%POOL_NUM%% --topology ./state-cluster%%INSTANCE_NUM%%/topology-pool%%POOL_NUM%%.json --host-addr 127.0.0.1 --port %%NODE_PORT%% --socket-path ./state-cluster%%INSTANCE_NUM%%/pool%%POOL_NUM%%.socket --shelley-vrf-key ./state-cluster%%INSTANCE_NUM%%/nodes/node-pool%%POOL_NUM%%/vrf.skey --shelley-kes-key ./state-cluster%%INSTANCE_NUM%%/nodes/node-pool%%POOL_NUM%%/kes.skey --shelley-operational-certificate ./state-cluster%%INSTANCE_NUM%%/nodes/node-pool%%POOL_NUM%%/op.cert ${UTXO_BACKEND_ARGS[*]} $*"
15+
echo "cardano-node run --config ./state-cluster%%INSTANCE_NUM%%/config-pool%%POOL_NUM%%.json --database-path ./state-cluster%%INSTANCE_NUM%%/db-pool%%POOL_NUM%% --topology ./state-cluster%%INSTANCE_NUM%%/topology-pool%%POOL_NUM%%.json --host-addr 127.0.0.1 --port %%NODE_PORT%% --socket-path ./state-cluster%%INSTANCE_NUM%%/pool%%POOL_NUM%%.socket --shelley-vrf-key ./state-cluster%%INSTANCE_NUM%%/nodes/node-pool%%POOL_NUM%%/vrf.skey --shelley-kes-key ./state-cluster%%INSTANCE_NUM%%/nodes/node-pool%%POOL_NUM%%/kes.skey --shelley-operational-certificate ./state-cluster%%INSTANCE_NUM%%/nodes/node-pool%%POOL_NUM%%/op.cert $*"
3216

3317

34-
exec cardano-node run --config ./state-cluster%%INSTANCE_NUM%%/config-pool%%POOL_NUM%%.json --database-path ./state-cluster%%INSTANCE_NUM%%/db-pool%%POOL_NUM%% --topology ./state-cluster%%INSTANCE_NUM%%/topology-pool%%POOL_NUM%%.json --host-addr 127.0.0.1 --port %%NODE_PORT%% --socket-path ./state-cluster%%INSTANCE_NUM%%/pool%%POOL_NUM%%.socket --shelley-vrf-key ./state-cluster%%INSTANCE_NUM%%/nodes/node-pool%%POOL_NUM%%/vrf.skey --shelley-kes-key ./state-cluster%%INSTANCE_NUM%%/nodes/node-pool%%POOL_NUM%%/kes.skey --shelley-operational-certificate ./state-cluster%%INSTANCE_NUM%%/nodes/node-pool%%POOL_NUM%%/op.cert "${UTXO_BACKEND_ARGS[@]}" "$@"
18+
exec cardano-node run --config ./state-cluster%%INSTANCE_NUM%%/config-pool%%POOL_NUM%%.json --database-path ./state-cluster%%INSTANCE_NUM%%/db-pool%%POOL_NUM%% --topology ./state-cluster%%INSTANCE_NUM%%/topology-pool%%POOL_NUM%%.json --host-addr 127.0.0.1 --port %%NODE_PORT%% --socket-path ./state-cluster%%INSTANCE_NUM%%/pool%%POOL_NUM%%.socket --shelley-vrf-key ./state-cluster%%INSTANCE_NUM%%/nodes/node-pool%%POOL_NUM%%/vrf.skey --shelley-kes-key ./state-cluster%%INSTANCE_NUM%%/nodes/node-pool%%POOL_NUM%%/kes.skey --shelley-operational-certificate ./state-cluster%%INSTANCE_NUM%%/nodes/node-pool%%POOL_NUM%%/op.cert "$@"

‎cardano_node_tests/cluster_scripts/conway_fast/cardano-node-bft1

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,15 @@
11
#!/usr/bin/env bash
22

3-
if [ -e ./state-cluster%%INSTANCE_NUM%%/utxo_backend ]; then
4-
UTXO_BACKEND="$(<./state-cluster%%INSTANCE_NUM%%/utxo_backend)"
5-
fi
6-
7-
case "${UTXO_BACKEND:-""}" in
8-
mem)
9-
UTXO_BACKEND_ARGS=("--utxos-in-memory")
10-
;;
11-
disk)
12-
UTXO_BACKEND_ARGS=("--utxos-on-disk")
13-
;;
14-
*)
15-
UTXO_BACKEND_ARGS=()
16-
;;
17-
esac
18-
193
echo "Starting cardano-node run with PID $$: cardano-node run"
204
echo "--config ./state-cluster%%INSTANCE_NUM%%/config-bft1.json"
215
echo "--database-path ./state-cluster%%INSTANCE_NUM%%/db-bft1"
226
echo "--topology ./state-cluster%%INSTANCE_NUM%%/topology-bft1.json"
237
echo "--host-addr 127.0.0.1"
248
echo "--port %%NODE_PORT_BASE%%"
25-
echo "--socket-path ./state-cluster%%INSTANCE_NUM%%/bft1.socket ${UTXO_BACKEND_ARGS[*]} $*"
9+
echo "--socket-path ./state-cluster%%INSTANCE_NUM%%/bft1.socket $*"
2610

2711
echo "..or, once again, in a single line:"
28-
echo "cardano-node run --config ./state-cluster%%INSTANCE_NUM%%/config-bft1.json --database-path ./state-cluster%%INSTANCE_NUM%%/db-bft1 --topology ./state-cluster%%INSTANCE_NUM%%/topology-bft1.json --host-addr 127.0.0.1 --port %%NODE_PORT_BASE%% --socket-path ./state-cluster%%INSTANCE_NUM%%/bft1.socket ${UTXO_BACKEND_ARGS[*]} $*"
12+
echo "cardano-node run --config ./state-cluster%%INSTANCE_NUM%%/config-bft1.json --database-path ./state-cluster%%INSTANCE_NUM%%/db-bft1 --topology ./state-cluster%%INSTANCE_NUM%%/topology-bft1.json --host-addr 127.0.0.1 --port %%NODE_PORT_BASE%% --socket-path ./state-cluster%%INSTANCE_NUM%%/bft1.socket $*"
2913

3014

31-
exec cardano-node run --config ./state-cluster%%INSTANCE_NUM%%/config-bft1.json --database-path ./state-cluster%%INSTANCE_NUM%%/db-bft1 --topology ./state-cluster%%INSTANCE_NUM%%/topology-bft1.json --host-addr 127.0.0.1 --port %%NODE_PORT_BASE%% --socket-path ./state-cluster%%INSTANCE_NUM%%/bft1.socket "${UTXO_BACKEND_ARGS[@]}" "$@"
15+
exec cardano-node run --config ./state-cluster%%INSTANCE_NUM%%/config-bft1.json --database-path ./state-cluster%%INSTANCE_NUM%%/db-bft1 --topology ./state-cluster%%INSTANCE_NUM%%/topology-bft1.json --host-addr 127.0.0.1 --port %%NODE_PORT_BASE%% --socket-path ./state-cluster%%INSTANCE_NUM%%/bft1.socket "$@"

‎cardano_node_tests/cluster_scripts/conway_fast/start-cluster

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,9 @@ else
168168
cp "$SCRIPT_DIR"/topology-*.json "$STATE_CLUSTER"
169169
fi
170170

171+
LIVE_TABLES_BASE="${STATE_CLUSTER_NAME}/lmdb"
171172
case "${UTXO_BACKEND:=""}" in
172173
"" | mem | disk)
173-
echo "$UTXO_BACKEND" > "${STATE_CLUSTER}/utxo_backend"
174174
;;
175175
*)
176176
echo "Unknown \`UTXO_BACKEND\`: '$UTXO_BACKEND', line $LINENO" >&2
@@ -338,18 +338,34 @@ CONWAY_GENESIS_HASH="$(cardano_cli_log latest genesis hash --genesis \
338338

339339
for conf in "$SCRIPT_DIR"/config-*.json; do
340340
fname="${conf##*/}"
341+
node_name="${fname##config-}"
342+
node_name="${node_name%.json}"
343+
341344
jq \
342345
--arg byron_hash "$BYRON_GENESIS_HASH" \
343346
--arg shelley_hash "$SHELLEY_GENESIS_HASH" \
344347
--arg alonzo_hash "$ALONZO_GENESIS_HASH" \
345348
--arg conway_hash "$CONWAY_GENESIS_HASH" \
346349
--argjson prot_ver "$PROTOCOL_VERSION" \
350+
--arg backend "$UTXO_BACKEND" \
351+
--arg live_tables_path "${LIVE_TABLES_BASE}-${node_name}" \
347352
'.ByronGenesisHash = $byron_hash
348353
| .ShelleyGenesisHash = $shelley_hash
349354
| .AlonzoGenesisHash = $alonzo_hash
350355
| .ConwayGenesisHash = $conway_hash
351-
| ."LastKnownBlockVersion-Major" = $prot_ver' \
352-
"$conf" > "${STATE_CLUSTER}/${fname}"
356+
| ."LastKnownBlockVersion-Major" = $prot_ver
357+
| if $backend == "mem" then
358+
.LedgerDB.Backend = "V2InMemory"
359+
elif $backend == "disk" then
360+
(.LedgerDB.Backend = "V1LMDB"
361+
| .LedgerDB.LiveTablesPath = $live_tables_path)
362+
elif has("LedgerDB") then
363+
.LedgerDB |= del(.Backend)
364+
else
365+
.
366+
end
367+
| if (.LedgerDB? // {}) == {} then del(.LedgerDB) else . end
368+
' "$conf" > "${STATE_CLUSTER}/${fname}"
353369

354370
# enable P2P
355371
if [ -z "${ENABLE_LEGACY:-""}" ]; then

‎cardano_node_tests/cluster_scripts/conway_fast/template-cardano-node-pool

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,5 @@
11
#!/usr/bin/env bash
22

3-
if [ -e ./state-cluster%%INSTANCE_NUM%%/utxo_backend ]; then
4-
UTXO_BACKEND="$(<./state-cluster%%INSTANCE_NUM%%/utxo_backend)"
5-
fi
6-
7-
case "${UTXO_BACKEND:-""}" in
8-
mem)
9-
UTXO_BACKEND_ARGS=("--utxos-in-memory")
10-
;;
11-
disk)
12-
UTXO_BACKEND_ARGS=("--utxos-on-disk")
13-
;;
14-
*)
15-
UTXO_BACKEND_ARGS=()
16-
;;
17-
esac
18-
193
echo "Starting cardano-node run with PID $$: cardano-node run"
204
echo "--config ./state-cluster%%INSTANCE_NUM%%/config-pool%%POOL_NUM%%.json"
215
echo "--database-path ./state-cluster%%INSTANCE_NUM%%/db-pool%%POOL_NUM%%"
@@ -25,10 +9,10 @@ echo "Starting cardano-node run with PID $$: cardano-node run"
259
echo "--socket-path ./state-cluster%%INSTANCE_NUM%%/pool%%POOL_NUM%%.socket"
2610
echo "--shelley-vrf-key ./state-cluster%%INSTANCE_NUM%%/nodes/node-pool%%POOL_NUM%%/vrf.skey"
2711
echo "--shelley-kes-key ./state-cluster%%INSTANCE_NUM%%/nodes/node-pool%%POOL_NUM%%/kes.skey"
28-
echo "--shelley-operational-certificate ./state-cluster%%INSTANCE_NUM%%/nodes/node-pool%%POOL_NUM%%/op.cert ${UTXO_BACKEND_ARGS[*]} $*"
12+
echo "--shelley-operational-certificate ./state-cluster%%INSTANCE_NUM%%/nodes/node-pool%%POOL_NUM%%/op.cert $*"
2913

3014
echo "..or, once again, in a single line:"
31-
echo "cardano-node run --config ./state-cluster%%INSTANCE_NUM%%/config-pool%%POOL_NUM%%.json --database-path ./state-cluster%%INSTANCE_NUM%%/db-pool%%POOL_NUM%% --topology ./state-cluster%%INSTANCE_NUM%%/topology-pool%%POOL_NUM%%.json --host-addr 127.0.0.1 --port %%NODE_PORT%% --socket-path ./state-cluster%%INSTANCE_NUM%%/pool%%POOL_NUM%%.socket --shelley-vrf-key ./state-cluster%%INSTANCE_NUM%%/nodes/node-pool%%POOL_NUM%%/vrf.skey --shelley-kes-key ./state-cluster%%INSTANCE_NUM%%/nodes/node-pool%%POOL_NUM%%/kes.skey --shelley-operational-certificate ./state-cluster%%INSTANCE_NUM%%/nodes/node-pool%%POOL_NUM%%/op.cert ${UTXO_BACKEND_ARGS[*]} $*"
15+
echo "cardano-node run --config ./state-cluster%%INSTANCE_NUM%%/config-pool%%POOL_NUM%%.json --database-path ./state-cluster%%INSTANCE_NUM%%/db-pool%%POOL_NUM%% --topology ./state-cluster%%INSTANCE_NUM%%/topology-pool%%POOL_NUM%%.json --host-addr 127.0.0.1 --port %%NODE_PORT%% --socket-path ./state-cluster%%INSTANCE_NUM%%/pool%%POOL_NUM%%.socket --shelley-vrf-key ./state-cluster%%INSTANCE_NUM%%/nodes/node-pool%%POOL_NUM%%/vrf.skey --shelley-kes-key ./state-cluster%%INSTANCE_NUM%%/nodes/node-pool%%POOL_NUM%%/kes.skey --shelley-operational-certificate ./state-cluster%%INSTANCE_NUM%%/nodes/node-pool%%POOL_NUM%%/op.cert $*"
3216

3317

34-
exec cardano-node run --config ./state-cluster%%INSTANCE_NUM%%/config-pool%%POOL_NUM%%.json --database-path ./state-cluster%%INSTANCE_NUM%%/db-pool%%POOL_NUM%% --topology ./state-cluster%%INSTANCE_NUM%%/topology-pool%%POOL_NUM%%.json --host-addr 127.0.0.1 --port %%NODE_PORT%% --socket-path ./state-cluster%%INSTANCE_NUM%%/pool%%POOL_NUM%%.socket --shelley-vrf-key ./state-cluster%%INSTANCE_NUM%%/nodes/node-pool%%POOL_NUM%%/vrf.skey --shelley-kes-key ./state-cluster%%INSTANCE_NUM%%/nodes/node-pool%%POOL_NUM%%/kes.skey --shelley-operational-certificate ./state-cluster%%INSTANCE_NUM%%/nodes/node-pool%%POOL_NUM%%/op.cert "${UTXO_BACKEND_ARGS[@]}" "$@"
18+
exec cardano-node run --config ./state-cluster%%INSTANCE_NUM%%/config-pool%%POOL_NUM%%.json --database-path ./state-cluster%%INSTANCE_NUM%%/db-pool%%POOL_NUM%% --topology ./state-cluster%%INSTANCE_NUM%%/topology-pool%%POOL_NUM%%.json --host-addr 127.0.0.1 --port %%NODE_PORT%% --socket-path ./state-cluster%%INSTANCE_NUM%%/pool%%POOL_NUM%%.socket --shelley-vrf-key ./state-cluster%%INSTANCE_NUM%%/nodes/node-pool%%POOL_NUM%%/vrf.skey --shelley-kes-key ./state-cluster%%INSTANCE_NUM%%/nodes/node-pool%%POOL_NUM%%/kes.skey --shelley-operational-certificate ./state-cluster%%INSTANCE_NUM%%/nodes/node-pool%%POOL_NUM%%/op.cert "$@"

0 commit comments

Comments
 (0)