diff --git a/.github/workflows/e2e_custom_cl.yml b/.github/workflows/e2e_custom_cl.yml index 2e7739d77..6d20b906c 100644 --- a/.github/workflows/e2e_custom_cl.yml +++ b/.github/workflows/e2e_custom_cl.yml @@ -146,15 +146,6 @@ jobs: fi - name: Checkout the repo uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - - name: Create target folder - run: mkdir -p ./contracts/target/deploy - - name: Download Artifacts - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7 - with: - name: artifacts - path: ${{ env.CONTRACT_ARTIFACTS_PATH }} - - name: Check artifacts - run: ls -la ${{ env.CONTRACT_ARTIFACTS_PATH }} - name: Install Solana CLI # required for ensuring the local test validator is configured correctly run: ./scripts/install-solana-ci.sh - name: Install gauntlet diff --git a/integration-tests/common/test_common.go b/integration-tests/common/test_common.go index b29f31cb2..985cc8288 100644 --- a/integration-tests/common/test_common.go +++ b/integration-tests/common/test_common.go @@ -353,3 +353,13 @@ func formatBuffer(buf []byte) string { } return result } + +func GetLatestRound(transmissions []gauntlet.Transmission) gauntlet.Transmission { + highestRound := transmissions[0] + for _, t := range transmissions[1:] { + if t.RoundId > highestRound.RoundId { + highestRound = t + } + } + return highestRound +} diff --git a/integration-tests/smoke/ocr2_test.go b/integration-tests/smoke/ocr2_test.go index 50f5517e7..89d3ea506 100644 --- a/integration-tests/smoke/ocr2_test.go +++ b/integration-tests/smoke/ocr2_test.go @@ -98,7 +98,7 @@ func TestSolanaOCRV2Smoke(t *testing.T) { RoundId: 0, } for successFullRounds < *config.OCR2.Smoke.NumberOfRounds { - require.Less(t, stuck, 10, "Rounds have been stuck for more than 10 iterantions") + require.Less(t, stuck, 10, "Rounds have been stuck for more than 10 iterations") log.Info().Str("Transmission", sg.OcrAddress).Msg("Inspecting transmissions") transmissions, err := sg.FetchTransmissions(sg.OcrAddress) require.NoError(t, err) @@ -107,7 +107,7 @@ func TestSolanaOCRV2Smoke(t *testing.T) { stuck++ continue } - currentRound := transmissions[len(transmissions)-1] + currentRound := common.GetLatestRound(transmissions) if prevRound.RoundId == 0 { prevRound = currentRound }