Skip to content

Commit

Permalink
Merge pull request #1075 from o1-labs/live-test-upd
Browse files Browse the repository at this point in the history
  • Loading branch information
shimkiv authored Aug 17, 2023
2 parents e2ea7c9 + f5a9a8f commit 4f437aa
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 71 deletions.
12 changes: 6 additions & 6 deletions .github/actions/live-tests-shared/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ description: "Shared steps for live testing jobs"
runs:
using: "composite"
steps:
- name: Wait for Mina Network readiness
uses: o1-labs/wait-for-mina-network-action@v1
with:
mina-graphql-port: 8080
max-attempts: 60
polling-interval-ms: 10000
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: "18"
- name: Make helper script executable
run: chmod +x tests/scripts/wait-for-docker-services.sh
shell: bash
- name: Wait for Docker container services to be ready
run: ./tests/scripts/wait-for-docker-services.sh 8080
shell: bash
- name: Build SnarkyJS and Execute Tests
env:
TEST_TYPE: "Live integration tests"
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/live-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ jobs:
PROOF_LEVEL: 'none'
ports:
- 3085:3085
- 5432:5432
- 8080:8080
- 8181:8181
# TODO: Disable logging for container as the workaround of long post-job-cleanup phase
Expand All @@ -49,6 +50,7 @@ jobs:
PROOF_LEVEL: 'none'
ports:
- 3085:3085
- 5432:5432
- 8080:8080
- 8181:8181
# TODO: Disable logging for container as the workaround of long post-job-cleanup phase
Expand All @@ -73,6 +75,7 @@ jobs:
PROOF_LEVEL: 'none'
ports:
- 3085:3085
- 5432:5432
- 8080:8080
- 8181:8181
# TODO: Disable logging for container as the workaround of long post-job-cleanup phase
Expand Down
10 changes: 5 additions & 5 deletions src/examples/zkapps/hello_world/run_live.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ Mina.setActiveInstance(network);

// Fee payer setup
if (!useLocalNetwork) {
console.log(`Funding the Fee payer account.`);
console.log(`Funding the fee payer account.`);
await Mina.faucet(sender);
}
console.log(`Fetching the Fee payer account information.`);
console.log(`Fetching the fee payer account information.`);
const accountDetails = (await fetchAccount({ publicKey: sender })).account;
console.log(
`Using the Fee payer account ${sender.toBase58()} with nonce: ${
`Using the fee payer account ${sender.toBase58()} with nonce: ${
accountDetails?.nonce
} and balance: ${accountDetails?.balance}.`
);
Expand Down Expand Up @@ -59,7 +59,7 @@ Your smart contract will be deployed
as soon as the transaction is included in a block.
Txn hash: ${pendingTx.hash()}`);
}
console.log('Waiting for transaction to be mined.');
console.log('Waiting for transaction inclusion in a block.');
await pendingTx.wait({ maxAttempts: 90 });
console.log('');

Expand All @@ -77,7 +77,7 @@ Your smart contract state will be updated
as soon as the transaction is included in a block.
Txn hash: ${pendingTx.hash()}`);
}
console.log('Waiting for transaction to be mined.');
console.log('Waiting for transaction inclusion in a block.');
await pendingTx.wait({ maxAttempts: 90 });
console.log('');

Expand Down
60 changes: 0 additions & 60 deletions tests/scripts/wait-for-docker-services.sh

This file was deleted.

0 comments on commit 4f437aa

Please sign in to comment.