Merge remote-tracking branch 'origin/main' into ease-of-merge-linter-…

…autofixes
CosmWasm · Aug 30, 2023 · e937318 · e937318
2 parents 9fc6864 + 78b5af2
commit e937318
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/.github/workflows/codeql-analizer.yml b/.github/workflows/codeql-analizer.yml
@@ -19,7 +19,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v3.6.0
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL

diff --git a/.github/workflows/proto-buf-publisher.yml b/.github/workflows/proto-buf-publisher.yml
@@ -16,7 +16,7 @@ jobs:
   push:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.5.3
+      - uses: actions/checkout@v3.6.0
       - uses: bufbuild/buf-setup-action@v1.26.1
 
       # lint checks

diff --git a/x/wasm/keeper/metrics.go b/x/wasm/keeper/metrics.go
@@ -29,6 +29,9 @@ type WasmVMMetricsCollector struct {
 
 // NewWasmVMMetricsCollector constructor
 func NewWasmVMMetricsCollector(s metricSource) *WasmVMMetricsCollector {
+	if s == nil {
+		panic("wasmvm instance must not be nil")
+	}
 	return &WasmVMMetricsCollector{
 		source:             s,
 		CacheHitsDescr:     prometheus.NewDesc("wasmvm_cache_hits_total", "Total number of cache hits", []string{"type"}, nil),

diff --git a/x/wasm/keeper/options.go b/x/wasm/keeper/options.go
@@ -126,7 +126,7 @@ func WithAccountPruner(x AccountPruner) Option {
 }
 
 func WithVMCacheMetrics(r prometheus.Registerer) Option {
-	return optsFn(func(k *Keeper) {
+	return postOptsFn(func(k *Keeper) {
 		NewWasmVMMetricsCollector(k.wasmVM).Register(r)
 	})
 }

diff --git a/x/wasm/keeper/options_test.go b/x/wasm/keeper/options_test.go
@@ -1,6 +1,7 @@
 package keeper
 
 import (
+	"github.com/prometheus/client_golang/prometheus"
 	"reflect"
 	"testing"
 
@@ -37,6 +38,15 @@ func TestConstructorOptions(t *testing.T) {
 				assert.IsType(t, &wasmtesting.MockWasmer{}, k.wasmVM)
 			},
 		},
+		"vm cache metrics": {
+			srcOpt: WithVMCacheMetrics(prometheus.DefaultRegisterer),
+			verify: func(t *testing.T, k Keeper) {
+				t.Helper()
+				registered := prometheus.DefaultRegisterer.Unregister(NewWasmVMMetricsCollector(k.wasmVM))
+				assert.True(t, registered)
+			},
+			isPostOpt: true,
+		},
 		"decorate wasmvm": {
 			srcOpt: WithWasmEngineDecorator(func(old types.WasmerEngine) types.WasmerEngine {
 				require.IsType(t, &wasmvm.VM{}, old)