Skip to content

Commit 94069b8

Browse files
chattonchatton
authored
test: fix docker e2e test and bump celestia-app version (#2583)
<!-- Please read and fill out this form before submitting your PR. Please make sure you have reviewed our contributors guide before submitting your first PR. NOTE: PR titles should follow semantic commits: https://www.conventionalcommits.org/en/v1.0.0/ --> ## Overview The test was failing due to a different version of the moby/moby client being pulled in from somewhere, I pinned the version to be the one that tastora uses. I also bumped celestia-app to be v5 and did some renaming of rollkit => ev-node <!-- Please provide an explanation of the PR, including the appropriate context, background, goal, and rationale. If there is an issue with this information, please provide a tl;dr and link the issue. Ex: Closes #<issue number> -->
1 parent 51f410d commit 94069b8

4 files changed

Lines changed: 18 additions & 62 deletions

File tree

‎test/docker-e2e/base_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,18 @@ func (s *DockerTestSuite) TestBasicDockerE2E() {
4545
})
4646

4747
s.T().Run("start evolve chain node", func(t *testing.T) {
48-
s.StartRollkitNode(ctx, bridgeNode, s.rollkitChain.GetNodes()[0])
48+
s.StartEvNode(ctx, bridgeNode, s.evNodeChain.GetNodes()[0])
4949
})
5050

