use tastora v0.1.0

Author: randygrok

test/docker-e2e/docker_test.go

@@ -21,6 +21,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/auth"
 	"github.com/cosmos/cosmos-sdk/x/bank"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
+	dockerclient "github.com/moby/moby/client"
 	"github.com/stretchr/testify/suite"
 	"go.uber.org/zap/zaptest"
 )
@@ -46,10 +47,12 @@ func TestDockerSuite(t *testing.T) {
 
 type DockerTestSuite struct {
 	suite.Suite
-	provider     tastoratypes.Provider
-	celestia     tastoratypes.Chain
-	daNetwork    tastoratypes.DataAvailabilityNetwork
-	rollkitChain tastoratypes.RollkitChain
+	provider        tastoratypes.Provider
+	celestia        tastoratypes.Chain
+	daNetwork       tastoratypes.DataAvailabilityNetwork
+	rollkitChain    tastoratypes.RollkitChain
+	dockerClient    *dockerclient.Client
+	dockerNetworkID string
 }
 
 // ConfigOption is a function type for modifying tastoradocker.Config
@@ -62,28 +65,24 @@ func (s *DockerTestSuite) CreateDockerProvider(opts ...ConfigOption) tastoratype
 	numValidators := 1
 	numFullNodes := 0
 	client, network := tastoradocker.DockerSetup(t)
+	
+	// Store client and network ID in the suite for later use
+	s.dockerClient = client
+	s.dockerNetworkID = network
 
 	cfg := tastoradocker.Config{
 		Logger:          zaptest.NewLogger(t),
 		DockerClient:    client,
 		DockerNetworkID: network,
 		ChainConfig: &tastoradocker.ChainConfig{
-			ConfigFileOverrides: map[string]any{
-				"config/app.toml":    appOverrides(),
-				"config/config.toml": configOverrides(),
-			},
-			Type:          "celestia",
 			Name:          "celestia",
-			Version:       "v4.0.0-rc6",
 			NumValidators: &numValidators,
 			NumFullNodes:  &numFullNodes,
 			ChainID:       testChainID,
-			Images: []tastoradocker.DockerImage{
-				{
-					Repository: "ghcr.io/celestiaorg/celestia-app",
-					Version:    "v4.0.0-rc6",
-					UIDGID:     "10001:10001",
-				},
+			Image: tastoradocker.DockerImage{
+				Repository: "ghcr.io/celestiaorg/celestia-app",
+				Version:    "v4.0.0-rc6",
+				UIDGID:     "10001:10001",
 			},
 			Bin:            "celestia-appd",
 			Bech32Prefix:   "celestia",
@@ -149,13 +148,44 @@ func (s *DockerTestSuite) SetupDockerResources(opts ...ConfigOption) {
 	s.rollkitChain = s.CreateRollkitChain()
 }
 
-// CreateChain creates a chain using the provider.
+// CreateChain creates a chain using the ChainBuilder pattern.
 func (s *DockerTestSuite) CreateChain() tastoratypes.Chain {
 	ctx := context.Background()
+	t := s.T()
+	encConfig := testutil.MakeTestEncodingConfig(auth.AppModuleBasic{}, bank.AppModuleBasic{})
 
-	chain, err := s.provider.GetChain(ctx)
-	s.Require().NoError(err)
+	// Create chain using ChainBuilder pattern
+	chain, err := tastoradocker.NewChainBuilder(t).
+		WithName("celestia").
+		WithChainID(testChainID).
+		WithBinaryName("celestia-appd").
+		WithBech32Prefix("celestia").
+		WithDenom("utia").
+		WithCoinType("118").
+		WithGasPrices("0.025utia").
+		WithGasAdjustment(1.3).
+		WithEncodingConfig(&encConfig).
+		WithImage(tastoradocker.DockerImage{
+			Repository: "ghcr.io/celestiaorg/celestia-app",
+			Version:    "v4.0.0-rc6",
+			UIDGID:     "10001:10001",
+		}).
+		WithAdditionalStartArgs(
+			"--force-no-bbr",
+			"--grpc.enable",
+			"--grpc.address",
+			"0.0.0.0:9090",
+			"--rpc.grpc_laddr=tcp://0.0.0.0:9098",
+			"--timeout-commit", "1s",
+		).
+		WithDockerClient(s.dockerClient).
+		WithDockerNetworkID(s.dockerNetworkID).
+		WithNode(tastoradocker.NewChainNodeConfigBuilder().
+			WithNodeType(tastoradocker.ValidatorNodeType).
+			Build()).
+		Build(ctx)
 
+	s.Require().NoError(err)
 	return chain
 }
 

test/docker-e2e/go.mod

@@ -4,6 +4,10 @@ go 1.24.2
 
 require github.com/celestiaorg/tastora v0.0.4
 
+require github.com/containerd/errdefs/pkg v0.3.0 // indirect
+
+replace github.com/celestiaorg/tastora => ../../../tastora
+
 require (
 	github.com/golang/mock v1.6.0 // indirect
 	github.com/google/orderedcode v0.0.1 // indirect
@@ -86,7 +90,7 @@ require (
 	github.com/dgraph-io/badger/v4 v4.2.0 // indirect
 	github.com/dgraph-io/ristretto v0.1.1 // indirect
 	github.com/distribution/reference v0.6.0 // indirect
-	github.com/docker/docker v28.3.3+incompatible // indirect
+	github.com/docker/docker v28.3.3+incompatible
 	github.com/docker/go-connections v0.5.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect

test/docker-e2e/go.sum

@@ -125,8 +125,6 @@ github.com/celestiaorg/go-square/v2 v2.2.0 h1:zJnUxCYc65S8FgUfVpyG/osDcsnjzo/JSX
 github.com/celestiaorg/go-square/v2 v2.2.0/go.mod h1:j8kQUqJLYtcvCQMQV6QjEhUdaF7rBTXF74g8LbkR0Co=
 github.com/celestiaorg/nmt v0.23.0 h1:cfYy//hL1HeDSH0ub3CPlJuox5U5xzgg4JGZrw23I/I=
 github.com/celestiaorg/nmt v0.23.0/go.mod h1:kYfIjRq5rmA2mJnv41GLWkxn5KyLNPlma3v5Q68rHdI=
-github.com/celestiaorg/tastora v0.0.4 h1:bRarVu5MZuqi4TEzjjRE8pKy4YSt2aVAPA/nbB99ZKg=
-github.com/celestiaorg/tastora v0.0.4/go.mod h1:A/DWauemWmg353BvhWYPCd8XbED12UCUiQsL+1sz9BU=
 github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
 github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
 github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
@@ -176,6 +174,8 @@ github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvA
 github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM=
 github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=
 github.com/containerd/errdefs v1.0.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M=
+github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151Xdx3ZPPE=
+github.com/containerd/errdefs/pkg v0.3.0/go.mod h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk=
 github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
 github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=