Disambiguate source vs exec variable names in reexecute tasks

.github/actions/c-chain-reexecution-benchmark/action.yml

@@ -11,10 +11,10 @@ inputs:
   end-block:
     description: 'The end block for the benchmark.'
     default: '250000'
-  source-block-dir:
+  block-dir-src:
     description: 'The source block directory. Supports S3 directory/zip and local directories.'
     default: 's3://avalanchego-bootstrap-testing/cchain-mainnet-blocks-1m-ldb/**'
-  current-state-dir:
+  current-state-dir-src:
     description: 'The current state directory. Supports S3 directory/zip and local directories.'
     default: 's3://avalanchego-bootstrap-testing/cchain-current-state-hashdb-full-100/**'
   aws-role:
@@ -66,8 +66,8 @@ runs:
           echo "BENCHMARK_OUTPUT_FILE=output.txt"
           echo "START_BLOCK=${{ inputs.start-block }}"
           echo "END_BLOCK=${{ inputs.end-block }}"
-          echo "SOURCE_BLOCK_DIR=${{ inputs.source-block-dir }}"
-          echo "CURRENT_STATE_DIR=${{ inputs.current-state-dir }}"
+          echo "BLOCK_DIR_SRC=${{ inputs.block-dir-src }}"
+          echo "CURRENT_STATE_DIR_SRC=${{ inputs.current-state-dir-src }}"
         } >> $GITHUB_ENV
     - name: Configure AWS Credentials
       uses: aws-actions/configure-aws-credentials@v4
@@ -82,8 +82,8 @@ runs:
           ./scripts/run_task.sh reexecute-cchain-range-with-copied-data \
             CONFIG=${{ inputs.config }} \
             EXECUTION_DATA_DIR=${{ env.EXECUTION_DATA_DIR }} \
-            SOURCE_BLOCK_DIR=${{ env.SOURCE_BLOCK_DIR }} \
-            CURRENT_STATE_DIR=${{ env.CURRENT_STATE_DIR }} \
+            BLOCK_DIR_SRC=${{ env.BLOCK_DIR_SRC }} \
+            CURRENT_STATE_DIR_SRC=${{ env.CURRENT_STATE_DIR_SRC }} \
             START_BLOCK=${{ env.START_BLOCK }} \
             END_BLOCK=${{ env.END_BLOCK }} \
             LABELS=${{ env.LABELS }} \

.github/workflows/c-chain-reexecution-benchmark-container.json

@@ -6,16 +6,16 @@
                 "config": "default",
                 "start-block": 101,
                 "end-block": 250000,
-                "source-block-dir": "s3://avalanchego-bootstrap-testing/cchain-mainnet-blocks-1m-ldb/**",
-                "current-state-dir": "s3://avalanchego-bootstrap-testing/cchain-current-state-hashdb-full-100/**"
+                "block-dir-src": "s3://avalanchego-bootstrap-testing/cchain-mainnet-blocks-1m-ldb/**",
+                "current-state-dir-src": "s3://avalanchego-bootstrap-testing/cchain-current-state-hashdb-full-100/**"
             },
             {
                 "runner": "avalanche-avalanchego-runner-2ti",
                 "config": "default",
                 "start-block": 101,
                 "end-block": 250000,
-                "source-block-dir": "s3://avalanchego-bootstrap-testing/cchain-mainnet-blocks-1m-ldb/**",
-                "current-state-dir": "s3://avalanchego-bootstrap-testing/cchain-current-state-hashdb-full-100/**"
+                "block-dir-src": "s3://avalanchego-bootstrap-testing/cchain-mainnet-blocks-1m-ldb/**",
+                "current-state-dir-src": "s3://avalanchego-bootstrap-testing/cchain-current-state-hashdb-full-100/**"
             }
         ]
     }

.github/workflows/c-chain-reexecution-benchmark-container.yml

@@ -16,11 +16,11 @@ on:
         description: 'The end block for the benchmark.'
         required: false
         default: 250000
-      source-block-dir:
+      block-dir-src:
         description: 'The source block directory. Supports S3 directory/zip and local directories.'
         required: false
         default: s3://avalanchego-bootstrap-testing/cchain-mainnet-blocks-1m-ldb/**
-      current-state-dir:
+      current-state-dir-src:
         description: 'The current state directory. Supports S3 directory/zip and local directories.'
         required: false
         default: s3://avalanchego-bootstrap-testing/cchain-current-state-hashdb-full-100/**