5151
s.T().Run("submit a transaction to the evolve chain", func(t *testing.T) {
52-
rollkitNode := s.rollkitChain.GetNodes()[0]
52+
rollkitNode := s.evNodeChain.GetNodes()[0]
5353

5454
// Debug: Check if the node is running and all ports
5555
t.Logf("Rollkit node RPC port: %s", rollkitNode.GetHostRPCPort())
5656
t.Logf("Rollkit node GRPC port: %s", rollkitNode.GetHostGRPCPort())
5757
t.Logf("Rollkit node P2P port: %s", rollkitNode.GetHostP2PPort())
5858

59-
// The http port resolvable by the test runner.
59+
// The http port resolvable by the test runner.
6060
httpPortStr := rollkitNode.GetHostHTTPPort()
6161
t.Logf("Rollkit node HTTP port: %s", httpPortStr)
6262

‎test/docker-e2e/docker_test.go‎

Lines changed: 12 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
tastoradocker "github.com/celestiaorg/tastora/framework/docker"
1616
"github.com/celestiaorg/tastora/framework/docker/container"
1717
"github.com/celestiaorg/tastora/framework/testutil/sdkacc"
18-
"github.com/celestiaorg/tastora/framework/testutil/toml"
1918
tastoratypes "github.com/celestiaorg/tastora/framework/types"
2019
sdk "github.com/cosmos/cosmos-sdk/types"
2120
"github.com/cosmos/cosmos-sdk/types/module/testutil"
@@ -31,6 +30,8 @@ const (
3130
// testChainID is the chain ID used for testing.
3231
// it must be the string "test" as it is handled explicitly in app/node.
3332
testChainID = "test"
33+
// celestiaAppVersion specifies the tag of the celestia-app image to deploy in tests.
34+
celestiaAppVersion = "v5.0.2"
3435
)
3536

3637
func init() {
@@ -51,7 +52,7 @@ type DockerTestSuite struct {
5152
provider tastoratypes.Provider
5253
celestia tastoratypes.Chain
5354
daNetwork tastoratypes.DataAvailabilityNetwork
54-
rollkitChain tastoratypes.RollkitChain
55+
evNodeChain tastoratypes.RollkitChain
5556
dockerClient *dockerclient.Client
5657
dockerNetworkID string
5758
}
@@ -62,9 +63,6 @@ type ConfigOption func(*tastoradocker.Config)
6263
// CreateDockerProvider creates a new tastoratypes.Provider with optional configuration modifications
6364
func (s *DockerTestSuite) CreateDockerProvider(opts ...ConfigOption) tastoratypes.Provider {
6465
t := s.T()
65-
encConfig := testutil.MakeTestEncodingConfig(auth.AppModuleBasic{}, bank.AppModuleBasic{})
66-
numValidators := 1
67-
numFullNodes := 0
6866
client, network := tastoradocker.DockerSetup(t)
6967

7068
// Store client and network ID in the suite for later use
@@ -75,28 +73,6 @@ func (s *DockerTestSuite) CreateDockerProvider(opts ...ConfigOption) tastoratype
7573
Logger: zaptest.NewLogger(t),
7674
DockerClient: client,
7775
DockerNetworkID: network,
78-
ChainConfig: &tastoradocker.ChainConfig{
79-
Name: "celestia",
80-
NumValidators: &numValidators,
81-
NumFullNodes: &numFullNodes,
82-
ChainID: testChainID,
83-
Image: container.NewImage("ghcr.io/celestiaorg/celestia-app", "v4.0.0-rc6", "10001:10001"),
84-
Bin: "celestia-appd",
85-
Bech32Prefix: "celestia",
86-
Denom: "utia",
87-
CoinType: "118",
88-
GasPrices: "0.025utia",
89-
GasAdjustment: 1.3,
90-
EncodingConfig: &encConfig,
91-
AdditionalStartArgs: []string{
92-
"--force-no-bbr",
93-
"--grpc.enable",
94-
"--grpc.address",
95-
"0.0.0.0:9090",
96-
"--rpc.grpc_laddr=tcp://0.0.0.0:9098",
97-
"--timeout-commit", "1s",
98-
},
99-
},
10076
DataAvailabilityNetworkConfig: &tastoradocker.DataAvailabilityNetworkConfig{
10177
BridgeNodeCount: 1,
10278
Image: container.NewImage("ghcr.io/celestiaorg/celestia-node", "pr-4283", "10001:10001"),
@@ -106,7 +82,7 @@ func (s *DockerTestSuite) CreateDockerProvider(opts ...ConfigOption) tastoratype
10682
Bin: "testapp",
10783
AggregatorPassphrase: "12345678",
10884
NumNodes: 1,
109-
Image: getRollkitImage(),
85+
Image: getEvNodeImage(),
11086
},
11187
}
11288

@@ -138,7 +114,7 @@ func (s *DockerTestSuite) SetupDockerResources(opts ...ConfigOption) {
138114
s.provider = s.CreateDockerProvider(opts...)
139115
s.celestia = s.CreateChain()
140116
s.daNetwork = s.CreateDANetwork()
141-
s.rollkitChain = s.CreateRollkitChain()
117+
s.evNodeChain = s.CreateRollkitChain()
142118
}
143119

144120
// CreateChain creates a chain using the ChainBuilder pattern.
@@ -158,7 +134,7 @@ func (s *DockerTestSuite) CreateChain() tastoratypes.Chain {
158134
WithGasPrices("0.025utia").
159135
WithGasAdjustment(1.3).
160136
WithEncodingConfig(&encConfig).
161-
WithImage(container.NewImage("ghcr.io/celestiaorg/celestia-app", "v4.0.0-rc6", "10001:10001")).
137+
WithImage(container.NewImage("ghcr.io/celestiaorg/celestia-app", celestiaAppVersion, "10001:10001")).
162138
WithAdditionalStartArgs(
163139
"--force-no-bbr",
164140
"--grpc.enable",
@@ -227,9 +203,9 @@ func (s *DockerTestSuite) FundWallet(ctx context.Context, wallet tastoratypes.Wa
227203
s.Require().NoError(err)
228204
}
229205

230-
// StartRollkitNode initializes and starts a Rollkit node.
231-
func (s *DockerTestSuite) StartRollkitNode(ctx context.Context, bridgeNode tastoratypes.DANode, rollkitNode tastoratypes.RollkitNode) {
232-
err := rollkitNode.Init(ctx)
206+
// StartEvNode initializes and starts an Ev node.
207+
func (s *DockerTestSuite) StartEvNode(ctx context.Context, bridgeNode tastoratypes.DANode, evNode tastoratypes.RollkitNode) {
208+
err := evNode.Init(ctx)
233209
s.Require().NoError(err)
234210

235211
bridgeNodeHostName, err := bridgeNode.GetInternalHostName()
@@ -239,7 +215,7 @@ func (s *DockerTestSuite) StartRollkitNode(ctx context.Context, bridgeNode tasto
239215
s.Require().NoError(err)
240216

241217
daAddress := fmt.Sprintf("http://%s:26658", bridgeNodeHostName)
242-
err = rollkitNode.Start(ctx,
218+
err = evNode.Start(ctx,
243219
"--rollkit.da.address", daAddress,
244220
"--rollkit.da.gas_price", "0.025",
245221
"--rollkit.da.auth_token", authToken,
@@ -250,10 +226,10 @@ func (s *DockerTestSuite) StartRollkitNode(ctx context.Context, bridgeNode tasto
250226
s.Require().NoError(err)
251227
}
252228

253-
// getRollkitImage returns the Docker image configuration for Rollkit
229+
// getEvNodeImage returns the Docker image configuration for Rollkit
254230
// Uses EV_NODE_IMAGE_REPO and EV_NODE_IMAGE_TAG environment variables if set
255231
// Defaults to locally built image using a unique tag to avoid registry conflicts
256-
func getRollkitImage() container.Image {
232+
func getEvNodeImage() container.Image {
257233
repo := strings.TrimSpace(os.Getenv("EV_NODE_IMAGE_REPO"))
258234
if repo == "" {
259235
repo = "evstack"
@@ -270,21 +246,3 @@ func getRollkitImage() container.Image {
270246
func generateValidNamespaceHex() string {
271247
return hex.EncodeToString(share.RandomBlobNamespace().Bytes())
272248
}
273-
274-
// appOverrides enables indexing of transactions so Broadcasting of transactions works
275-
func appOverrides() toml.Toml {
276-
return toml.Toml{
277-
"tx-index": toml.Toml{
278-
"indexer": "kv",
279-
},
280-
}
281-
}
282-
283-
// configOverrides enables indexing of transactions so Broadcasting of transactions works
284-
func configOverrides() toml.Toml {
285-
return toml.Toml{
286-
"tx_index": toml.Toml{
287-
"indexer": "kv",
288-
},
289-
}
290-
}

‎test/docker-e2e/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ require github.com/celestiaorg/tastora v0.2.3
77
require (
88
cosmossdk.io/x/upgrade v0.1.4 // indirect
99
github.com/chzyer/readline v1.5.1 // indirect
10-
github.com/containerd/errdefs/pkg v0.3.0 // indirect
1110
github.com/cosmos/ibc-go/modules/capability v1.0.1 // indirect
1211
github.com/cosmos/ibc-go/v8 v8.7.0 // indirect
1312
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
@@ -223,4 +222,5 @@ replace (
223222
github.com/cometbft/cometbft => github.com/celestiaorg/celestia-core v1.53.0-tm-v0.38.17
224223
github.com/cosmos/cosmos-sdk => github.com/celestiaorg/cosmos-sdk v1.29.1-sdk-v0.50.12
225224
github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.2
225+
github.com/moby/moby => github.com/moby/moby v27.5.1+incompatible
226226
)

‎test/docker-e2e/go.sum‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,6 @@ github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvA
219219
github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM=
220220
github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=
221221
github.com/containerd/errdefs v1.0.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M=
222-
github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151Xdx3ZPPE=
223-
github.com/containerd/errdefs/pkg v0.3.0/go.mod h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk=
224222
github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
225223
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
226224
github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
@@ -633,8 +631,8 @@ github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyua
633631
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
634632
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
635633
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
636-
github.com/moby/moby v28.3.3+incompatible h1:nzkZIIn9bQP9S553kNmJ+U8PBhdS2ciFWphV2vX/Zp4=
637-
github.com/moby/moby v28.3.3+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc=
634+
github.com/moby/moby v27.5.1+incompatible h1:/pN59F/t3U7Q4FPzV88nzqf7Fp0qqCSL2KzhZaiKcKw=
635+
github.com/moby/moby v27.5.1+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc=
638636
github.com/moby/sys/atomicwriter v0.1.0 h1:kw5D/EqkBwsBFi0ss9v1VG3wIkVhzGvLklJ+w3A14Sw=
639637
github.com/moby/sys/atomicwriter v0.1.0/go.mod h1:Ul8oqv2ZMNHOceF643P6FKPXeCmYtlQMvpizfsSoaWs=
640638
github.com/moby/sys/sequential v0.6.0 h1:qrx7XFUd/5DxtqcoH1h438hF5TmOvzC/lspjy7zgvCU=

0 commit comments

Comments
 (0)