Git-Mirrors/haveno-ts
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno-ts.git synced 2025-02-03 01:49:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix resolve disputes test so it completes

Browse Source 
increase CI timeout to 60 minutes
This commit is contained in:
woodser 2022-12-20 23:28:58 +00:00
parent 5fbeae0a07
commit e01eee18b6
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@ -8,7 +8,7 @@ on:
jobs: jobs:
haveno-ts-e2e: haveno-ts-e2e:
timeout-minutes: 50 timeout-minutes: 60
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:

5
src/HavenoClient.test.ts
View File

@ -1390,7 +1390,7 @@ test("Can resolve disputes (CI)", async () => {
await executeTrades(ctxs); await executeTrades(ctxs);
// resolve disputes // resolve disputes
for (const config of ctxs) config.resolveDispute = true; for (const ctx of ctxs) ctx.resolveDispute = true;
HavenoUtils.log(1, "Resolving disputes"); HavenoUtils.log(1, "Resolving disputes");
await executeTrades(ctxs, {concurrentTrades: true}); // TODO: running in parallel doesn't test balances before and after, but this test takes ~10 minutes in sequence. use test weight config await executeTrades(ctxs, {concurrentTrades: true}); // TODO: running in parallel doesn't test balances before and after, but this test takes ~10 minutes in sequence. use test weight config
}); });
@ -1738,8 +1738,9 @@ function tradeContextToString(ctx: TradeContext) {
async function executeTrades(ctxs: TradeContext[], executionCtx?: TradeContext): Promise<string[]> { async function executeTrades(ctxs: TradeContext[], executionCtx?: TradeContext): Promise<string[]> {
// assign default execution context // assign default execution context
if (!executionCtx) executionCtx = Object.assign({}, TestConfig.trade); if (!executionCtx) executionCtx = {};
if (executionCtx.concurrentTrades === undefined) executionCtx.concurrentTrades = ctxs.length > 1; if (executionCtx.concurrentTrades === undefined) executionCtx.concurrentTrades = ctxs.length > 1;
Object.assign(executionCtx, TestConfig.trade, executionCtx);
// start mining if executing trades concurrently // start mining if executing trades concurrently
let miningStarted = executionCtx.concurrentTrades && await startMining(); let miningStarted = executionCtx.concurrentTrades && await startMining();