@@ -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
3637func 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
6364func (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 {
270246func 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- }
0 commit comments