@@ -49,11 +49,11 @@ jobs:
           if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
             {
               echo "matrix<<EOF"
-              printf '{ "include": [{ "start-block": "%s", "end-block": "%s", "source-block-dir": "%s", "current-state-dir": "%s", "config": "%s", "runner": "%s" }] }' \
+              printf '{ "include": [{ "start-block": "%s", "end-block": "%s", "block-dir-src": "%s", "current-state-dir-src": "%s", "config": "%s", "runner": "%s" }] }' \
                 "${{ github.event.inputs.start-block }}" \
                 "${{ github.event.inputs.end-block }}" \
-                "${{ github.event.inputs.source-block-dir }}" \
-                "${{ github.event.inputs.current-state-dir }}" \
+                "${{ github.event.inputs.block-dir-src }}" \
+                "${{ github.event.inputs.current-state-dir-src }}" \
                 "${{ github.event.inputs.config }}" \
                 "${{ github.event.inputs.runner }}"
               echo EOF
@@ -96,8 +96,8 @@ jobs:
           config: ${{ matrix.config }}
           start-block: ${{ matrix.start-block }}
           end-block: ${{ matrix.end-block }}
-          source-block-dir: ${{ matrix.source-block-dir }}
-          current-state-dir: ${{ matrix.current-state-dir }}
+          block-dir-src: ${{ matrix.block-dir-src }}
+          current-state-dir-src: ${{ matrix.current-state-dir-src }}
           prometheus-username: ${{ secrets.PROMETHEUS_ID || '' }}
           prometheus-password: ${{ secrets.PROMETHEUS_PASSWORD || '' }}
           push-github-action-benchmark: ${{ github.event_name == 'schedule' }}

.github/workflows/c-chain-reexecution-benchmark-gh-native.json

@@ -6,24 +6,24 @@
                 "config": "default",
                 "start-block": 101,
                 "end-block": 250000,
-                "source-block-dir": "s3://avalanchego-bootstrap-testing/cchain-mainnet-blocks-1m-ldb/**",
-                "current-state-dir": "s3://avalanchego-bootstrap-testing/cchain-current-state-hashdb-full-100/**"
+                "block-dir-src": "s3://avalanchego-bootstrap-testing/cchain-mainnet-blocks-1m-ldb/**",
+                "current-state-dir-src": "s3://avalanchego-bootstrap-testing/cchain-current-state-hashdb-full-100/**"
             },
             {
                 "runner": "blacksmith-4vcpu-ubuntu-2404",
                 "config": "default",
                 "start-block": 101,
                 "end-block": 250000,
-                "source-block-dir": "s3://avalanchego-bootstrap-testing/cchain-mainnet-blocks-1m-ldb/**",
-                "current-state-dir": "s3://avalanchego-bootstrap-testing/cchain-current-state-hashdb-full-100/**"
+                "block-dir-src": "s3://avalanchego-bootstrap-testing/cchain-mainnet-blocks-1m-ldb/**",
+                "current-state-dir-src": "s3://avalanchego-bootstrap-testing/cchain-current-state-hashdb-full-100/**"
             },
             {
                 "runner": "blacksmith-4vcpu-ubuntu-2404",
                 "config": "archive",
                 "start-block": 101,
                 "end-block": 250000,
-                "source-block-dir": "s3://avalanchego-bootstrap-testing/cchain-mainnet-blocks-1m-ldb/**",
-                "current-state-dir": "s3://avalanchego-bootstrap-testing/cchain-current-state-hashdb-archive-100/**"
+                "block-dir-src": "s3://avalanchego-bootstrap-testing/cchain-mainnet-blocks-1m-ldb/**",
+                "current-state-dir-src": "s3://avalanchego-bootstrap-testing/cchain-current-state-hashdb-archive-100/**"
             }
         ]
     },
@@ -34,24 +34,24 @@
                 "config": "default",
                 "start-block": 101,
                 "end-block": 250000,
