Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

horizon: update core testing image #5049

Merged
merged 11 commits into from
Sep 14, 2023
+40 −29
Merged

horizon: update core testing image #5049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0c63101
update image
tsachiherman Sep 12, 2023
f7ac761
update
tsachiherman Sep 12, 2023
9c5d048
update rpc image.
tsachiherman Sep 12, 2023
30af462
update
tsachiherman Sep 13, 2023
a2c1703
Merge branch 'master' into tsachi/update-core-image
tsachiherman Sep 13, 2023
cb168b6
prevent test panic in case of a failuire.
tsachiherman Sep 13, 2023
0a54262
update rpc
tsachiherman Sep 13, 2023
38dc8aa
fix another panic
tsachiherman Sep 13, 2023
377dbf6
fix parsing of asset strings in contractevents
tamirms Sep 14, 2023
29e0a8e
Merge branch 'master' into tsachi/update-core-image
tsachiherman Sep 14, 2023
cc387fb
Fix TestReingestDB and TestFillGaps
tamirms Sep 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/horizon.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ jobs:
env:
HORIZON_INTEGRATION_TESTS_ENABLED: true
HORIZON_INTEGRATION_TESTS_CORE_MAX_SUPPORTED_PROTOCOL: ${{ matrix.protocol-version }}
PROTOCOL_20_CORE_DEBIAN_PKG_VERSION: 19.13.1-1469.76fed6ead.focal~soroban
PROTOCOL_20_CORE_DOCKER_IMG: stellar/unsafe-stellar-core-next:19.13.1-1469.76fed6ead.focal-soroban
PROTOCOL_20_SOROBAN_RPC_DOCKER_IMG: stellar/soroban-rpc:0.9.4-fix-fees-31
PROTOCOL_20_CORE_DEBIAN_PKG_VERSION: 19.13.1-1481.3acf6dd26.focal
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do you know if this is the latest candidate for release, I recalled seeing mention of ecb24df104c as the one and its on a later package build of 19.13.1-1484.ecb24df10

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in the release channel in slack I only see 19.13.1-1481.3acf6dd26.focal
being mentioned:

https://stellarfoundation.slack.com/archives/C04ECVCV162/p1694530045995229

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yesterday had a thread with @sisuresh - https://stellarfoundation.slack.com/archives/C04ECVCV162/p1694648260937719?thread_ts=1694641843.625179&cid=C04ECVCV162, where ecb24df104c was mentioned as the candidate, but maybe that's changed.

PROTOCOL_20_CORE_DOCKER_IMG: stellar/stellar-core:19.13.1-1481.3acf6dd26.focal
PROTOCOL_20_SOROBAN_RPC_DOCKER_IMG: stellar/soroban-rpc:20.0.0-rc1-double-counting-34
PROTOCOL_19_CORE_DEBIAN_PKG_VERSION: 19.12.0-1378.2109a168a.focal
PROTOCOL_19_CORE_DOCKER_IMG: stellar/stellar-core:19.12.0-1378.2109a168a.focal
PGHOST: localhost
Expand Down
9 changes: 9 additions & 0 deletions services/horizon/docker/captive-core-reingest-range-classic-integration-tests.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
ARTIFICIALLY_ACCELERATE_TIME_FOR_TESTING=true

[[VALIDATORS]]
NAME="local_core"
HOME_DOMAIN="core.local"
# From "SACJC372QBSSKJYTV5A7LWT4NXWHTQO6GHG4QDAVC2XDPX6CNNXFZ4JK"
PUBLIC_KEY="GD5KD2KEZJIGTC63IGW6UMUSMVUVG5IHG64HUTFWCHVZH2N2IBOQN7PS"
ADDRESS="localhost"
QUALITY="MEDIUM"
1 change: 1 addition & 0 deletions services/horizon/docker/captive-core-reingest-range-integration-tests.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
ARTIFICIALLY_ACCELERATE_TIME_FOR_TESTING=true
TESTING_SOROBAN_HIGH_LIMIT_OVERRIDE=true

[[VALIDATORS]]
NAME="local_core"
Expand Down
4 changes: 2 additions & 2 deletions services/horizon/internal/integration/contracts/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ codegen-units = 1
lto = true

