Merge branch 'master' into TELCO-676-fix-non-funtional-linting-warnings

omec-project · Nov 25, 2023 · 10491f1 · 10491f1
2 parents ece83e8 + d84811b
commit 10491f1
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 24 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -220,35 +220,35 @@ linters-settings:
 linters:
   enable:
     - gofmt
-    - govet
-    - errcheck
-    - staticcheck
-    - unused
-    - gosimple
-    - structcheck
-    - varcheck
+    # - govet
+    # - errcheck
+    # - staticcheck
+    # - unused
+    # - gosimple
+    # - structcheck
+    # - varcheck
     - ineffassign
-    - deadcode
-    - typecheck
+    # - deadcode
+    # - typecheck
     # Additional
-    - lll
+    # - lll
     - godox
-    #- gomnd
-    #- goconst
+    # - gomnd
+    # - goconst
     # - gocognit
     # - maligned
     # - nestif
     # - gomodguard
-    - nakedret
-    - gci
-    - misspell
-    - gofumpt
-    - whitespace
-    - unconvert
-    - predeclared
-    - noctx
+    # - nakedret
+    # - gci
+    # - misspell
+    # - gofumpt
+    # - whitespace
+    # - unconvert
+    # - predeclared
+    # - noctx
     - dogsled
-    - bodyclose
+    # - bodyclose
     - asciicheck
       #- stylecheck
       # - unparam

diff --git a/fsm/handler.go b/fsm/handler.go
@@ -35,9 +35,9 @@ type SmEventData struct {
 }
 
 // Define FSM Func Point Struct here
-type fsmHandler [smf_context.SmStateMax][SmEventMax]func(event SmEvent, eventData *SmEventData) (smf_context.SMContextState, error)
+type eventHandler func(event SmEvent, eventData *SmEventData) (smf_context.SMContextState, error)
 
-var SmfFsmHandler fsmHandler
+var SmfFsmHandler [smf_context.SmStateMax][SmEventMax]eventHandler
 
 func init() {
 	// Initilise with default invalid handler

diff --git a/go.mod b/go.mod
@@ -97,7 +97,7 @@ require (
 	go.uber.org/multierr v1.8.0 // indirect
 	go.uber.org/zap v1.23.0 // indirect
 	go4.org/intern v0.0.0-20220617035311-6925f38cc365 // indirect
-	go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 // indirect
+	go4.org/unsafe/assume-no-moving-gc v0.0.0-20230525183740-e7c30c78aeb2 // indirect
 	golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect
 	golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b // indirect
 	golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect

diff --git a/go.sum b/go.sum
@@ -542,6 +542,8 @@ go4.org/intern v0.0.0-20220617035311-6925f38cc365/go.mod h1:WXRv3p7T6gzt0CcJm43A
 go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
 go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 h1:FyBZqvoA/jbNzuAWLQE2kG820zMAkcilx6BMjGbL/E4=
 go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
+go4.org/unsafe/assume-no-moving-gc v0.0.0-20230525183740-e7c30c78aeb2 h1:WJhcL4p+YeDxmZWg141nRm7XC8IDmhz7lk5GpadO1Sg=
+go4.org/unsafe/assume-no-moving-gc v0.0.0-20230525183740-e7c30c78aeb2/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=