bump core to 2.3.2 (#104)

vmidyllic · web-flow · commit 4d32189a8aff · 2025-04-28T14:51:34.000+03:00
* bump core to 2.3.2

* remove unsupported linter
diff --git a/.github/workflows/ci-lint.yaml b/.github/workflows/ci-lint.yaml
@@ -13,6 +13,11 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           go-version: 1.23.4
-      - uses: golangci/golangci-lint-action@v6
-        with:
-          version: v1.62.2
+      - name: install golangci-lint
+        run:
+          curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $GITHUB_WORKSPACE v1.60.3
+      - name: lint
+        run: |
+          go version
+          $GITHUB_WORKSPACE/golangci-lint version
+          $GITHUB_WORKSPACE/golangci-lint --config .golangci.yml run
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,20 +1,12 @@
 service:
-  golangci-lint-version: 1.51.x
+  golangci-lint-version: 1.60.3
 
 run:
   timeout: 2m
-  exclude-dirs:
-    - vendor
 
 linters-settings:
   govet:
     shadow: true
-  revive:
-    min-confidence: 0.1
-    rules:
-      # Add more comments for exported functions and remove this rule
-      - name: package-comments
-        disabled: true
   maligned:
     suggest-new: true
   goconst:
@@ -24,46 +16,55 @@ linters-settings:
     locale: US
   lll:
     line-length: 140
+  revive:
+    min-confidence: 0.1
+    rules:
+      # Add more comments for exported functions and remove this rule
+      - name: package-comments
+        disabled: true
 
 linters:
   enable:
     - bodyclose
     - revive
     - govet
     - unconvert
-    - gosec
     - gocyclo
-    - dupl
     - misspell
     - unparam
     - typecheck
     - ineffassign
     - stylecheck
     - gochecknoinits
-    - gocritic
+    - copyloopvar
     - nakedret
     - gosimple
     - prealloc
-    - unused
     - goimports
     - gofmt
     - errcheck
     - staticcheck
-    - exportloopref
 
+    ## format - fill free to fix
+  #    - errcheck
+  #    - gofmt
   fast: false
-  disable-all: true
+  disable:
+    - dupl
 
 issues:
   exclude-rules:
-#    - Fix and remove
+    #    - Fix and remove
     - text: "at least one file in a package should have a package comment"
       linters:
         - stylecheck
-  #    - Fix and remove
-    - text: "should have a package comment, unless it's in another file for this package"
+    #    - Fix and remove
+    - text: "package-comments: should have a package comment"
       linters:
         - revive
+    - text: "shadow: declaration of \"err\" shadows declaration"
+      linters:
+        - govet
     - path: _test\.go
       linters:
         - gosec
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/iden3/go-schema-processor/v2
 go 1.18
 
 require (
-	github.com/iden3/go-iden3-core/v2 v2.3.1
+	github.com/iden3/go-iden3-core/v2 v2.3.2
 	github.com/iden3/go-iden3-crypto v0.0.17
 	github.com/iden3/go-merkletree-sql/v2 v2.0.4
 	// We require the `json-gold` bugfix which has not yet been included in the
diff --git a/go.sum b/go.sum
@@ -2,8 +2,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dchest/blake512 v1.0.0 h1:oDFEQFIqFSeuA34xLtXZ/rWxCXdSjirjzPhey5EUvmA=
 github.com/dchest/blake512 v1.0.0/go.mod h1:FV1x7xPPLWukZlpDpWQ88rF/SFwZ5qbskrzhLMB92JI=
-github.com/iden3/go-iden3-core/v2 v2.3.1 h1:ytQqiclnVAIWyRKR2LF31hfz4DGRBD6nMjiPILXGSKk=
-github.com/iden3/go-iden3-core/v2 v2.3.1/go.mod h1:8vmG6y8k9VS7iNoxuiKukKbRQFsMyabCc+i8er07zOs=
+github.com/iden3/go-iden3-core/v2 v2.3.2 h1:kZq/TiSUmBKO/mvPUucfFE45ugTW+hXXlGT+Jf6CQTg=
+github.com/iden3/go-iden3-core/v2 v2.3.2/go.mod h1:8vmG6y8k9VS7iNoxuiKukKbRQFsMyabCc+i8er07zOs=
 github.com/iden3/go-iden3-crypto v0.0.17 h1:NdkceRLJo/pI4UpcjVah4lN/a3yzxRUGXqxbWcYh9mY=
 github.com/iden3/go-iden3-crypto v0.0.17/go.mod h1:dLpM4vEPJ3nDHzhWFXDjzkn1qHoBeOT/3UEhXsEsP3E=
 github.com/iden3/go-merkletree-sql/v2 v2.0.4 h1:Dp089P3YNX1BE8+T1tKQHWTtnk84Y/Kr7ZAGTqwscoY=
diff --git a/loaders/document_loader.go b/loaders/document_loader.go
@@ -23,13 +23,16 @@ const (
 
 var rApplicationJSON = regexp.MustCompile(`^application/(\w*\+)?json$`)
 
+// ErrCacheMiss is an error when there is no info in cache
 var ErrCacheMiss = errors.New("cache miss")
 
+// CacheEngine is engine interface for cache storages
 type CacheEngine interface {
 	Get(key string) (doc *ld.RemoteDocument, expireTime time.Time, err error)
 	Set(key string, doc *ld.RemoteDocument, expireTime time.Time) error
 }
 
+// IPFSClient interface
 type IPFSClient interface {
 	Cat(url string) (io.ReadCloser, error)
 }
@@ -42,8 +45,10 @@ type documentLoader struct {
 	httpClient  *http.Client
 }
 
+// DocumentLoaderOption is an option for document loader
 type DocumentLoaderOption func(*documentLoader)
 
+// WithCacheEngine is an option for setting cache
 func WithCacheEngine(cacheEngine CacheEngine) DocumentLoaderOption {
 	return func(loader *documentLoader) {
 		if cacheEngine == nil {
@@ -55,6 +60,7 @@ func WithCacheEngine(cacheEngine CacheEngine) DocumentLoaderOption {
 	}
 }
 
+// WithHTTPClient is an option for setting http client
 func WithHTTPClient(httpClient *http.Client) DocumentLoaderOption {
 	return func(loader *documentLoader) {
 		loader.httpClient = httpClient
@@ -82,6 +88,7 @@ func NewDocumentLoader(ipfsCli IPFSClient, ipfsGW string,
 	return loader
 }
 
+// LoadDocument loads document from ipfs or http / https source
 func (d *documentLoader) LoadDocument(
 	u string) (doc *ld.RemoteDocument, err error) {
 
diff --git a/loaders/memory_cache.go b/loaders/memory_cache.go
@@ -62,8 +62,10 @@ func (m *memoryCacheEngine) Set(key string, doc *ld.RemoteDocument,
 	return nil
 }
 
+// MemoryCacheEngineOption is an option to set cache engine
 type MemoryCacheEngineOption func(*memoryCacheEngine) error
 
+// WithEmbeddedDocumentBytes sets bytes for given url
 func WithEmbeddedDocumentBytes(u string, doc []byte) MemoryCacheEngineOption {
 	return func(engine *memoryCacheEngine) error {
 		if engine.embedDocs == nil {
@@ -81,6 +83,7 @@ func WithEmbeddedDocumentBytes(u string, doc []byte) MemoryCacheEngineOption {
 	}
 }
 
+// NewMemoryCacheEngine creates new memory cache engine
 func NewMemoryCacheEngine(
 	opts ...MemoryCacheEngineOption) (CacheEngine, error) {
 
diff --git a/testing/http.go b/testing/http.go
@@ -73,14 +73,17 @@ type mockHTTPClientOptions struct {
 	ignoreUntouchedURLs bool
 }
 
+// MockHTTPClientOption is mock for http client for tests
 type MockHTTPClientOption func(*mockHTTPClientOptions)
 
+// IgnoreUntouchedURLs is option to ignore unused urls
 func IgnoreUntouchedURLs() MockHTTPClientOption {
 	return func(opts *mockHTTPClientOptions) {
 		opts.ignoreUntouchedURLs = true
 	}
 }
 
+// MockHTTPClient is mocked http client
 func MockHTTPClient(t testing.TB, routes map[string]string,
 	opts ...MockHTTPClientOption) func() {
 
diff --git a/verifiable/did_doc.go b/verifiable/did_doc.go
@@ -95,7 +95,7 @@ func (a *Authentication) UnmarshalJSON(b []byte) error {
 		if err != nil {
 			return errors.Errorf("invalid json payload for authentication: %v", err)
 		}
-		*a = (Authentication)(tmp)
+		*a = Authentication(tmp)
 	case '"':
 		err := json.Unmarshal(b, &a.did)
 		if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -23,13 +23,16 @@ const (`
`23`	`23`
`24`	`24`	var rApplicationJSON = regexp.MustCompile(`^application/(\w*\+)?json$`)
`25`	`25`
	`26`	`+// ErrCacheMiss is an error when there is no info in cache`
`26`	`27`	`var ErrCacheMiss = errors.New("cache miss")`
`27`	`28`
	`29`	`+// CacheEngine is engine interface for cache storages`
`28`	`30`	`type CacheEngine interface {`
`29`	`31`	`Get(key string) (doc *ld.RemoteDocument, expireTime time.Time, err error)`
`30`	`32`	`Set(key string, doc *ld.RemoteDocument, expireTime time.Time) error`
`31`	`33`	`}`
`32`	`34`
	`35`	`+// IPFSClient interface`
`33`	`36`	`type IPFSClient interface {`
`34`	`37`	`Cat(url string) (io.ReadCloser, error)`
`35`	`38`	`}`
`@@ -42,8 +45,10 @@ type documentLoader struct {`
`42`	`45`	`httpClient *http.Client`
`43`	`46`	`}`
`44`	`47`
	`48`	`+// DocumentLoaderOption is an option for document loader`
`45`	`49`	`type DocumentLoaderOption func(*documentLoader)`
`46`	`50`
	`51`	`+// WithCacheEngine is an option for setting cache`
`47`	`52`	`func WithCacheEngine(cacheEngine CacheEngine) DocumentLoaderOption {`
`48`	`53`	`return func(loader *documentLoader) {`
`49`	`54`	`if cacheEngine == nil {`
`@@ -55,6 +60,7 @@ func WithCacheEngine(cacheEngine CacheEngine) DocumentLoaderOption {`
`55`	`60`	`}`
`56`	`61`	`}`
`57`	`62`
	`63`	`+// WithHTTPClient is an option for setting http client`
`58`	`64`	`func WithHTTPClient(httpClient *http.Client) DocumentLoaderOption {`
`59`	`65`	`return func(loader *documentLoader) {`
`60`	`66`	`loader.httpClient = httpClient`
`@@ -82,6 +88,7 @@ func NewDocumentLoader(ipfsCli IPFSClient, ipfsGW string,`
`82`	`88`	`return loader`
`83`	`89`	`}`
`84`	`90`
	`91`	`+// LoadDocument loads document from ipfs or http / https source`
`85`	`92`	`func (d *documentLoader) LoadDocument(`
`86`	`93`	`u string) (doc *ld.RemoteDocument, err error) {`
`87`	`94`
Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,10 @@ func (m memoryCacheEngine) Set(key string, doc ld.RemoteDocument,`
`62`	`62`	`return nil`
`63`	`63`	`}`
`64`	`64`
	`65`	`+// MemoryCacheEngineOption is an option to set cache engine`
`65`	`66`	`type MemoryCacheEngineOption func(*memoryCacheEngine) error`
`66`	`67`
	`68`	`+// WithEmbeddedDocumentBytes sets bytes for given url`
`67`	`69`	`func WithEmbeddedDocumentBytes(u string, doc []byte) MemoryCacheEngineOption {`
`68`	`70`	`return func(engine *memoryCacheEngine) error {`
`69`	`71`	`if engine.embedDocs == nil {`
`@@ -81,6 +83,7 @@ func WithEmbeddedDocumentBytes(u string, doc []byte) MemoryCacheEngineOption {`
`81`	`83`	`}`
`82`	`84`	`}`
`83`	`85`
	`86`	`+// NewMemoryCacheEngine creates new memory cache engine`
`84`	`87`	`func NewMemoryCacheEngine(`
`85`	`88`	`opts ...MemoryCacheEngineOption) (CacheEngine, error) {`
`86`	`89`
Original file line number	Diff line number	Diff line change
`@@ -73,14 +73,17 @@ type mockHTTPClientOptions struct {`
`73`	`73`	`ignoreUntouchedURLs bool`
`74`	`74`	`}`
`75`	`75`
	`76`	`+// MockHTTPClientOption is mock for http client for tests`
`76`	`77`	`type MockHTTPClientOption func(*mockHTTPClientOptions)`
`77`	`78`
	`79`	`+// IgnoreUntouchedURLs is option to ignore unused urls`
`78`	`80`	`func IgnoreUntouchedURLs() MockHTTPClientOption {`
`79`	`81`	`return func(opts *mockHTTPClientOptions) {`
`80`	`82`	`opts.ignoreUntouchedURLs = true`
`81`	`83`	`}`
`82`	`84`	`}`
`83`	`85`
	`86`	`+// MockHTTPClient is mocked http client`
`84`	`87`	`func MockHTTPClient(t testing.TB, routes map[string]string,`
`85`	`88`	`opts ...MockHTTPClientOption) func() {`
`86`	`89`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ func (a *Authentication) UnmarshalJSON(b []byte) error {`
`95`	`95`	`if err != nil {`
`96`	`96`	`return errors.Errorf("invalid json payload for authentication: %v", err)`
`97`	`97`	`}`
`98`		`- *a = (Authentication)(tmp)`
	`98`	`+ *a = Authentication(tmp)`
`99`	`99`	`case '"':`
`100`	`100`	`err := json.Unmarshal(b, &a.did)`
`101`	`101`	`if err != nil {`