diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 94a9b02b8..c003592ed 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -5,7 +5,7 @@ on: env: stack-orchestrator-ref: ${{ github.event.inputs.stack-orchestrator-ref || 'f2fd766f5400fcb9eb47b50675d2e3b1f2753702'}} - ipld-eth-db-ref: ${{ github.event.inputs.ipld-ethcl-db-ref || 'be345e0733d2c025e4082c5154e441317ae94cf7' }} + ipld-eth-db-ref: ${{ github.event.inputs.ipld-ethcl-db-ref || '167cfbfb202d387aed2c9950e18c45a66f87821d' }} GOPATH: /tmp/go jobs: @@ -136,7 +136,7 @@ jobs: - name: Make sure we see entries in the header table shell: bash run: | - rows=$(docker compose -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-db-sharding.yml" -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-go-ethereum.yml" exec ipld-eth-db psql -U vdbm -d vulcanize_testing -AXqtc "SELECT COUNT(*) FROM eth.header_cids") + rows=$(docker compose -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-db-sharding.yml" -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-go-ethereum.yml" exec ipld-eth-db psql -U vdbm -d cerc_testing -AXqtc "SELECT COUNT(*) FROM eth.header_cids") [[ "$rows" -lt "1" ]] && echo "We could not find any rows in postgres table." && (exit 1) echo $rows - docker compose -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-db-sharding.yml" -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-go-ethereum.yml" exec ipld-eth-db psql -U vdbm -d vulcanize_testing -AXqtc "SELECT * FROM eth.header_cids" + docker compose -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-db-sharding.yml" -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-go-ethereum.yml" exec ipld-eth-db psql -U vdbm -d cerc_testing -AXqtc "SELECT * FROM eth.header_cids" diff --git a/docker-compose.yml b/docker-compose.yml index 62a81b0aa..84685cc30 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,10 +5,10 @@ services: restart: on-failure depends_on: - ipld-eth-db - image: vulcanize/ipld-eth-db:v4.2.1-alpha + image: vulcanize/ipld-eth-db:v5.0.1-alpha environment: DATABASE_USER: "vdbm" - DATABASE_NAME: "vulcanize_testing" + DATABASE_NAME: "cerc_testing" DATABASE_PASSWORD: "password" DATABASE_HOSTNAME: "ipld-eth-db" DATABASE_PORT: 5432 @@ -19,7 +19,7 @@ services: command: ["postgres", "-c", "log_statement=all"] environment: POSTGRES_USER: "vdbm" - POSTGRES_DB: "vulcanize_testing" + POSTGRES_DB: "cerc_testing" POSTGRES_PASSWORD: "password" ports: - "127.0.0.1:8077:5432" diff --git a/scripts/run_unit_test.sh b/scripts/run_unit_test.sh index b449090f6..8ecc81312 100755 --- a/scripts/run_unit_test.sh +++ b/scripts/run_unit_test.sh @@ -8,7 +8,7 @@ mkdir -p out rm -rf out/docker-tsdb/ # Copy over files to setup TimescaleDB -ID=$(docker create vulcanize/ipld-eth-db:v4.1.1-alpha) +ID=$(docker create vulcanize/ipld-eth-db:v5.0.1-alpha) docker cp $ID:/app/docker-tsdb out/docker-tsdb/ docker rm -v $ID diff --git a/statediff/README.md b/statediff/README.md index 13ac0f661..d3541cee7 100644 --- a/statediff/README.md +++ b/statediff/README.md @@ -127,7 +127,7 @@ This service introduces a CLI flag namespace `statediff` The service can only operate in full sync mode (`--syncmode=full`), but only the historical RPC endpoints require an archive node (`--gcmode=archive`) e.g. -`./build/bin/geth --syncmode=full --gcmode=archive --statediff --statediff.writing --statediff.db.type=postgres --statediff.db.driver=sqlx --statediff.db.host=localhost --statediff.db.port=5432 --statediff.db.name=vulcanize_test --statediff.db.user=postgres --statediff.db.nodeid=nodeid --statediff.db.clientname=clientname` +`./build/bin/geth --syncmode=full --gcmode=archive --statediff --statediff.writing --statediff.db.type=postgres --statediff.db.driver=sqlx --statediff.db.host=localhost --statediff.db.port=5432 --statediff.db.name=cerc_testing --statediff.db.user=postgres --statediff.db.nodeid=nodeid --statediff.db.clientname=clientname` When operating in `--statediff.db.type=file` mode, the service will write SQL statements out to the file designated by `--statediff.file.path`. Please note that it writes out SQL statements with all `ON CONFLICT` constraint checks dropped.