[workspace.dependencies.soroban-sdk]
version = "0.9.1"
version = "20.0.0-rc1"
git = "https://github.com/stellar/rs-soroban-sdk"
rev = "ee44e420b9badeb16cab870ed25bef397c058f64"
rev = "f743d6f9e49caa08924318907cd0588b60d7f187"
13 changes: 11 additions & 2 deletions services/horizon/internal/integration/db_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (

"github.com/stellar/go/clients/horizonclient"
"github.com/stellar/go/historyarchive"
"github.com/stellar/go/ingest/ledgerbackend"
"github.com/stellar/go/keypair"
horizoncmd "github.com/stellar/go/services/horizon/cmd"
horizon "github.com/stellar/go/services/horizon/internal"
Expand Down Expand Up @@ -526,7 +527,7 @@ func TestReingestDB(t *testing.T) {

horizonConfig.CaptiveCoreConfigPath = filepath.Join(
filepath.Dir(horizonConfig.CaptiveCoreConfigPath),
"captive-core-reingest-range-integration-tests.cfg",
getCoreConfigFile(itest),
)

horizoncmd.RootCmd.SetArgs(command(t, horizonConfig, "db",
Expand All @@ -541,6 +542,14 @@ func TestReingestDB(t *testing.T) {
tt.NoError(horizoncmd.RootCmd.Execute(), "Repeat the same reingest range against db, should not have errors.")
}

func getCoreConfigFile(itest *integration.Test) string {
coreConfigFile := "captive-core-reingest-range-classic-integration-tests.cfg"
if itest.Config().ProtocolVersion >= ledgerbackend.MinimalSorobanProtocolSupport {
coreConfigFile = "captive-core-reingest-range-integration-tests.cfg"
}
return coreConfigFile
}

func command(t *testing.T, horizonConfig horizon.Config, args ...string) []string {
return append([]string{
"--stellar-core-url",
Expand Down Expand Up @@ -679,7 +688,7 @@ func TestFillGaps(t *testing.T) {

horizonConfig.CaptiveCoreConfigPath = filepath.Join(
filepath.Dir(horizonConfig.CaptiveCoreConfigPath),
"captive-core-reingest-range-integration-tests.cfg",
getCoreConfigFile(itest),
)
horizoncmd.RootCmd.SetArgs(command(t, horizonConfig, "db", "fill-gaps", "--parallel-workers=1"))
tt.NoError(horizoncmd.RootCmd.Execute())
Expand Down
9 changes: 5 additions & 4 deletions services/horizon/internal/integration/sac_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,9 +502,10 @@ func TestContractBurnFromAccount(t *testing.T) {
)

fx := getTxEffects(itest, burnTx, asset)
assert.Len(t, fx, 1)
burnEffect := assertContainsEffect(t, fx,
effects.EffectAccountDebited)[0].(effects.AccountDebited)
require.Len(t, fx, 1)
assetEffects := assertContainsEffect(t, fx, effects.EffectAccountDebited)
require.GreaterOrEqual(t, len(assetEffects), 1)
burnEffect := assetEffects[0].(effects.AccountDebited)

assert.Equal(t, issuer, burnEffect.Asset.Issuer)
assert.Equal(t, code, burnEffect.Asset.Code)
Expand Down Expand Up @@ -833,7 +834,7 @@ func assertEventPayments(itest *integration.Test, txHash string, asset xdr.Asset

invokeHostFn := ops.Embedded.Records[0].(operations.InvokeHostFunction)
assert.Equal(itest.CurrentTest(), invokeHostFn.Function, "HostFunctionTypeHostFunctionTypeInvokeContract")
assert.Equal(itest.CurrentTest(), 1, len(invokeHostFn.AssetBalanceChanges))
require.Equal(itest.CurrentTest(), 1, len(invokeHostFn.AssetBalanceChanges))
assetBalanceChange := invokeHostFn.AssetBalanceChanges[0]
assert.Equal(itest.CurrentTest(), assetBalanceChange.Amount, amount)
assert.Equal(itest.CurrentTest(), assetBalanceChange.From, from)
Expand Down
5 changes: 5 additions & 0 deletions services/horizon/internal/test/integration/integration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,6 +774,11 @@ func (i *Test) WaitForHorizon() {
i.t.Fatal("Horizon not ingesting...")
}

// Config returns the testing configuration for the current integration test run.
func (i *Test) Config() Config {
return i.config
}

// CoreClient returns a stellar core client connected to the Stellar Core instance.
func (i *Test) CoreClient() *stellarcore.Client {
return i.coreClient
Expand Down
4 changes: 2 additions & 2 deletions support/contractevents/event.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@
Ed25519: issuerKey.Ed25519,
})

if len(rawCode) == 4 {
if len(rawCode) <= 4 {

Check failure on line 176 in support/contractevents/event.go

View workflow job for this annotation

GitHub Actions / golangci 

mnd: Magic number: 4, in <condition> detected (gomnd)
code := [4]byte{}
copy(code[:], rawCode[:])

Expand All @@ -182,7 +182,7 @@
AssetCode: xdr.AssetCode4(code),
Issuer: accountId,
}
} else if len(rawCode) == 12 {
} else if len(rawCode) <= 12 {

Check failure on line 185 in support/contractevents/event.go

View workflow job for this annotation

GitHub Actions / golangci 

mnd: Magic number: 12, in <condition> detected (gomnd)
code := [12]byte{}
copy(code[:], rawCode[:])

Expand Down
18 changes: 2 additions & 16 deletions support/contractevents/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,22 +169,8 @@ func makeAsset(asset xdr.Asset) xdr.ScVal {
panic(err)
}

case xdr.AssetTypeAssetTypeCreditAlphanum4:
_, err := xdr.Marshal(buffer, asset.AlphaNum4.AssetCode)
if err != nil {
panic(err)
}
buffer.WriteString(":")
buffer.WriteString(asset.AlphaNum4.Issuer.Address())

case xdr.AssetTypeAssetTypeCreditAlphanum12:
_, err := xdr.Marshal(buffer, asset.AlphaNum12.AssetCode)
if err != nil {
panic(err)
}
buffer.WriteString(":")
buffer.WriteString(asset.AlphaNum12.Issuer.Address())

case xdr.AssetTypeAssetTypeCreditAlphanum4, xdr.AssetTypeAssetTypeCreditAlphanum12:
buffer.WriteString(asset.GetCode() + ":" + asset.GetIssuer())
default:
panic("unexpected asset type")
}
Expand Down
Loading