Upgrade go client

EspressoSystems · Jun 4, 2024 · 0c83372 · 0c83372
1 parent deb85c2
commit 0c83372
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/espresso-e2e.yml b/.github/workflows/espresso-e2e.yml
@@ -135,7 +135,7 @@ jobs:
       - name: Run E2E test
         run: |
           packages=`go list ./... | grep system_tests`
-          gotestsum --format short-verbose --packages="$packages" --rerun-fails=1 -- -v -timeout 30m -p 1 ./... -run 'TestEspressoE2E'
+          gotestsum --format short-verbose --packages="$packages" --rerun-fails=1 -- -v -timeout 35m -p 1 ./... -run 'TestEspressoE2E'
 
       - name: Run switch test
         run: |

diff --git a/go.mod b/go.mod
@@ -7,7 +7,7 @@ replace github.com/VictoriaMetrics/fastcache => ./fastcache
 replace github.com/ethereum/go-ethereum => ./go-ethereum
 
 require (
-	github.com/EspressoSystems/espresso-sequencer-go v0.0.17-0.20240531094034-0a7f8d897b54
+	github.com/EspressoSystems/espresso-sequencer-go v0.0.17
 	github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible
 	github.com/Shopify/toxiproxy v2.1.4+incompatible
 	github.com/alicebob/miniredis/v2 v2.32.1

diff --git a/go.sum b/go.sum
@@ -13,6 +13,8 @@ github.com/EspressoSystems/espresso-sequencer-go v0.0.17-0.20240528082608-bbbd57
 github.com/EspressoSystems/espresso-sequencer-go v0.0.17-0.20240528082608-bbbd574509f5/go.mod h1:BbU8N23RGl45QXSf/bYc8OQ8TG/vlMaPC1GU1acqKmc=
 github.com/EspressoSystems/espresso-sequencer-go v0.0.17-0.20240531094034-0a7f8d897b54 h1:hd5kEyFG7WJCt8ABxhuVH1IDBx8G9lJ9YtIsL6OlkN0=
 github.com/EspressoSystems/espresso-sequencer-go v0.0.17-0.20240531094034-0a7f8d897b54/go.mod h1:BbU8N23RGl45QXSf/bYc8OQ8TG/vlMaPC1GU1acqKmc=
+github.com/EspressoSystems/espresso-sequencer-go v0.0.17 h1:rDuLHee6YWFRmdiwPxQK0cQL4xo89LjMaBaFn3v7HpQ=
+github.com/EspressoSystems/espresso-sequencer-go v0.0.17/go.mod h1:BbU8N23RGl45QXSf/bYc8OQ8TG/vlMaPC1GU1acqKmc=
 github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY=
 github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible h1:1G1pk05UrOh0NlF1oeaaix1x8XzrfjIDK47TY0Zehcw=
 github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=

diff --git a/system_tests/espresso_e2e_test.go b/system_tests/espresso_e2e_test.go
@@ -344,10 +344,10 @@ func runNodes(ctx context.Context, t *testing.T) (*NodeBuilder, *TestClient, *Bl
 	cleanEspresso := runEspresso(t, ctx)
 
 	// wait for the builder
-	err = waitForWith(t, ctx, 240*time.Second, 1*time.Second, func() bool {
+	err = waitForWith(t, ctx, 300*time.Second, 1*time.Second, func() bool {
 		out, err := exec.Command("curl", "http://localhost:41003/block_info/builderaddress", "-L").Output()
 		if err != nil {
-			log.Warn("retry to check the commitment task", "err", err)
+			log.Warn("retry to check the builder", "err", err)
 			return false
 		}
 		return len(out) > 0
@@ -477,7 +477,7 @@ func TestEspressoE2E(t *testing.T) {
 	})
 	defer cleanC()
 
-	err = waitForWith(t, ctx, 120*time.Second, 1*time.Second, func() bool {
+	err = waitForWith(t, ctx, 240*time.Second, 1*time.Second, func() bool {
 		validatedA := blockValidatorA.Validated(t)
 		validatedB := blockValidatorB.Validated(t)
 		validatorC := blockValidatorC.Validated(t)
@@ -495,7 +495,7 @@ func TestEspressoE2E(t *testing.T) {
 	badOpts1 := builder.L1Info.GetDefaultCallOpts("Staker2", ctx)
 	badOpts2 := builder.L1Info.GetDefaultCallOpts("Staker3", ctx)
 	i := 0
-	err = waitFor(t, ctx, func() bool {
+	err = waitForWith(t, ctx, 60*time.Second, 2*time.Second, func() bool {
 		log.Info("good staker acts", "step", i)
 		txA, err := goodStaker.Act(ctx)
 		Require(t, err)