Merge branch 'main' into feature/add-blobs

0xPolygon · Mar 14, 2024 · 2bf1762 · 2bf1762
2 parents 32b746b + 063f395
commit 2bf1762
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 7 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -0,0 +1,31 @@
+---
+run:
+  timeout: 5m
+  skip-dirs:
+    - test
+
+
+linters:
+  enable:
+  - whitespace
+  - gosec
+  - gci
+  - misspell
+  - gomnd
+  - gofmt
+  - goimports
+  - revive
+  - unconvert
+
+linters-settings:
+  revive:
+    rules:
+    - name: exported
+      arguments:
+      - disableStutteringCheck
+
+issues:
+  include:
+  - EXC0012  # EXC0012 revive: Annoying issue about not having a comment. The rare codebase has such comments
+  - EXC0014  # EXC0014 revive: Annoying issue about not having a comment. The rare codebase has such comments
+
diff --git a/ethtxmanager/ethtxmanager.go b/ethtxmanager/ethtxmanager.go
@@ -128,7 +128,7 @@ func pendingL1Txs(URL string, from common.Address, httpHeaders map[string]string
 				return nil, fmt.Errorf("failed to convert gasPrice %v to big.Int", tx.GasPrice)
 			}
 
-			data := common.Hex2Bytes(string(tx.Data))
+			data := common.Hex2Bytes(tx.Data)
 
 			// TODO: handle case of blob transaction
 

diff --git a/ethtxmanager/memstorage.go b/ethtxmanager/memstorage.go
@@ -19,7 +19,7 @@ type MemStorage struct {
 	PersistenceFilename string
 }
 
-// NewPostgresStorage creates a new instance of storage
+// NewMemStorage creates a new instance of storage
 func NewMemStorage(persistenceFilename string) *MemStorage {
 	transactions := make(map[common.Hash]monitoredTx)
 	if persistenceFilename != "" {

diff --git a/ethtxmanager/rpcclient.go b/ethtxmanager/rpcclient.go
@@ -25,12 +25,12 @@ type Response struct {
 	Result  json.RawMessage
 }
 
-// Client defines typed wrappers for the zkEVM RPC API.
+// RPCClient is a client to interact with the Ethereum JSON RPC Server
 type RPCClient struct {
 	url string
 }
 
-// NewClient creates an instance of client
+// NewRPCClient creates an instance of client
 func NewRPCClient(url string) *RPCClient {
 	return &RPCClient{
 		url: url,

diff --git a/go.mod b/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/hermeznetwork/tracerr v0.3.2
 	github.com/holiman/uint256 v1.2.4
 	github.com/invopop/jsonschema v0.12.0
-	github.com/stretchr/testify v1.8.4
+	github.com/stretchr/testify v1.9.0
 	go.uber.org/zap v1.27.0
 )
 

diff --git a/go.sum b/go.sum
@@ -337,8 +337,8 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/supranational/blst v0.3.11 h1:LyU6FolezeWAhvQk0k6O/d49jqgO52MSDDfYgbeoEm4=
 github.com/supranational/blst v0.3.11/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw=
 github.com/syndtr/goleveldb v1.0.1-0.20220614013038-64ee5596c38a h1:1ur3QoCqvE5fl+nylMaIr9PVV1w343YRDtsy+Rwu7XI=