Merge branch 'development' into kishan/fix/equivocatory-blocks

ChainSafe · Jul 11, 2022 · 74dd04a · 74dd04a
2 parents 8c59cef + 78c03b6
commit 74dd04a
Show file tree

Hide file tree

Showing 104 changed files with 5,123 additions and 5,009 deletions.
diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml
@@ -36,4 +36,4 @@ jobs:
           restore-keys: ${{ runner.os }}-go-mod
 
       - name: Fuzz trie
-        run: go test -fuzz=Fuzz_Trie_PutAndGet -fuzztime=5m github.com/ChainSafe/gossamer/lib/trie
+        run: go test -run Fuzz_Trie_PutAndGet -fuzz=Fuzz_Trie_PutAndGet -fuzztime=5m github.com/ChainSafe/gossamer/lib/trie
diff --git a/.github/workflows/mocks.yml b/.github/workflows/mocks.yml
@@ -21,7 +21,7 @@ jobs:
           stable: true
           check-latest: true
 
-      - run: go install github.com/vektra/mockery/v2@v2.10
+      - run: go install github.com/vektra/mockery/v2@v2.14
 
       - run: go install github.com/golang/mock/mockgen@v1.6
 

diff --git a/.golangci.yml b/.golangci.yml
@@ -94,11 +94,6 @@ issues:
         - revive
       text: "package comment should be of the form"
 
-    - linters:
-        - revive
-      path: lib/runtime/life/
-      text: "don't use underscores in Go names;"
-
     - linters:
         - nolintlint
       source: "^//nolint:revive"

diff --git a/cmd/gossamer/config.go b/cmd/gossamer/config.go
@@ -20,7 +20,6 @@ import (
 	"github.com/ChainSafe/gossamer/internal/log"
 	"github.com/ChainSafe/gossamer/lib/common"
 	"github.com/ChainSafe/gossamer/lib/genesis"
-	"github.com/ChainSafe/gossamer/lib/runtime/life"
 	"github.com/ChainSafe/gossamer/lib/runtime/wasmer"
 	"github.com/ChainSafe/gossamer/lib/utils"
 	"github.com/urfave/cli"
@@ -622,8 +621,6 @@ func setDotCoreConfig(ctx *cli.Context, tomlCfg ctoml.CoreConfig, cfg *dot.CoreC
 	switch tomlCfg.WasmInterpreter {
 	case wasmer.Name:
 		cfg.WasmInterpreter = wasmer.Name
-	case life.Name:
-		cfg.WasmInterpreter = life.Name
 	case "":
 		cfg.WasmInterpreter = gssmr.DefaultWasmInterpreter
 	default:

diff --git a/codecov.yml b/codecov.yml
@@ -38,7 +38,6 @@ coverage:
           - "dot/network"
           - "dot/peerset"
           - "dot/sync"
-          - "lib/runtime/life"
           - "lib/grandpa"
           - "lib/blocktree"
       50pc:

diff --git a/devnet/cmd/scale-down-ecs-service/mocks/ecsapi.go b/devnet/cmd/scale-down-ecs-service/mocks/ecsapi.go
diff --git a/dot/core/service.go b/dot/core/service.go
@@ -22,8 +22,8 @@ import (
 	"github.com/ChainSafe/gossamer/lib/runtime/wasmer"
 	"github.com/ChainSafe/gossamer/lib/services"
 	"github.com/ChainSafe/gossamer/lib/transaction"
-	cscale "github.com/centrifuge/go-substrate-rpc-client/v3/scale"
-	ctypes "github.com/centrifuge/go-substrate-rpc-client/v3/types"
+	cscale "github.com/centrifuge/go-substrate-rpc-client/v4/scale"
+	ctypes "github.com/centrifuge/go-substrate-rpc-client/v4/types"
 )
 
 var (