From 0df43ad5643acd0f24f8ce3df56a0ebc53aa16b2 Mon Sep 17 00:00:00 2001 From: chatton Date: Tue, 11 Nov 2025 11:25:45 +0000 Subject: [PATCH 1/3] chore: bump tastora version --- test/docker-e2e/docker_test.go | 5 ++--- test/docker-e2e/go.mod | 5 ++--- test/docker-e2e/go.sum | 8 ++++---- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/test/docker-e2e/docker_test.go b/test/docker-e2e/docker_test.go index b19c4b49eb..9d64f51484 100644 --- a/test/docker-e2e/docker_test.go +++ b/test/docker-e2e/docker_test.go @@ -22,7 +22,6 @@ 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" ) @@ -52,14 +51,14 @@ type DockerTestSuite struct { celestia *cosmos.Chain daNetwork *da.Network evNodeChain *evstack.Chain - dockerClient *dockerclient.Client + dockerClient tastoratypes.TastoraDockerClient dockerNetworkID string } // setupDockerEnvironment sets up the basic Docker environment func (s *DockerTestSuite) setupDockerEnvironment() { t := s.T() - client, network := tastoradocker.DockerSetup(t) + client, network := tastoradocker.Setup(t) // Store client and network ID in the suite for later use s.dockerClient = client diff --git a/test/docker-e2e/go.mod b/test/docker-e2e/go.mod index cc2625e48b..d8e3bf96cd 100644 --- a/test/docker-e2e/go.mod +++ b/test/docker-e2e/go.mod @@ -4,8 +4,7 @@ go 1.24.6 require ( cosmossdk.io/math v1.5.3 - // TODO(reviewer): Update to tagged release once tastora is merged and tagged - github.com/celestiaorg/tastora v0.7.6-0.20251106081541-3ec2da2f1f7f + github.com/celestiaorg/tastora v0.8.0 github.com/ethereum/go-ethereum v1.16.6 github.com/evstack/ev-node/execution/evm v1.0.0-beta.3 github.com/stretchr/testify v1.11.1 @@ -17,7 +16,7 @@ require ( github.com/StackExchange/wmi v1.2.1 // indirect github.com/bits-and-blooms/bitset v1.20.0 // indirect github.com/celestiaorg/go-square/v3 v3.0.2 // indirect - github.com/consensys/gnark-crypto v0.18.0 // indirect + github.com/consensys/gnark-crypto v0.18.1 // indirect github.com/containerd/continuity v0.4.5 // indirect github.com/crate-crypto/go-eth-kzg v1.4.0 // indirect github.com/crate-crypto/go-ipa v0.0.0-20240724233137-53bbb0ceb27a // indirect diff --git a/test/docker-e2e/go.sum b/test/docker-e2e/go.sum index 80d6dd6a6c..cd60235b0c 100644 --- a/test/docker-e2e/go.sum +++ b/test/docker-e2e/go.sum @@ -133,8 +133,8 @@ github.com/celestiaorg/go-square/v3 v3.0.2 h1:eSQOgNII8inK9IhiBZ+6GADQeWbRq4HYY7 github.com/celestiaorg/go-square/v3 v3.0.2/go.mod h1:oFReMLsSDMRs82ICFEeFQFCqNvwdsbIM1BzCcb0f7dM= github.com/celestiaorg/nmt v0.24.2 h1:LlpJSPOd6/Lw1Ig6HUhZuqiINHLka/ZSRTBzlNJpchg= github.com/celestiaorg/nmt v0.24.2/go.mod h1:vgLBpWBi8F5KLxTdXSwb7AU4NhiIQ1AQRGa+PzdcLEA= -github.com/celestiaorg/tastora v0.7.6-0.20251106081541-3ec2da2f1f7f h1:vTcOubI4Bab0RCE1i9APbbmhJviFA52wv/XV43NwE9M= -github.com/celestiaorg/tastora v0.7.6-0.20251106081541-3ec2da2f1f7f/go.mod h1:Xw44XeRN2T/kSdopVCJjNhwFwRSO58wTW8GrVP7OWFI= +github.com/celestiaorg/tastora v0.8.0 h1:+FWAIsP2onwwqPTGzBLIBtx8B1h9sImdx4msv2N4DsI= +github.com/celestiaorg/tastora v0.8.0/go.mod h1:9b5GsL/+pKEw3HZG/nd3qhnGadUnNNoTBygy9HeGIyw= 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= @@ -180,8 +180,8 @@ github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06/go.mod h1: github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/cometbft/cometbft-db v0.14.1 h1:SxoamPghqICBAIcGpleHbmoPqy+crij/++eZz3DlerQ= github.com/cometbft/cometbft-db v0.14.1/go.mod h1:KHP1YghilyGV/xjD5DP3+2hyigWx0WTp9X+0Gnx0RxQ= -github.com/consensys/gnark-crypto v0.18.0 h1:vIye/FqI50VeAr0B3dx+YjeIvmc3LWz4yEfbWBpTUf0= -github.com/consensys/gnark-crypto v0.18.0/go.mod h1:L3mXGFTe1ZN+RSJ+CLjUt9x7PNdx8ubaYfDROyp2Z8c= +github.com/consensys/gnark-crypto v0.18.1 h1:RyLV6UhPRoYYzaFnPQA4qK3DyuDgkTgskDdoGqFt3fI= +github.com/consensys/gnark-crypto v0.18.1/go.mod h1:L3mXGFTe1ZN+RSJ+CLjUt9x7PNdx8ubaYfDROyp2Z8c= github.com/containerd/continuity v0.4.5 h1:ZRoN1sXq9u7V6QoHMcVWGhOwDFqZ4B9i5H6un1Wh0x4= github.com/containerd/continuity v0.4.5/go.mod h1:/lNJvtJKUQStBzpVQ1+rasXO1LAWtUQssk28EZvJ3nE= github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI= From 66a5f2948ced2b491840f1a07a36093922a3c915 Mon Sep 17 00:00:00 2001 From: chatton Date: Tue, 11 Nov 2025 11:28:17 +0000 Subject: [PATCH 2/3] chore: tidy all --- test/docker-e2e/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/docker-e2e/go.mod b/test/docker-e2e/go.mod index d8e3bf96cd..ddf74c2635 100644 --- a/test/docker-e2e/go.mod +++ b/test/docker-e2e/go.mod @@ -176,7 +176,7 @@ require ( github.com/minio/highwayhash v1.0.3 // indirect github.com/mitchellh/go-testing-interface v1.14.1 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect - github.com/moby/moby v28.3.3+incompatible + github.com/moby/moby v28.3.3+incompatible // indirect github.com/moby/sys/sequential v0.6.0 // indirect github.com/mtibben/percent v0.2.1 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect From 790d9395fb949f4baa0fac80fb3a0bd09d21a5f9 Mon Sep 17 00:00:00 2001 From: chatton Date: Tue, 11 Nov 2025 12:01:46 +0000 Subject: [PATCH 3/3] chore: ensure setup is not in a subtest --- test/docker-e2e/upgrade_test.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/docker-e2e/upgrade_test.go b/test/docker-e2e/upgrade_test.go index 1a48f5f977..8abd44686e 100644 --- a/test/docker-e2e/upgrade_test.go +++ b/test/docker-e2e/upgrade_test.go @@ -59,9 +59,7 @@ func TestEVMSingleUpgradeSuite(t *testing.T) { func (s *EVMSingleUpgradeTestSuite) TestEVMSingleUpgrade() { ctx := context.Background() - s.Run("setup_docker", func() { - s.setupDockerEnvironment() - }) + s.setupDockerEnvironment() s.Run("setup_celestia_and_DA_bridge", func() { s.celestia = s.CreateChain()