feat(utils): Merge branched changes (#87)

berachain · Jan 25, 2023 · c117d7e · c117d7e
1 parent c8fb70f
commit c117d7e
Show file tree

Hide file tree

Showing 19 changed files with 103 additions and 1,028 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -42,7 +42,7 @@ jobs:
           name: Test Unit
           command: mage testunitcover
       - codecov/upload:
-          file: coverage-testUnitCover.txt
+          file: coverage-testunitcover.txt
       - store_test_results:
           path: .
 

diff --git a/build/mage/test.go b/build/mage/test.go
@@ -23,9 +23,9 @@ var (
 
 	// Arguments.
 	junitArgs = []string{"--junit-report", "out.xml"}
-	coverArgs = append(junitArgs, []string{"--cover", "--coverprofile", "coverage.txt", "--covermode", "atomic"}...)
-	raceArgs  = append(junitArgs, []string{"-race"}...)
-
+	coverArgs = append(junitArgs, []string{"--cover", "--coverprofile",
+		"coverage-testunitcover.txt", "--covermode", "atomic"}...)
+	raceArgs = append(junitArgs, []string{"-race"}...)
 	// Commands.
 	goTest     = mi.RunCmdV("go", "test", "-mod=readonly")
 	ginkgoTest = mi.RunCmdV("ginkgo", "-r", "--randomize-all", "--fail-on-pending", "-trace")

diff --git a/build/tools/tools.go b/build/tools/tools.go
@@ -29,6 +29,7 @@ import (
 	_ "github.com/google/addlicense"
 	_ "github.com/incu6us/goimports-reviser/v3"
 	_ "github.com/onsi/ginkgo/v2/ginkgo"
+	_ "github.com/securego/gosec/v2/cmd/gosec"
 	_ "github.com/segmentio/golines"
 	_ "golang.org/x/tools/cmd/goimports"
 	_ "golang.org/x/tools/gopls"

diff --git a/codecov.yml b/codecov.yml
@@ -26,11 +26,11 @@ comment:
   require_changes: true
 
 ignore:
-  - "*/**/*.pb.go"
-  - "*/**/*.pb.gw.go"
-  - "*/**/*.pb.pulsar.go"
-  - "*/**/*.abigen.go"
-  - "*/**/*.mock.go"
-  - "*/**/proto"
+  - "**/*.pb.go"
+  - "**/*.pb.gw.go"
+  - "**/*.pb.pulsar.go"
+  - "**/*.abigen.go"
+  - "**/*.mock.go"
+  - "**/proto"
   - "build/"
-  - "cmd/" 
+  - "cmd/"
diff --git a/core/state/types/state.go b/core/state/types/state.go
@@ -18,8 +18,8 @@ import (
 	"fmt"
 	"strings"
 
-	"cosmossdk.io/errors"
 	"github.com/berachain/stargazer/lib/common"
+	"github.com/berachain/stargazer/lib/errors"
 	"github.com/berachain/stargazer/lib/gointerfaces"
 )
 

diff --git a/core/state/types/storage.go b/core/state/types/storage.go
@@ -17,7 +17,7 @@ package types
 import (
 	"fmt"
 
-	"cosmossdk.io/errors"
+	"github.com/berachain/stargazer/lib/errors"
 	"github.com/berachain/stargazer/lib/gointerfaces"
 )
 

diff --git a/core/vm/precompile/ethlog_factory.go b/core/vm/precompile/ethlog_factory.go
diff --git a/core/vm/precompile/ethlog_factory_test.go b/core/vm/precompile/ethlog_factory_test.go