From 70865c56b8b3f880a7c80afaa1eba7caf7e52f9a Mon Sep 17 00:00:00 2001 From: Joshua Gutow Date: Wed, 9 Nov 2022 14:39:56 -0800 Subject: [PATCH 1/3] Enable stricter lints --- .circleci/config.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d2a42e64fb3..0cb98ae399b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -351,9 +351,8 @@ jobs: - checkout - run: name: run lint - # command: golangci-lint run -E goimports,sqlclosecheck,bodyclose,asciicheck,misspell,errorlint -e "errors.As" -e "errors.Is" ./... command: | - golangci-lint run -E goimports,sqlclosecheck,bodyclose,asciicheck,misspell ./... + golangci-lint run -E goimports,sqlclosecheck,bodyclose,asciicheck,misspell,errorlint -e "errors.As" -e "errors.Is" ./... working_directory: <> go-test: @@ -932,4 +931,4 @@ workflows: requires: - op-node-publish-dev - op-batcher-publish-dev - - op-proposer-publish-dev \ No newline at end of file + - op-proposer-publish-dev From c53062fa253ab4eadec55405fdaf29920bebf97d Mon Sep 17 00:00:00 2001 From: Joshua Gutow Date: Wed, 9 Nov 2022 14:42:16 -0800 Subject: [PATCH 2/3] Fix lint in op-e2e --- op-e2e/actions/l2_engine_api.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/op-e2e/actions/l2_engine_api.go b/op-e2e/actions/l2_engine_api.go index 1d6ff7b5d5a..4ac9bd1e4db 100644 --- a/op-e2e/actions/l2_engine_api.go +++ b/op-e2e/actions/l2_engine_api.go @@ -94,7 +94,7 @@ func (ea *L2EngineAPI) startBlock(parent common.Hash, params *eth.PayloadAttribu for i, otx := range params.Transactions { var tx types.Transaction if err := tx.UnmarshalBinary(otx); err != nil { - return fmt.Errorf("transaction %d is not valid: %v", i, err) + return fmt.Errorf("transaction %d is not valid: %w", i, err) } ea.l2BuildingState.Prepare(tx.Hash(), i) receipt, err := core.ApplyTransaction(ea.l2Cfg.Config, ea.l2Chain, &ea.l2BuildingHeader.Coinbase, @@ -123,10 +123,10 @@ func (ea *L2EngineAPI) endBlock() (*types.Block, error) { // Write state changes to db root, err := ea.l2BuildingState.Commit(ea.l2Cfg.Config.IsEIP158(header.Number)) if err != nil { - return nil, fmt.Errorf("l2 state write error: %v", err) + return nil, fmt.Errorf("l2 state write error: %w", err) } if err := ea.l2BuildingState.Database().TrieDB().Commit(root, false, nil); err != nil { - return nil, fmt.Errorf("l2 trie write error: %v", err) + return nil, fmt.Errorf("l2 trie write error: %w", err) } return block, nil } From ffdbcbca9d369646ee6363ff8dafba54b95634b0 Mon Sep 17 00:00:00 2001 From: Joshua Gutow Date: Wed, 9 Nov 2022 14:44:01 -0800 Subject: [PATCH 3/3] Fix lints in op-node --- op-node/rollup/derive/engine_queue.go | 2 +- op-node/rollup/derive/l1_traversal.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/op-node/rollup/derive/engine_queue.go b/op-node/rollup/derive/engine_queue.go index ec7d29933bc..3de3eef2216 100644 --- a/op-node/rollup/derive/engine_queue.go +++ b/op-node/rollup/derive/engine_queue.go @@ -511,7 +511,7 @@ func (eq *EngineQueue) Reset(ctx context.Context, _ eth.L1BlockRef, _ eth.System } l1Cfg, err := eq.engine.SystemConfigByL2Hash(ctx, pipelineL2.Hash) if err != nil { - return NewTemporaryError(fmt.Errorf("failed to fetch L1 config of L2 block %s: %v", pipelineL2.ID(), err)) + return NewTemporaryError(fmt.Errorf("failed to fetch L1 config of L2 block %s: %w", pipelineL2.ID(), err)) } eq.log.Debug("Reset engine queue", "safeHead", safe, "unsafe", unsafe, "safe_timestamp", safe.Time, "unsafe_timestamp", unsafe.Time, "l1Origin", l1Origin) eq.unsafeHead = unsafe diff --git a/op-node/rollup/derive/l1_traversal.go b/op-node/rollup/derive/l1_traversal.go index 8352c1ef6cd..13f4ea88f59 100644 --- a/op-node/rollup/derive/l1_traversal.go +++ b/op-node/rollup/derive/l1_traversal.go @@ -73,11 +73,11 @@ func (l1t *L1Traversal) AdvanceL1Block(ctx context.Context) error { // Parse L1 receipts of the given block and update the L1 system configuration _, receipts, err := l1t.l1Blocks.FetchReceipts(ctx, nextL1Origin.Hash) if err != nil { - return NewTemporaryError(fmt.Errorf("failed to fetch receipts of L1 block %s for L1 sysCfg update: %v", origin, err)) + return NewTemporaryError(fmt.Errorf("failed to fetch receipts of L1 block %s for L1 sysCfg update: %w", origin, err)) } if err := UpdateSystemConfigWithL1Receipts(&l1t.sysCfg, receipts, l1t.cfg); err != nil { // the sysCfg changes should always be formatted correctly. - return NewCriticalError(fmt.Errorf("failed to update L1 sysCfg with receipts from block %s: %v", origin, err)) + return NewCriticalError(fmt.Errorf("failed to update L1 sysCfg with receipts from block %s: %w", origin, err)) } l1t.block = nextL1Origin