fix test compose

CounterpartyXCP · Sep 25, 2024 · 464f1ab · 464f1ab
1 parent 2e03561
commit 464f1ab
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/.github/workflows/test_compose.sh b/.github/workflows/test_compose.sh
@@ -3,7 +3,7 @@
 set -e
 set -x
 
-exit 0
+#exit 0
 
 export PATH="/snap/bin:$PATH"
 
@@ -106,15 +106,19 @@ CURRENT_HEIGHT=$(curl http://localhost:4000/v2/ --silent | jq '.result.counterpa
 REPARSE_FROM=$(($CURRENT_HEIGHT-50))
 
 # Stop, reparse and start counterparty-core mainnet
-echo "" > $(docker inspect --format='{{.LogPath}}' counterparty-core-counterparty-core-1)
+LOG_PATH=$(docker inspect --format='{{.LogPath}}' counterparty-core-counterparty-core-1)
+sudo rm -f $LOG_PATH
+sudo touch $LOG_PATH
+
 docker compose --profile mainnet stop counterparty-core
 docker compose --profile mainnet run counterparty-core reparse $REPARSE_FROM \
  --backend-connect=bitcoind \
  --indexd-connect=addrindexrs \
  --rpc-host=0.0.0.0 \
  --api-host=0.0.0.0
 
-echo "" > $(docker inspect --format='{{.LogPath}}' counterparty-core-counterparty-core-1)
+sudo rm -f $LOG_PATH
+sudo touch $LOG_PATH
 
 docker compose --profile mainnet up -d counterparty-core
 

diff --git a/.github/workflows/test_compose.yml b/.github/workflows/test_compose.yml
@@ -2,7 +2,7 @@ name: Docker Compose
 
 on:
  push:
- branches: ['develop', 'master', 'preprelease']
+ branches: ['develop', 'master', 'testcompose']
 
 jobs:
  build:

diff --git a/counterparty-core/counterpartycore/test/mainnet_test.py b/counterparty-core/counterpartycore/test/mainnet_test.py
@@ -14,8 +14,8 @@
 # [server_url, api_version, server_version]
 CHECK_SERVERS = [
  ["http://rpc:rpc@api1.counterparty.io:4000", "v1", "v9.61.1"],
- ["https://api.counterparty.io:4000", "v2", "v10.3.2"],
- ["https://dev.counterparty.io:4000", "v2", "v10.3.2"],
+ ["https://api.counterparty.io:4000", "v2", "v10.4.1"],
+ ["https://dev.counterparty.io:4000", "v2", "v10.4.1"],
  ["https://api.counterparty.info", "v2", "v10.3.2"],
  ["http://rpc:1234@public.coindaddy.io:4000", "v1", "v9.61.3"],
  ["https://api.xcp.dev/v9_61/", "xcpdev", "v9.61.3"],
@@ -155,7 +155,8 @@ def test_compare_hashes(skip):
 
 
 # TODO: find a way to find the database path
-MAINNET_DB_DIR = "/home/ouziel/.local/share/counterparty-docker-data/counterparty/"
+# MAINNET_DB_DIR = "/home/ouziel/.local/share/counterparty-docker-data/counterparty/"
+MAINNET_DB_DIR = "/home/ouziel/snap/docker/2932/.local/share/counterparty-docker-data/counterparty/"
 # MAINNET_DB_DIR = "/home/ouziel/.local/share/counterparty/"