-                "source-block-dir": "s3://avalanchego-bootstrap-testing/cchain-mainnet-blocks-1m-ldb/**",
-                "current-state-dir": "s3://avalanchego-bootstrap-testing/cchain-current-state-hashdb-full-100/**"
+                "block-dir-src": "s3://avalanchego-bootstrap-testing/cchain-mainnet-blocks-1m-ldb/**",
+                "current-state-dir-src": "s3://avalanchego-bootstrap-testing/cchain-current-state-hashdb-full-100/**"
             },
             {
                 "runner": "blacksmith-4vcpu-ubuntu-2404",
                 "config": "archive",
                 "start-block": 101,
                 "end-block": 250000,
-                "source-block-dir": "s3://avalanchego-bootstrap-testing/cchain-mainnet-blocks-1m-ldb/**",
-                "current-state-dir": "s3://avalanchego-bootstrap-testing/cchain-current-state-hashdb-archive-100/**"
+                "block-dir-src": "s3://avalanchego-bootstrap-testing/cchain-mainnet-blocks-1m-ldb/**",
+                "current-state-dir-src": "s3://avalanchego-bootstrap-testing/cchain-current-state-hashdb-archive-100/**"
             },
             {
                 "runner": "blacksmith-4vcpu-ubuntu-2404",
                 "config": "firewood",
                 "start-block": 101,
                 "end-block": 250000,
-                "source-block-dir": "s3://avalanchego-bootstrap-testing/cchain-mainnet-blocks-1m-ldb/**",
-                "current-state-dir": "s3://avalanchego-bootstrap-testing/cchain-current-state-firewood-100/**"
+                "block-dir-src": "s3://avalanchego-bootstrap-testing/cchain-mainnet-blocks-1m-ldb/**",
+                "current-state-dir-src": "s3://avalanchego-bootstrap-testing/cchain-current-state-firewood-100/**"
             }
         ]
     }

.github/workflows/c-chain-reexecution-benchmark-gh-native.yml

@@ -16,11 +16,11 @@ on:
         description: 'The end block for the benchmark.'
         required: false
         default: 250000
-      source-block-dir:
+      block-dir-src:
         description: 'The source block directory. Supports S3 directory/zip and local directories.'
         required: false
         default: s3://avalanchego-bootstrap-testing/cchain-mainnet-blocks-1m-ldb/**
-      current-state-dir:
+      current-state-dir-src:
         description: 'The current state directory. Supports S3 directory/zip and local directories.'
         required: false
         default: s3://avalanchego-bootstrap-testing/cchain-current-state-hashdb-full-100/**
@@ -46,11 +46,11 @@ jobs:
           if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
             {
               echo "matrix<<EOF"
-              printf '{ "include": [{ "start-block": "%s", "end-block": "%s", "source-block-dir": "%s", "current-state-dir": "%s", "config": "%s", "runner": "%s" }] }\n' \
+              printf '{ "include": [{ "start-block": "%s", "end-block": "%s", "block-dir-src": "%s", "current-state-dir-src": "%s", "config": "%s", "runner": "%s" }] }\n' \
                 "${{ github.event.inputs.start-block }}" \
                 "${{ github.event.inputs.end-block }}" \
-                "${{ github.event.inputs.source-block-dir }}" \
-                "${{ github.event.inputs.current-state-dir }}" \
+                "${{ github.event.inputs.block-dir-src }}" \
+                "${{ github.event.inputs.current-state-dir-src }}" \
                 "${{ github.event.inputs.config }}" \
                 "${{ github.event.inputs.runner }}"
               echo EOF
@@ -82,8 +82,8 @@ jobs:
           config: ${{ matrix.config }}
           start-block: ${{ matrix.start-block }}
           end-block: ${{ matrix.end-block }}
-          source-block-dir: ${{ matrix.source-block-dir }}
-          current-state-dir: ${{ matrix.current-state-dir }}
+          block-dir-src: ${{ matrix.block-dir-src }}
+          current-state-dir-src: ${{ matrix.current-state-dir-src }}
           prometheus-username: ${{ secrets.PROMETHEUS_ID || '' }}
           prometheus-password: ${{ secrets.PROMETHEUS_PASSWORD || '' }}
           push-github-action-benchmark: ${{ github.event_name == 'schedule' }}

Taskfile.yml

@@ -88,12 +88,12 @@ tasks:
   export-cchain-block-range:
     desc: Export range of C-Chain blocks from source to target directory.
     vars:
-      SOURCE_BLOCK_DIR: '{{.SOURCE_BLOCK_DIR}}'
-      TARGET_BLOCK_DIR: '{{.TARGET_BLOCK_DIR}}'
+      BLOCK_DIR_SRC: '{{.BLOCK_DIR_SRC}}'
+      BLOCK_DIR_DST: '{{.BLOCK_DIR_DST}}'
       START_BLOCK: '{{.START_BLOCK}}'
       END_BLOCK: '{{.END_BLOCK}}'
     cmds:
-      - cmd: go test -timeout=0 -run=TestExportBlockRange github.com/ava-labs/avalanchego/tests/reexecute/c --source-block-dir={{.SOURCE_BLOCK_DIR}} --target-block-dir={{.TARGET_BLOCK_DIR}} --start-block={{.START_BLOCK}} --end-block={{.END_BLOCK}}
+      - cmd: go test -timeout=0 -run=TestExportBlockRange github.com/ava-labs/avalanchego/tests/reexecute/c --block-dir-src={{.BLOCK_DIR_SRC}} --block-dir-dst={{.BLOCK_DIR_DST}} --start-block={{.START_BLOCK}} --end-block={{.END_BLOCK}}
 
   export-dir-to-s3:
     desc: Copies a directory to s3
@@ -131,16 +131,16 @@ tasks:
     desc: Imports the C-Chain block and state data to re-execute. Defaults to import the first 200 and the current state created with the default config of the C-Chain (hashdb).
     vars:
       EXECUTION_DATA_DIR: '{{.EXECUTION_DATA_DIR}}'
-      SOURCE_BLOCK_DIR: '{{.SOURCE_BLOCK_DIR | default "s3://avalanchego-bootstrap-testing/cchain-mainnet-blocks-200-ldb/**"}}'
-      CURRENT_STATE_DIR: '{{.CURRENT_STATE_DIR | default "s3://avalanchego-bootstrap-testing/cchain-current-state-hashdb-full-100/**"}}'
+      BLOCK_DIR_SRC: '{{.BLOCK_DIR_SRC | default "s3://avalanchego-bootstrap-testing/cchain-mainnet-blocks-200-ldb/**"}}'
+      CURRENT_STATE_DIR_SRC: '{{.CURRENT_STATE_DIR_SRC | default "s3://avalanchego-bootstrap-testing/cchain-current-state-hashdb-full-100/**"}}'
     cmds:
       - task: import-s3-to-dir
         vars:
-          SRC: '{{.SOURCE_BLOCK_DIR}}'
+          SRC: '{{.BLOCK_DIR_SRC}}'
           DST: '{{.EXECUTION_DATA_DIR}}/blocks'
       - task: import-s3-to-dir
         vars:
-          SRC: '{{.CURRENT_STATE_DIR}}'
+          SRC: '{{.CURRENT_STATE_DIR_SRC}}'
           DST: '{{.EXECUTION_DATA_DIR}}/current-state'
 
   import-s3-to-dir:
@@ -185,15 +185,15 @@ tasks:
     desc: Re-execute a range of C-Chain blocks.
     vars:
       CURRENT_STATE_DIR: '{{.CURRENT_STATE_DIR}}'
-      SOURCE_BLOCK_DIR: '{{.SOURCE_BLOCK_DIR}}'
+      BLOCK_DIR: '{{.BLOCK_DIR}}'
       CONFIG: '{{.CONFIG | default ""}}'
       START_BLOCK: '{{.START_BLOCK}}'
       END_BLOCK: '{{.END_BLOCK}}'
       LABELS: '{{.LABELS | default ""}}'
       BENCHMARK_OUTPUT_FILE: '{{.BENCHMARK_OUTPUT_FILE | default ""}}'
     cmd: |
       CURRENT_STATE_DIR={{.CURRENT_STATE_DIR}} \
-      SOURCE_BLOCK_DIR={{.SOURCE_BLOCK_DIR}} \
+      BLOCK_DIR={{.BLOCK_DIR}} \
       CONFIG={{.CONFIG}} \
       START_BLOCK={{.START_BLOCK}} \
       END_BLOCK={{.END_BLOCK}} \
@@ -205,21 +205,21 @@ tasks:
     desc: Combines import-cchain-reexecute-range and reexecute-cchain-range
     vars:
       EXECUTION_DATA_DIR: '{{.EXECUTION_DATA_DIR}}'
-      SOURCE_BLOCK_DIR: '{{.SOURCE_BLOCK_DIR | default "s3://avalanchego-bootstrap-testing/cchain-mainnet-blocks-1m-ldb/"}}'
-      CURRENT_STATE_DIR: '{{.CURRENT_STATE_DIR | default "s3://avalanchego-bootstrap-testing/cchain-current-state-hashdb-full-100/"}}'
+      BLOCK_DIR_SRC: '{{.BLOCK_DIR_SRC | default "s3://avalanchego-bootstrap-testing/cchain-mainnet-blocks-1m-ldb/**"}}'
+      CURRENT_STATE_DIR_SRC: '{{.CURRENT_STATE_DIR_SRC | default "s3://avalanchego-bootstrap-testing/cchain-current-state-hashdb-full-100/**"}}'
       START_BLOCK: '{{.START_BLOCK | default "101"}}'
       END_BLOCK: '{{.END_BLOCK | default "250000"}}'
       LABELS: '{{.LABELS | default ""}}'
       BENCHMARK_OUTPUT_FILE: '{{.BENCHMARK_OUTPUT_FILE | default ""}}'
     cmds:
       - task: import-cchain-reexecute-range
         vars:
-          SOURCE_BLOCK_DIR: '{{.SOURCE_BLOCK_DIR}}'
-          CURRENT_STATE_DIR: '{{.CURRENT_STATE_DIR}}'
+          BLOCK_DIR_SRC: '{{.BLOCK_DIR_SRC}}'
+          CURRENT_STATE_DIR_SRC: '{{.CURRENT_STATE_DIR_SRC}}'
           EXECUTION_DATA_DIR: '{{.EXECUTION_DATA_DIR}}'
       - task: reexecute-cchain-range
         vars:
-          SOURCE_BLOCK_DIR: '{{.EXECUTION_DATA_DIR}}/blocks'
+          BLOCK_DIR: '{{.EXECUTION_DATA_DIR}}/blocks'
           CURRENT_STATE_DIR: '{{.EXECUTION_DATA_DIR}}/current-state'
           CONFIG: '{{.CONFIG}}'
           START_BLOCK: '{{.START_BLOCK}}'

scripts/benchmark_cchain_range.sh

@@ -4,19 +4,19 @@ set -euo pipefail
 
 # This script runs the C-Chain re-execution benchmark with a single iteration.
 # It expects the following environment variables to be set:
-#   SOURCE_BLOCK_DIR: Path or S3 URL to the source block directory or zip.
+#   BLOCK_DIR: Path or S3 URL to the block directory or zip.
 #   CURRENT_STATE_DIR: Path or S3 URL to the current state directory or zip.
 #   START_BLOCK: The starting block height (exclusive).
 #   END_BLOCK: The ending block height (inclusive).
 #   LABELS (optional): Comma-separated key=value pairs for metric labels.
 #   BENCHMARK_OUTPUT_FILE (optional): If set, benchmark output is also written to this file.
 
-: "${SOURCE_BLOCK_DIR:?SOURCE_BLOCK_DIR must be set}"
+: "${BLOCK_DIR:?BLOCK_DIR must be set}"
 : "${CURRENT_STATE_DIR:?CURRENT_STATE_DIR must be set}"
 : "${START_BLOCK:?START_BLOCK must be set}"
 : "${END_BLOCK:?END_BLOCK must be set}"
 
-cmd="go test -timeout=0 -v -benchtime=1x -bench=BenchmarkReexecuteRange -run=^$ github.com/ava-labs/avalanchego/tests/reexecute/c --source-block-dir=\"${SOURCE_BLOCK_DIR}\" --target-dir=\"${CURRENT_STATE_DIR}\" ${CONFIG:+--config=\"${CONFIG}\"} --start-block=\"${START_BLOCK}\" --end-block=\"${END_BLOCK}\" ${LABELS:+--labels=\"${LABELS}\"}"
+cmd="go test -timeout=0 -v -benchtime=1x -bench=BenchmarkReexecuteRange -run=^$ github.com/ava-labs/avalanchego/tests/reexecute/c --block-dir=\"${BLOCK_DIR}\" --current-state-dir=\"${CURRENT_STATE_DIR}\" ${CONFIG:+--config=\"${CONFIG}\"} --start-block=\"${START_BLOCK}\" --end-block=\"${END_BLOCK}\" ${LABELS:+--labels=\"${LABELS}\"}"
 
 if [ -n "${BENCHMARK_OUTPUT_FILE:-}" ]; then
   eval "$cmd" | tee "${BENCHMARK_OUTPUT_FILE}"