From aac5da2360d80e13f2adc782f4b2269ca7d559cc Mon Sep 17 00:00:00 2001 From: dankelleher Date: Wed, 20 Dec 2023 13:25:42 +0100 Subject: [PATCH] Debug CI tests --- .github/workflows/tests.yml | 8 ++++++- Anchor.toml | 2 +- .../sdks/common/src/types/marinade_beam.ts | 6 +++-- .../sdks/common/src/types/marinade_lp_beam.ts | 24 +++++++++++++++---- packages/tests/run.sh | 4 +++- tmp.sh | 1 + 6 files changed, 36 insertions(+), 9 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 51b1dd1..d712c65 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -178,7 +178,13 @@ jobs: target key: cargo-build-${{ hashFiles('**/Cargo.lock') }}-${{ hashFiles('rust-toolchain.toml') }} - name: run tests - run: yarn test + run: | + pwd + cat ./tmp.sh + ls -l tmp.sh + yarn anchor test --skip-build packages/tests/src/functional/beams/core.test.ts + echo "skipping yarn test" + # yarn test - uses: actions/upload-artifact@v3 if: always() diff --git a/Anchor.toml b/Anchor.toml index 37d2d1e..b43c5a9 100644 --- a/Anchor.toml +++ b/Anchor.toml @@ -18,7 +18,7 @@ cluster = "Localnet" wallet = "packages/tests/fixtures/provider.json" [scripts] -test = "echo in $(pwd)" +test = "packages/tests/run.sh" [test.validator] slots_per_epoch = "32" diff --git a/packages/sdks/common/src/types/marinade_beam.ts b/packages/sdks/common/src/types/marinade_beam.ts index fc509fd..90929c7 100644 --- a/packages/sdks/common/src/types/marinade_beam.ts +++ b/packages/sdks/common/src/types/marinade_beam.ts @@ -766,7 +766,8 @@ export type MarinadeBeam = { { "name": "vaultAuthorityBump", "docs": [ - "that holds pool tokens(msol in this case)." + "The bump of the PDA that can authorize spending from the vault", + "that holds pool tokens (msol in this case)." ], "type": "u8" }, @@ -1685,7 +1686,8 @@ export const IDL: MarinadeBeam = { { "name": "vaultAuthorityBump", "docs": [ - "that holds pool tokens(msol in this case)." + "The bump of the PDA that can authorize spending from the vault", + "that holds pool tokens (msol in this case)." ], "type": "u8" }, diff --git a/packages/sdks/common/src/types/marinade_lp_beam.ts b/packages/sdks/common/src/types/marinade_lp_beam.ts index d1b73a5..4737145 100644 --- a/packages/sdks/common/src/types/marinade_lp_beam.ts +++ b/packages/sdks/common/src/types/marinade_lp_beam.ts @@ -23,7 +23,10 @@ export type MarinadeLpBeam = { { "name": "liqPoolVault", "isMut": true, - "isSigner": false + "isSigner": false, + "docs": [ + "The token account of the liquidity pool tokens held by the beam." + ] }, { "name": "vaultAuthority", @@ -233,7 +236,12 @@ export type MarinadeLpBeam = { { "name": "transferMsolTo", "isMut": true, - "isSigner": false + "isSigner": false, + "docs": [ + "When withdrawing from the Marinade LP, the withdrawal is part SOL, part mSOL.", + "The SOL portion is transferred to the user (withdrawer) and the mSOL portion", + "is transferred to the msol_token_account owned by the marinade stake pool." + ] }, { "name": "liqPoolSolLegPda", @@ -437,7 +445,10 @@ export const IDL: MarinadeLpBeam = { { "name": "liqPoolVault", "isMut": true, - "isSigner": false + "isSigner": false, + "docs": [ + "The token account of the liquidity pool tokens held by the beam." + ] }, { "name": "vaultAuthority", @@ -647,7 +658,12 @@ export const IDL: MarinadeLpBeam = { { "name": "transferMsolTo", "isMut": true, - "isSigner": false + "isSigner": false, + "docs": [ + "When withdrawing from the Marinade LP, the withdrawal is part SOL, part mSOL.", + "The SOL portion is transferred to the user (withdrawer) and the mSOL portion", + "is transferred to the msol_token_account owned by the marinade stake pool." + ] }, { "name": "liqPoolSolLegPda", diff --git a/packages/tests/run.sh b/packages/tests/run.sh index 7ea2d52..d887459 100755 --- a/packages/tests/run.sh +++ b/packages/tests/run.sh @@ -1,3 +1,4 @@ +#!/bin/bash echo "test file" $1 report_name="mocha-reports/mocha-report-$(basename "$1" .test.ts).json" @@ -5,4 +6,5 @@ report_name="mocha-reports/mocha-report-$(basename "$1" .test.ts).json" echo "Executing: " echo "mocha --config packages/tests/.mocharc.json --reporter mochawesome --reporter-options reportFilename=$report_name,quiet=true $1" -mocha --config packages/tests/.mocharc.json --reporter mochawesome --reporter-options reportFilename=$report_name,quiet=true $1 \ No newline at end of file +#mocha --config packages/tests/.mocharc.json --reporter mochawesome --reporter-options reportFilename=$report_name,quiet=true $1 +mocha --config packages/tests/.mocharc.json $1 \ No newline at end of file diff --git a/tmp.sh b/tmp.sh index e256f88..1557814 100755 --- a/tmp.sh +++ b/tmp.sh @@ -1,2 +1,3 @@ +#!/bin/bash echo "in tmp.sh" echo $PWD \ No newline at end of file