CAD-2023: remove stack from cardano-benchmarking.

input-output-hk · Oct 20, 2020 · 415e292 · 415e292
1 parent 90cfb1d
commit 415e292
Show file tree

Hide file tree

Showing 36 changed files with 32 additions and 797 deletions.
diff --git a/README.md b/README.md
@@ -4,19 +4,10 @@
 
 This repository contains important tool for `cardano-node` benchmarking - [cardano-tx-generator](https://github.com/input-output-hk/cardano-benchmarking/tree/master/cardano-tx-generator). This is a generator of transactions, both for Byron and Shelley. For more details please [see the project](https://github.com/input-output-hk/cardano-benchmarking/tree/master/cardano-tx-generator).
 
-## Preparation
-
-After first checkout of the repository, update the submodules:
-
-```
-$ git submodule update --init
-```
-
 ## Building on Linux / macOS
 
-Please see our [wiki page](https://github.com/input-output-hk/cardano-benchmarking/wiki/BuildingOnUnix).
+Please see [Unix building instructions](https://github.com/input-output-hk/cardano-benchmarking/wiki/BuildingOnUnix).
 
 ## Building on Windows
 
-Install _MinGW_ (64 bit) ![MinGW](https://raw.githubusercontent.com/wiki/input-output-hk/cardano-benchmarking/mingw64.png) environment and run `stack` in it to compile _cardano-benchmarking_ and all its dependencies.
-(see our [wiki page](https://github.com/input-output-hk/cardano-benchmarking/wiki/BuildingOnWindows))
+Please see [Windows building instructions](https://github.com/input-output-hk/cardano-benchmarking/wiki/BuildingOnWindows).
diff --git a/benchmarks/chain-sync/benchmark-chain-sync-mainnet-candidate-2.sh b/benchmarks/chain-sync/benchmark-chain-sync-mainnet-candidate-2.sh
@@ -19,10 +19,7 @@ rm node-0*
 
 date --iso-8601=seconds > STARTTIME
 
-if [[ $1 == 'stack' ]]; then
-  NODE="stack --nix exec cardano-node -- "
-  shift
-elif [[ $1 == 'cabal' ]]; then
+if [[ $1 == 'cabal' ]]; then
   NODE="cabal v2-run exe:cardano-node -- "
   shift
 else

diff --git a/benchmarks/chain-sync/benchmark-chain-sync-mainnet-candidate-3.sh b/benchmarks/chain-sync/benchmark-chain-sync-mainnet-candidate-3.sh
@@ -19,10 +19,7 @@ rm node-0*
 
 date --iso-8601=seconds > STARTTIME
 
-if [[ $1 == 'stack' ]]; then
-  NODE="stack --nix exec cardano-node -- "
-  shift
-elif [[ $1 == 'cabal' ]]; then
+if [[ $1 == 'cabal' ]]; then
   NODE="cabal v2-run exe:cardano-node -- "
   shift
 else

diff --git a/benchmarks/chain-sync/benchmark-chain-sync-mainnet-candidate.sh b/benchmarks/chain-sync/benchmark-chain-sync-mainnet-candidate.sh
@@ -19,10 +19,7 @@ rm node-0*
 
 date --iso-8601=seconds > STARTTIME
 
-if [[ $1 == 'stack' ]]; then
-  NODE="stack --nix exec cardano-node -- "
-  shift
-elif [[ $1 == 'cabal' ]]; then
+if [[ $1 == 'cabal' ]]; then
   NODE="cabal v2-run exe:cardano-node -- "
   shift
 else

diff --git a/benchmarks/chain-sync/benchmark-chain-sync-mainnet.sh b/benchmarks/chain-sync/benchmark-chain-sync-mainnet.sh
@@ -19,10 +19,7 @@ rm node-0*
 
 date --iso-8601=seconds > STARTTIME
 
-if [[ $1 == 'stack' ]]; then
-  NODE="stack --nix exec cardano-node -- "
-  shift
-elif [[ $1 == 'cabal' ]]; then
+if [[ $1 == 'cabal' ]]; then
   NODE="cabal v2-run exe:cardano-node -- "
   shift
 else

diff --git a/benchmarks/cluster3nodes/README.md b/benchmarks/cluster3nodes/README.md
@@ -1,6 +1,6 @@
-## run the benchmark using 'stack'
+## run the benchmark
 
-`./start.sh --stack-nix`
+`./start.sh`
 
 
 ## analyse timeline of run
@@ -18,7 +18,7 @@ done
 
 reconstruct timeline:
 ```
-stack --nix run reconstruct-timeline -- ${NNODES} ${OUTDIR} | tee -a ${OUTDIR}/timeline.txt
+cabal --enable-nix run reconstruct-timeline -- ${NNODES} ${OUTDIR} | tee -a ${OUTDIR}/timeline.txt
 cp timeline.csv ${OUTDIR}/
 ```
 

diff --git a/benchmarks/cluster3nodes/docs/delegation.md b/benchmarks/cluster3nodes/docs/delegation.md
@@ -11,7 +11,7 @@ Make some payment and stake addresses
                   account for pool rewards
 
 ## settings
-CLICMD="stack --nix exec cardano-cli --"
+CLICMD="cabal --enable-nix exec cardano-cli --"
 
 GENESISDIR=configuration/genesis
 MAGIC=42

diff --git a/benchmarks/cluster3nodes/docs/pools-keys-certs.md b/benchmarks/cluster3nodes/docs/pools-keys-certs.md
@@ -6,7 +6,7 @@
     generate a VRF operational key; and
     issue an operational certificate
 
-CLICMD="stack --nix exec cardano-cli --"
+CLICMD="cabal --enable-nix exec cardano-cli --"
 
 ## make KES (Key Evolving Scheme) and VRF keys
 

diff --git a/benchmarks/cluster3nodes/docs/prepare-genesis.md b/benchmarks/cluster3nodes/docs/prepare-genesis.md
@@ -10,7 +10,7 @@ The CLI command will reset the networkMagic to "42" every time, so we stick to t
 
 (https://github.com/input-output-hk/cardano-node/blob/master/doc/shelley-genesis.md)
 
-CLICMD="stack --nix exec cardano-cli --"
+CLICMD="cabal --enable-nix exec cardano-cli --"
 
 GENESISDIR=genesis01
 

diff --git a/benchmarks/cluster3nodes/docs/quick-start.md b/benchmarks/cluster3nodes/docs/quick-start.md
@@ -2,9 +2,8 @@
 
 this summarizes somes of the [Pioneer's testnet docs](https://github.com/input-output-hk/cardano-tutorials/tree/master/pioneers-testnet)
 
-CLICMD="stack --nix exec cardano-cli --"
-NODECMD="stack --nix exec cardano-node --"
-
+CLICMD="cabal --enable-nix exec cardano-cli --"
+NODECMD="cabal --enable-nix exec cardano-node --"
 
 ## start a passive node which follow's the node
 

diff --git a/benchmarks/cluster3nodes/docs/transactions.md b/benchmarks/cluster3nodes/docs/transactions.md
@@ -1,4 +1,4 @@
-CLICMD="stack --nix exec cardano-cli --"
+CLICMD="cabal --enable-nix exec cardano-cli --"
 
 
 # the index of the genesis UTxO to transfer

diff --git a/benchmarks/cluster3nodes/run_explorer.sh b/benchmarks/cluster3nodes/run_explorer.sh
@@ -19,4 +19,4 @@ run 'cardano-db-sync' \
   --config ${CONFIGFILE} \
   --genesis-file ${GENESISJSON} \
   --socket-path ${BASEDIR}/sockets/0 \
-  --schema-dir ${BASEDIR}/../../ext/cardano-db-sync.git/schema \
+  # --schema-dir ${BASEDIR}/../../ext/cardano-db-sync.git/schema \ # TODO: fix it, there is no more 'ext' dir!
diff --git a/benchmarks/cluster3nodes/static/css/w3.css b/benchmarks/cluster3nodes/static/css/w3.css
diff --git a/benchmarks/cluster3nodes/static/images/iohk-logo.png b/benchmarks/cluster3nodes/static/images/iohk-logo.png
diff --git a/benchmarks/shelley3pools/README.md b/benchmarks/shelley3pools/README.md
@@ -14,9 +14,8 @@
 
 3. start the benchmark
 
-    * with stack: `./start.sh --stack-nix`
     * with nix: `./start.sh --nix`
-    * default, with cabal: `./start.sh `
+    * default, with cabal: `./start.sh`
 
 4. observe the benchmarking: http://localhost:12799/
 
@@ -40,7 +39,7 @@ done
 
 reconstruct timeline:
 ```
-stack --nix run reconstruct-timeline -- ${NNODES} ${OUTDIR} | tee -a ${OUTDIR}/timeline.txt
+cabal --enable-nix run reconstruct-timeline -- ${NNODES} ${OUTDIR} | tee -a ${OUTDIR}/timeline.txt
 cp timeline.csv ${OUTDIR}/
 ```
 
diff --git a/benchmarks/shelley3pools/docs/delegation.md b/benchmarks/shelley3pools/docs/delegation.md
@@ -11,7 +11,7 @@ Make some payment and stake addresses
                   account for pool rewards
 
 ## settings
-CLICMD="stack --nix exec cardano-cli --"
+CLICMD="cabal --enable-nix exec cardano-cli --"
 
 GENESISDIR=configuration/genesis
 MAGIC=42

diff --git a/benchmarks/shelley3pools/docs/pools-keys-certs.md b/benchmarks/shelley3pools/docs/pools-keys-certs.md
@@ -6,7 +6,7 @@
     generate a VRF operational key; and
     issue an operational certificate
 
-CLICMD="stack --nix exec cardano-cli --"
+CLICMD="cabal --enable-nix exec cardano-cli --"
 
 ## make KES (Key Evolving Scheme) and VRF keys
 

diff --git a/benchmarks/shelley3pools/docs/prepare-genesis.md b/benchmarks/shelley3pools/docs/prepare-genesis.md
@@ -10,7 +10,7 @@ The CLI command will reset the networkMagic to "42" every time, so we stick to t
 
 (https://github.com/input-output-hk/cardano-node/blob/master/doc/shelley-genesis.md)
 
-CLICMD="stack --nix exec cardano-cli --"
+CLICMD="cabal --enable-nix exec cardano-cli --"
 
 GENESISDIR=genesis01
 

diff --git a/benchmarks/shelley3pools/docs/quick-start.md b/benchmarks/shelley3pools/docs/quick-start.md
@@ -2,8 +2,8 @@
 
 this summarizes somes of the [Pioneer's testnet docs](https://github.com/input-output-hk/cardano-tutorials/tree/master/pioneers-testnet)
 
-CLICMD="stack --nix exec cardano-cli --"
-NODECMD="stack --nix exec cardano-node --"
+CLICMD="cabal --enable-nix exec cardano-cli --"
+NODECMD="cabal --enable-nix exec cardano-node --"
 
 
 ## start a passive node which follow's the node

diff --git a/benchmarks/shelley3pools/docs/transactions.md b/benchmarks/shelley3pools/docs/transactions.md
@@ -1,4 +1,4 @@
-CLICMD="stack --nix exec cardano-cli --"
+CLICMD="cabal --enable-nix exec cardano-cli --"
 
 
 # the index of the genesis UTxO to transfer

diff --git a/benchmarks/shelley3pools/run-3pools.sh b/benchmarks/shelley3pools/run-3pools.sh
@@ -4,7 +4,6 @@ BASEDIR=$(realpath $(dirname "$0"))
 . ${BASEDIR}/../../scripts/common.sh
 . ${BASEDIR}/configuration/parameters
 
-#NODECMD="stack --nix exec cardano-node --"
 NODECMD=${NODECMD:-"run cardano-node"}
 
 # the host address and interface the node listens: