Merge pull request cardano-foundation#9 from cardano-foundation/karknu/moar_fixes

Some Antithesis fixes

Author: karknu

compose/Makefile

@@ -77,7 +77,7 @@ query: TESTNET ## Query tip of all pools
 	for i in $$(seq 1 $${pools}) ; do docker exec -ti p$${i} timeout 0.05 cardano-cli ping --magic 42 --host 127.0.0.1 --port 3001 --tip --quiet -c1; done ; true
 
 validate: TESTNET ## Check for consensus among all pools
-	docker exec -ti s1 /opt/composer/convergence/eventually_converged.sh
+	docker exec -ti s1 /opt/antithesis/test/v1/convergence/eventually_converged.sh
 
 anti: TESTNET ## Run Antithesis job
 	curl --fail -u "${username}:${password}" -X POST ${url} -H "Content-Type: application/json" -d "$$(jq -n \

compose/cardano-node.sh

@@ -17,7 +17,7 @@ POOL_ID="${POOL_ID:-}"
 PORT="${PORT:-3001}"
 PROMETHEUS_LISTEN="${PROMETHEUS_LISTEN:-127.0.0.1}"
 PROMETHEUS_PORT="${PROMETHEUS_PORT:-12798}"
-SYSTEM_START="${SYSTEM_START:-$(date -d "now - 1 minute" +%Y-%m-%dT%H:%M:00Z)}"
+SYSTEM_START="${SYSTEM_START:-$(date -d "@$(( ( $(date +%s) / 120 ) * 120 ))" +%Y-%m-%dT%H:%M:00Z)}"
 TYPE="${TYPE:-bp}"
 USE_LEDGER_AFTER_SLOT="${USE_LEDGER_AFTER_SLOT:-0}"
 

compose/sidecar/Dockerfile

@@ -75,12 +75,9 @@ RUN groupadd --gid 10000 cardano && \
 # Create Antithesis directory
 RUN install --directory --owner=cardano --group=cardano --mode=0750 /opt/antithesis/test/v1
 
-# Create Test Composer directory
-RUN install --directory --owner=cardano --group=cardano --mode=0750 /opt/composer
-
 # Copy Antithesis scripts
-COPY composer /opt/composer
-RUN chmod 0755 /opt/composer/*/*
+COPY composer /opt/antithesis/test/v1/
+RUN chmod 0755 /opt/antithesis/test/v1/*/*
 
 # Copy sidecar.sh
 COPY sidecar.sh /

compose/sidecar/sidecar.sh

@@ -21,23 +21,6 @@ verify_environment_variables() {
     fi
 }
 
-enable_composers() {
-    # CONVERGENCE_COMPOSER
-    if [ "${CONVERGENCE_COMPOSER,,}" = "true" ]; then
-        local src_dir="/opt/composer/convergence"
-        local dest_dir="/opt/antithesis/test/v1/convergence"
-
-        mkdir -p "$dest_dir"
-
-        for file in "$src_dir"/*; do
-            if [ -f "$file" ]; then  # Only process regular files (not directories or symlinks)
-                local filename=$(basename "$file")
-                ln -snf "$file" "$dest_dir/$filename"
-            fi
-        done
-    fi
-}
-
 signal_ready() {
     if [ ! -f "${ANTITHESIS_OUTPUT_DIR}/sdk.jsonl" ]; then
         for i in $(seq 1 "${POOLS}"); do
@@ -61,7 +44,6 @@ signal_ready() {
 # Establish run order
 main() {
     verify_environment_variables
-    enable_composers
     signal_ready
     while true; do
         sleep 60