diff --git a/.github/workflows/horizon.yml b/.github/workflows/horizon.yml index 96566ac666..ee6165f751 100644 --- a/.github/workflows/horizon.yml +++ b/.github/workflows/horizon.yml @@ -38,7 +38,7 @@ jobs: PROTOCOL_21_SOROBAN_RPC_DOCKER_IMG: stellar/soroban-rpc:21.5.1 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 + PROTOCOL_22_SOROBAN_RPC_DOCKER_IMG: stellar/soroban-rpc:22.0.0-rc3-101 PGHOST: localhost PGPORT: 5432 PGUSER: postgres diff --git a/ingest/cdp/producer_test.go b/ingest/cdp/producer_test.go index 631bcd49b7..e7605b4512 100644 --- a/ingest/cdp/producer_test.go +++ b/ingest/cdp/producer_test.go @@ -190,44 +190,6 @@ func TestBSBProducerFnGetLedgerError(t *testing.T) { mockDataStore.AssertExpectations(t) } -func TestBSBProducerCallerCancelsCtx(t *testing.T) { - ctx, cancel := context.WithCancel(context.Background()) - pubConfig := PublisherConfig{ - DataStoreConfig: datastore.DataStoreConfig{}, - BufferedStorageConfig: DefaultBufferedStorageBackendConfig(1), - } - - pubConfig.BufferedStorageConfig.NumWorkers = 1 - - // the buffering runs async, test needs to stub datastore methods for potential invocation, - // but is race, since test also cancels the backend context which started the buffer, - // so, not deterministic, no assert on these. - mockDataStore := new(datastore.MockDataStore) - mockDataStore.On("GetSchema").Return(datastore.DataStoreSchema{ - LedgersPerFile: 1, - FilesPerPartition: 1, - }) - - mockDataStore.On("GetFile", mock.Anything, "FFFFFFFD--2.xdr.zstd"). - 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 - // the async worker routine that receives the task. - mockDataStore.On("GetFile", mock.Anything, "FFFFFFFC--3.xdr.zstd").Return(makeSingleLCMBatch(3), nil) - - appCallback := func(lcm xdr.LedgerCloseMeta) error { - cancel() - return nil - } - - datastoreFactory = func(_ context.Context, _ datastore.DataStoreConfig) (datastore.DataStore, error) { - return mockDataStore, nil - } - assert.ErrorIs(t, - ApplyLedgerMetadata(ledgerbackend.BoundedRange(uint32(2), uint32(3)), pubConfig, ctx, appCallback), - context.Canceled) -} - func TestBSBProducerFnCallbackError(t *testing.T) { ctx := context.Background() pubConfig := PublisherConfig{