[alpha] Move devel to alpha

.github/workflows/ci.yml

@@ -23,17 +23,22 @@ jobs:
       - uses: actions/setup-go@v3
         with:
           go-version: 1.18.x
-      - name: Install dependencies
-        run: |
-          if [ "$RUNNER_OS" == "Linux" ]; then
-            sudo apt update && sudo apt install build-essential
-          fi
-        shell: bash
+      - name: Install dependencies on Linux
+        if: runner.os == 'Linux'
+        run: sudo apt update && sudo apt install build-essential
+
       - uses: actions/cache@v3
         with:
-          path: ~/go/pkg/mod
-          key: ${{ matrix.os }}-go-${{ hashFiles('**/go.sum') }}
-      - run: make all
+          path: |
+            ~/.cache/go-build
+            ~/Library/Caches/go-build
+            ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: ${{ runner.os }}-go-
+
+      - name: Build
+        run: make all
+
       - name: Reproducible build test
         run: |
           make erigon
@@ -43,33 +48,52 @@ jobs:
           if ! cmp -s erigon1.sha256 erigon2.sha256; then
             echo >&2 "Reproducible build broken"; cat erigon1.sha256; cat erigon2.sha256; exit 1
           fi
+
       - name: Lint
-        if: matrix.os == 'ubuntu-20.04'
+        if: runner.os == 'Linux'
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.45
+          version: v1.46
           skip-pkg-cache: true
           skip-build-cache: true
-      - run: make test
 
-  win:
-    strategy:
-      matrix:
-        os: [ windows-2019 ]
-    runs-on: ${{ matrix.os }}
+      - name: Test
+        run: make test
+
+  tests-windows:
+    runs-on: windows-2019
 
     steps:
       - uses: actions/checkout@v3
       - run: git submodule update --init --recursive --force
       - uses: actions/setup-go@v3
         with:
           go-version: 1.18.x
-      - run: choco upgrade mingw cmake -y --no-progress
-      - name: Build
+
+      - uses: actions/cache@v3
+        with:
+          path: |
+            C:\ProgramData\chocolatey\lib\mingw
+            C:\ProgramData\chocolatey\lib\cmake
+          key: chocolatey
+      - name: Install dependencies
         run: |
-          .\wmake.ps1
-          make test
-        shell: powershell
+          choco upgrade mingw -y --no-progress --version 11.2.0.07112021
+          choco install cmake -y --no-progress --version 3.23.1
+
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~\AppData\Local\go-build
+            ~\go\pkg\mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: ${{ runner.os }}-go-
+
+      - name: Build
+        run: .\wmake.ps1 all
+
+      - name: Test
+        run: .\wmake.ps1 test
 
   docker:
     runs-on: ubuntu-20.04

.github/workflows/test-integration.yml

@@ -5,19 +5,10 @@ on:
       - devel
       - alpha
       - stable
-  pull_request:
-    branches:
-      - devel
-      - alpha
-      - stable
-    types:
-      - closed
   schedule:
     - cron: '20 16 * * *' # daily at 16:20 UTC
 jobs:
   tests:
-    if: github.event.schedule || github.event.pull_request.merged
-
     strategy:
       matrix:
         os: [ ubuntu-20.04, macos-11 ] # list of os: https://github.com/actions/virtual-environments
@@ -29,14 +20,50 @@ jobs:
       - uses: actions/setup-go@v3
         with:
           go-version: 1.18.x
+      - name: Install dependencies on Linux
+        if: runner.os == 'Linux'
+        run: sudo apt update && sudo apt install build-essential
+
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cache/go-build
+            ~/Library/Caches/go-build
+            ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: ${{ runner.os }}-go-
+
+      - name: test-integration
+        run: make test-integration
+
+  tests-windows:
+    runs-on: windows-2019
+
+    steps:
+      - uses: actions/checkout@v3
+      - run: git submodule update --init --recursive --force
+      - uses: actions/setup-go@v3
+        with:
+          go-version: 1.18.x
+
+      - uses: actions/cache@v3
+        with:
+          path: |
+            C:\ProgramData\chocolatey\lib\mingw
+            C:\ProgramData\chocolatey\lib\cmake
+          key: chocolatey
       - name: Install dependencies
         run: |
-          if [ "$RUNNER_OS" == "Linux" ]; then
-            sudo apt update && sudo apt install build-essential
-          fi
-        shell: bash
+          choco upgrade mingw -y --no-progress --version 11.2.0.07112021
+          choco install cmake -y --no-progress --version 3.23.1
+
       - uses: actions/cache@v3
         with:
-          path: ~/go/pkg/mod
-          key: ${{ matrix.os }}-go-${{ hashFiles('**/go.sum') }}
-      - run: make test-integration
+          path: |
+            ~\AppData\Local\go-build
+            ~\go\pkg\mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: ${{ runner.os }}-go-
+
+      - name: test-integration
+        run: .\wmake.ps1 test-integration

.golangci.yml

@@ -14,7 +14,7 @@ linters:
     - structcheck
     - unused
     - varcheck
-    - gocritic
+#    - gocritic
     - bodyclose
 #    - gosec
 #    - forcetypeassert

Makefile

@@ -105,7 +105,7 @@ lintci:
 
 lintci-deps:
 	rm -f ./build/bin/golangci-lint
-	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b ./build/bin v1.45.2
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b ./build/bin v1.46.0
 
 clean:
 	go clean -cache

cmd/cons/commands/clique.go

@@ -15,10 +15,8 @@ import (
 
 	grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
 	grpc_recovery "github.com/grpc-ecosystem/go-grpc-middleware/recovery"
-	common2 "github.com/ledgerwatch/erigon-lib/common"
-
-	//grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
 	"github.com/holiman/uint256"
+	common2 "github.com/ledgerwatch/erigon-lib/common"
 	"github.com/ledgerwatch/erigon-lib/gointerfaces"
 	proto_cons "github.com/ledgerwatch/erigon-lib/gointerfaces/consensus"
 	"github.com/ledgerwatch/erigon-lib/kv"