Merge branch 'main' into ud/evm

NibiruChain · Apr 27, 2024 · 31bb3bb · 31bb3bb
2 parents 1a05061 + 072de03
commit 31bb3bb
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/.github/codecov.yml b/.github/codecov.yml
@@ -22,14 +22,13 @@ coverage:
     project:
       default:
         if_not_found: success
-        if_ci_failed: error
-        target: auto
+        target: 66%
         threshold: 1% # Allow coverage to drop by X%, posting a success status.
         # removed_code_behavior: Takes values [off, removals_only, adjust_base]
         removed_code_behavior: adjust_base
     patch:
       default:
-        target: 70%
+        target: 69%
 
 comment: # this is a top-level key
   layout: " diff, flags, files"

diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -49,7 +49,7 @@ jobs:
           key: go-mod-cache-${{ hashFiles('**/go.sum') }}
 
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v4
+        uses: golangci/golangci-lint-action@v5
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
           version: v1.54.2

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -52,3 +52,5 @@ jobs:
 
       - name: "Upload coverage reports to Codecov"
         uses: codecov/codecov-action@v4
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -112,6 +112,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Bump `golang.org/x/net` from 0.0.0-20220607020251-c690dde0001d to 0.23.0 in /geth ([#1849](https://github.com/NibiruChain/nibiru/pull/1849))
 - Bump `golang.org/x/net` from 0.20.0 to 0.23.0 ([#1850](https://github.com/NibiruChain/nibiru/pull/1850))
 - Bump `github.com/supranational/blst` from 0.3.8-0.20220526154634-513d2456b344 to 0.3.11 ([#1851](https://github.com/NibiruChain/nibiru/pull/1851))
+- Bump `golangci/golangci-lint-action` from 4 to 5 ([#1854](https://github.com/NibiruChain/nibiru/pull/1854))
 
 ## [v1.2.0](https://github.com/NibiruChain/nibiru/releases/tag/v1.2.0) - 2024-03-28
 

diff --git a/x/oracle/types/errors.go b/x/oracle/types/errors.go
@@ -2,11 +2,10 @@ package types
 
 import (
 	"fmt"
+	"sync/atomic"
 
 	"github.com/cometbft/cometbft/crypto/tmhash"
 
-	"sync/atomic"
-
 	sdkerrors "cosmossdk.io/errors"
 )