aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Laine <[email protected]>2020-12-17 15:14:20 -0500
committerDan Laine <[email protected]>2020-12-17 15:14:20 -0500
commit7a3492c26c2605840d57fb5efdd5761f44deaaff (patch)
tree8e6e94e98e01e5beff25bb4fe573785ba4b1ee50
parent37f247ff4301958a42c15c6aeff68233907388de (diff)
parent4bfc175770fa006387ca1ffd2360fc0665dfcbf3 (diff)
Merge branch 'dev' of github.com:ava-labs/coreth into dev
-rwxr-xr-x.ci/lint.sh6
-rw-r--r--.github/workflows/ci.yml2
-rw-r--r--.golangci.yml2
-rw-r--r--plugin/evm/vm.go2
4 files changed, 3 insertions, 9 deletions
diff --git a/.ci/lint.sh b/.ci/lint.sh
index cde7292..e5363a8 100755
--- a/.ci/lint.sh
+++ b/.ci/lint.sh
@@ -1,12 +1,8 @@
# binary will be $(go env GOPATH)/bin/golangci-lint
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.30.0
-# or install it into ./bin/
-curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.30.0
-# In alpine linux (as it does not come with curl by default)
-wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.30.0
export PATH=$PATH:$(go env GOPATH)/bin
golangci-lint --version
-golangci-lint run --max-same-issues 0 \ No newline at end of file
+golangci-lint run --max-same-issues 0
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b371b2f..c5ef50b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,7 +3,7 @@ on: [pull_request, push]
jobs:
lint:
- name: Golang v${{ matrix.go }} (${{ matrix.os }})
+ name: Lint Golang v${{ matrix.go }} (${{ matrix.os }})
runs-on: ${{ matrix.os }}
strategy:
matrix:
diff --git a/.golangci.yml b/.golangci.yml
index 18b325e..d2a5e38 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -19,9 +19,7 @@ linters:
- govet
- ineffassign
- misspell
- # - staticcheck
- unconvert
- # - unused
- varcheck
linters-settings:
diff --git a/plugin/evm/vm.go b/plugin/evm/vm.go
index f125564..231db2a 100644
--- a/plugin/evm/vm.go
+++ b/plugin/evm/vm.go
@@ -769,7 +769,7 @@ func (vm *VM) writeBackMetadata() {
// awaitTxPoolStabilized waits for a txPoolHead channel event
// and notifies the VM when the tx pool has stabilized to the
// expected block hash
-// Waits for signal to shutdown from txPoolStabilizedShutdownChan chan
+// Waits for signal to shutdown from [vm.shutdownChan]
func (vm *VM) awaitTxPoolStabilized() {
defer vm.shutdownWg.Done()
for {