From 363f1c840aebfba75d0f3a9ed1fa189669d8887b Mon Sep 17 00:00:00 2001 From: moglu2017 Date: Thu, 23 Jul 2026 17:46:19 +0800 Subject: [PATCH 1/3] chore: upgrade Go toolchain to 1.26.5 and CI actions - bump go.mod go directive from 1.24.2 to 1.26.5 - bump actions/checkout to v7 and actions/setup-go to v7 in CI workflow - return *hayabusa.Network by pointer instead of by value from test setup helpers to avoid copying the struct --- .github/workflows/run-tests.yaml | 8 ++++---- go.mod | 2 +- tests/validations/validations_test.go | 2 +- testutil/config_utils.go | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml index 60187a6..685c48d 100644 --- a/.github/workflows/run-tests.yaml +++ b/.github/workflows/run-tests.yaml @@ -52,22 +52,22 @@ jobs: steps: - name: Checkout E2E - uses: actions/checkout@v4 + uses: actions/checkout@v7 with: repository: vechain/hayabusa-e2e path: hayabusa-e2e - name: Checkout Thor - uses: actions/checkout@v4 + uses: actions/checkout@v7 with: repository: vechain/thor path: thor ref: ${{ inputs.thor-branch || 'master' }} - name: Install Go - uses: actions/setup-go@v5 + uses: actions/setup-go@v7 with: - go-version: 1.24.x + go-version: '1.26.5' - name: Test run: go test -v -parallel 4 -failfast -timeout 3600s ./${{ matrix.packages }} diff --git a/go.mod b/go.mod index 167cef9..9c83847 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/vechain/hayabusa-e2e -go 1.24.2 +go 1.26.5 replace github.com/syndtr/goleveldb => github.com/vechain/goleveldb v1.0.1-0.20220809091043-51eb019c8655 diff --git a/tests/validations/validations_test.go b/tests/validations/validations_test.go index af7814a..094e0da 100644 --- a/tests/validations/validations_test.go +++ b/tests/validations/validations_test.go @@ -793,7 +793,7 @@ func assertValidatorStakingPeriod(t *testing.T, staker *builtin.Staker, validato assert.Equal(t, expectedPeriod, validator.Period) } -func setupTestNetwork(t *testing.T, maxBlockProposers uint32) (*hayabusa.Config, *thorclient.Client, hayabusa.Network) { +func setupTestNetwork(t *testing.T, maxBlockProposers uint32) (*hayabusa.Config, *thorclient.Client, *hayabusa.Network) { return testutil.SetupTestNetworkWithEpochAndBlockInterval(t, maxBlockProposers, 2, 5) } diff --git a/testutil/config_utils.go b/testutil/config_utils.go index bcc531a..cec5d4b 100644 --- a/testutil/config_utils.go +++ b/testutil/config_utils.go @@ -13,7 +13,7 @@ import ( "github.com/vechain/thor/v2/thorclient/builtin" ) -func SetupTestNetworkWithEpochAndBlockInterval(t *testing.T, maxBlockProposers uint32, epochLength uint32, blockInterval uint64) (*hayabusa.Config, *thorclient.Client, hayabusa.Network) { +func SetupTestNetworkWithEpochAndBlockInterval(t *testing.T, maxBlockProposers uint32, epochLength uint32, blockInterval uint64) (*hayabusa.Config, *thorclient.Client, *hayabusa.Network) { config := &hayabusa.Config{ Nodes: 6, MaxBlockProposers: maxBlockProposers, @@ -34,7 +34,7 @@ func SetupTestNetworkWithEpochAndBlockInterval(t *testing.T, maxBlockProposers u require.NoError(t, err) t.Cleanup(network.Stop) require.NoError(t, network.Start()) - return config, network.ThorClient(), *network + return config, network.ThorClient(), network } func SetupStakerAndWaitForFork(t *testing.T, client *thorclient.Client, config *hayabusa.Config) *builtin.Staker { From 10624987c1a899d8156c9622e84826dd15474537 Mon Sep 17 00:00:00 2001 From: moglu2017 Date: Fri, 24 Jul 2026 13:13:35 +0800 Subject: [PATCH 2/3] ci: derive Go version from go.mod in test workflow - Replace hardcoded go-version with go-version-file so the workflow tracks the version pinned in go.mod --- .github/workflows/run-tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml index 685c48d..4310ca1 100644 --- a/.github/workflows/run-tests.yaml +++ b/.github/workflows/run-tests.yaml @@ -67,7 +67,7 @@ jobs: - name: Install Go uses: actions/setup-go@v7 with: - go-version: '1.26.5' + go-version-file: 'go.mod' - name: Test run: go test -v -parallel 4 -failfast -timeout 3600s ./${{ matrix.packages }} From a3389effef9b13b8aaa309f5a5b60f41d3ab07ae Mon Sep 17 00:00:00 2001 From: moglu2017 Date: Fri, 24 Jul 2026 13:17:32 +0800 Subject: [PATCH 3/3] ci: point go-version-file at hayabusa-e2e submodule's go.mod --- .github/workflows/run-tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml index 4310ca1..bf75fce 100644 --- a/.github/workflows/run-tests.yaml +++ b/.github/workflows/run-tests.yaml @@ -67,7 +67,7 @@ jobs: - name: Install Go uses: actions/setup-go@v7 with: - go-version-file: 'go.mod' + go-version-file: 'hayabusa-e2e/go.mod' - name: Test run: go test -v -parallel 4 -failfast -timeout 3600s ./${{ matrix.packages }}