From 9653caceb74156f31b82384be8b641121fef0a8d Mon Sep 17 00:00:00 2001 From: tamirms Date: Thu, 31 Oct 2024 18:31:25 +0100 Subject: [PATCH] services/horizon: Update core protocol 22 version (#5500) --- .github/workflows/galexie-release.yml | 4 ++-- .github/workflows/galexie.yml | 4 ++-- .github/workflows/horizon.yml | 6 +++--- ingest/cdp/producer_test.go | 9 ++++----- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/galexie-release.yml b/.github/workflows/galexie-release.yml index b84f3c1cf0..d065ddd785 100644 --- a/.github/workflows/galexie-release.yml +++ b/.github/workflows/galexie-release.yml @@ -14,9 +14,9 @@ jobs: GALEXIE_INTEGRATION_TESTS_CAPTIVE_CORE_BIN: /usr/bin/stellar-core # this pins to a version of quickstart:testing that has the same version as STELLAR_CORE_VERSION # this is the multi-arch index sha, get it by 'docker buildx imagetools inspect stellar/quickstart:testing' - GALEXIE_INTEGRATION_TESTS_QUICKSTART_IMAGE: docker.io/stellar/quickstart:testing@sha256:03c6679f838a92b1eda4cd3a9e2bdee4c3586e278a138a0acf36a9bc99a0041f + GALEXIE_INTEGRATION_TESTS_QUICKSTART_IMAGE: docker.io/stellar/quickstart:testing@sha256:5333ec87069efd7bb61f6654a801dc093bf0aad91f43a5ba84806d3efe4a6322 GALEXIE_INTEGRATION_TESTS_QUICKSTART_IMAGE_PULL: "false" - STELLAR_CORE_VERSION: 21.3.1-2007.4ede19620.focal + STELLAR_CORE_VERSION: 22.0.0-2126.rc3.92923c2db.focal steps: - name: Set VERSION run: | diff --git a/.github/workflows/galexie.yml b/.github/workflows/galexie.yml index 6406a7a897..a234010f8a 100644 --- a/.github/workflows/galexie.yml +++ b/.github/workflows/galexie.yml @@ -10,12 +10,12 @@ jobs: name: Test runs-on: ubuntu-latest env: - CAPTIVE_CORE_DEBIAN_PKG_VERSION: 21.3.1-2007.4ede19620.focal + CAPTIVE_CORE_DEBIAN_PKG_VERSION: 22.0.0-2126.rc3.92923c2db.focal GALEXIE_INTEGRATION_TESTS_ENABLED: "true" GALEXIE_INTEGRATION_TESTS_CAPTIVE_CORE_BIN: /usr/bin/stellar-core # this pins to a version of quickstart:testing that has the same version as GALEXIE_INTEGRATION_TESTS_CAPTIVE_CORE_BIN # this is the multi-arch index sha, get it by 'docker buildx imagetools inspect stellar/quickstart:testing' - GALEXIE_INTEGRATION_TESTS_QUICKSTART_IMAGE: docker.io/stellar/quickstart:testing@sha256:5c8186f53cc98571749054dd782dce33b0aca2d1a622a7610362f7c15b79b1bf + GALEXIE_INTEGRATION_TESTS_QUICKSTART_IMAGE: docker.io/stellar/quickstart:testing@sha256:5333ec87069efd7bb61f6654a801dc093bf0aad91f43a5ba84806d3efe4a6322 GALEXIE_INTEGRATION_TESTS_QUICKSTART_IMAGE_PULL: "false" steps: - name: Install captive core diff --git a/.github/workflows/horizon.yml b/.github/workflows/horizon.yml index 10d53badab..96566ac666 100644 --- a/.github/workflows/horizon.yml +++ b/.github/workflows/horizon.yml @@ -36,9 +36,9 @@ jobs: PROTOCOL_21_CORE_DEBIAN_PKG_VERSION: 21.3.1-2007.4ede19620.focal PROTOCOL_21_CORE_DOCKER_IMG: stellar/stellar-core:21.3.1-2007.4ede19620.focal PROTOCOL_21_SOROBAN_RPC_DOCKER_IMG: stellar/soroban-rpc:21.5.1 - PROTOCOL_22_CORE_DEBIAN_PKG_VERSION: 22.0.0-2095.rc2.1bccbc921.focal - PROTOCOL_22_CORE_DOCKER_IMG: stellar/stellar-core:22.0.0-2095.rc2.1bccbc921.focal - PROTOCOL_22_SOROBAN_RPC_DOCKER_IMG: stellar/soroban-rpc:22.0.0-rc2-99 + PROTOCOL_22_CORE_DEBIAN_PKG_VERSION: 22.0.0-2126.rc3.92923c2db.focal + PROTOCOL_22_CORE_DOCKER_IMG: stellar/stellar-core:22.0.0-2126.rc3.92923c2db.focal + PROTOCOL_22_SOROBAN_RPC_DOCKER_IMG: stellar/soroban-rpc:22.0.0-rc2-100 PGHOST: localhost PGPORT: 5432 PGUSER: postgres diff --git a/ingest/cdp/producer_test.go b/ingest/cdp/producer_test.go index ba3c10bc9b..631bcd49b7 100644 --- a/ingest/cdp/producer_test.go +++ b/ingest/cdp/producer_test.go @@ -10,13 +10,14 @@ import ( "testing" "time" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/mock" + "github.com/stellar/go/ingest/ledgerbackend" "github.com/stellar/go/support/compressxdr" "github.com/stellar/go/support/datastore" "github.com/stellar/go/support/errors" "github.com/stellar/go/xdr" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/mock" ) func TestDefaultBSBConfigs(t *testing.T) { @@ -208,9 +209,6 @@ func TestBSBProducerCallerCancelsCtx(t *testing.T) { }) mockDataStore.On("GetFile", mock.Anything, "FFFFFFFD--2.xdr.zstd"). - Run(func(args mock.Arguments) { - cancel() - }). Return(makeSingleLCMBatch(2), nil) // this second attempt needs to be mocked, ledger buffer queues this 'next' sequence task automatically // in getFromLedgerQueue after it receives "FFFFFFFD--2.xdr.zstd", the ctx is not checked then or in @@ -218,6 +216,7 @@ func TestBSBProducerCallerCancelsCtx(t *testing.T) { mockDataStore.On("GetFile", mock.Anything, "FFFFFFFC--3.xdr.zstd").Return(makeSingleLCMBatch(3), nil) appCallback := func(lcm xdr.LedgerCloseMeta) error { + cancel() return nil }