Skip to content

Commit

Permalink
chore(protocol): remove reliance on taiko contracts and update golang…
Browse files Browse the repository at this point in the history
…ci-lint (#18151)
  • Loading branch information
mask-pp authored Sep 20, 2024
1 parent 896f889 commit 92f571a
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 22 deletions.
15 changes: 1 addition & 14 deletions .github/workflows/taiko-client--hive_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
if: github.event.pull_request.draft == false && contains(github.event.pull_request.labels.*.name, 'option.hive-test')
name: hive tests
runs-on: [arc-runner-set]
timeout-minutes: 20
timeout-minutes: 30

steps:
- name: Cancel Previous Runs
Expand All @@ -32,22 +32,9 @@ jobs:
go-version: 1.21
cache: true

- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1

- name: Install pnpm dependencies
uses: ./.github/actions/install-pnpm-dependencies

- name: Clone taikoxyz/hive
run: git clone https://github.com/taikoxyz/hive.git /tmp/hive

- name: Update taiko contract tx list
working-directory: .
run: |
export TAIKO_MONO_DIR=$PWD
cd /tmp/hive/simulators/taiko
sh scripts/deploy_l1_contract.sh
- name: Hive tests
working-directory: packages/taiko-client
run: |
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/taiko-client--test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,8 @@ jobs:
lint:
if: github.event.pull_request.draft == false
name: Lint
runs-on: [arc-runner-set]
runs-on: [ubuntu-latest]
steps:
- name: Install Git
run: sudo apt-get update && sudo apt-get install -y git make

- uses: actions/checkout@v4

- name: Set up Go
Expand All @@ -25,9 +22,12 @@ jobs:
go-version: 1.21
cache: true

- name: Install golangci-lint
run: go install -v github.com/golangci/golangci-lint/cmd/golangci-lint@v1.60.0

- name: Lint
working-directory: packages/taiko-client
run: make lint
run: golangci-lint run --path-prefix=./ --config=.golangci.yml

integration_tests:
if: github.event.pull_request.draft == false
Expand Down
1 change: 0 additions & 1 deletion packages/taiko-client/.golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ linters:
- sqlclosecheck
- staticcheck
- stylecheck
- typecheck
- unconvert
- unused
- whitespace
Expand Down
2 changes: 1 addition & 1 deletion packages/taiko-client/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ clean:

lint:
@go install golang.org/x/tools/cmd/goimports@latest \
&& go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.56.2 \
&& go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.60 \
&& goimports -local "github.com/taikoxyz/taiko-mono/packages/taiko-client" -w ./ \
&& golangci-lint run

Expand Down
2 changes: 1 addition & 1 deletion packages/taiko-client/integration_test/hive_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func TestHiveHandler(t *testing.T) {
})

// Multi clusters reorg test.
t.Run("taiko-reorg/taiko-reorg/clusters(1)", func(t *testing.T) {
t.Run("taiko-reorg/taiko-reorg", func(t *testing.T) {
testDenebReorg(t, "taiko-reorg/taiko-reorg", [][]string{clientGroups[0]})
})

Expand Down

0 comments on commit 92f571a

Please sign in to comment.