CAD-1859 shelley3pools: support --reuse-genesis

Makefile

@@ -29,8 +29,9 @@ EXES=cardano-node cardano-cli cardano-tx-generator
 ###
 nix:                      MODE=nix
 cabal:                    MODE=cabal
-cabal:                    EXTRA_OPTS=--no-path-exes
+cabal:                    EXTRA_OPTS+=--no-path-exes
 nix cabal: cluster
+recabal: cabal
 
 sync:
 	@echo "Syncing 'cabal.project' to ../cardano-node"
@@ -53,6 +54,8 @@ setup:
 build: setup
 	cabal v2-build ${CABAL_OPTIONS} $(foreach exe,${EXES},${exe}:exe:${exe})
 
+recluster: EXTRA_OPTS+=--reuse-genesis
+recluster: cluster
 cluster: build
 	cd ./benchmarks/shelley3pools; ./start.sh --${MODE} ${EXTRA_OPTS}
 

benchmarks/shelley3pools/benchmark.sh

@@ -31,7 +31,14 @@ mkdir -p db logs/sockets
 rm -f 'configuration/start-time'
 . "$BASEDIR"/configuration/parameters
 ./prepare_genesis_byron.sh
-./prepare_genesis_shelley_staked.sh
+if test -z "$reuse_genesis"
+then ./prepare_genesis_shelley_staked.sh
+else sed -i 's/"systemStart": ".*"/"systemStart": "'"$(date \
+       --iso-8601=seconds \
+       --date=@$(cat "$BASEDIR"/configuration/start-time))"'"/
+       ' "$GENESISDIR_shelley"/genesis.json
+     ./hash_genesis.sh
+fi
 
 case $era in
         byron )     protocol='RealPBFT';;

benchmarks/shelley3pools/hash_genesis.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+set -e
+
+basedir=$(realpath "$(dirname "$0")")
+. "$basedir"/../../scripts/common.sh
+. "$basedir"/configuration/parameters
+
+cd "$basedir"
+
+gendir=$GENESISDIR_shelley
+cli=${CLICMD:-'run cardano-cli'}
+
+$cli shelley genesis hash --genesis "$gendir"/genesis.json |
+        tr -d '"' > "$gendir"/GENHASH

benchmarks/shelley3pools/prepare_genesis_shelley_staked.sh

@@ -118,5 +118,4 @@ params=(--genesis-dir      "$gendir"
 ## extend template with final parameters
 $cli shelley genesis create-staked "${params[@]}"
 
-$cli shelley genesis hash --genesis "$gendir"/genesis.json |
-        tr -d '"' > "$gendir"/GENHASH
+"$basedir"/hash_genesis.sh

scripts/common.sh

@@ -148,7 +148,7 @@ default_mode='nix'
 SCRIPTS_LIB_SH_MODE=${SCRIPTS_LIB_SH_MODE:-default}
 cmdline_mode=
 mnemonic_suffix=${mnemonic_suffix:-}
-force_genesis=
+reuse_genesis=
 
 while test -n "$1"
 do case "$1" in
@@ -163,8 +163,7 @@ do case "$1" in
            --profile )            profile=$2; shift;;
            --mnemonic-suffix )    mnemonic_suffix=$2; shift;;
 
-           ## Should be moved to lib-node.sh?
-           --force-genesis )      force_genesis=t;;
+           --reuse-genesis )      reuse_genesis=t;;
 
            --shelley )            era='shelley';;
            --byron )              era='byron';;