Merge branch 'rc/v1.7.0' into remove-code-leaf-builtin-func

multiversx · Dec 7, 2023 · bec3579 · bec3579
2 parents 9e19668 + d059d58
commit bec3579
Show file tree

Hide file tree

Showing 20 changed files with 19 additions and 2,159 deletions.
diff --git a/Makefile b/Makefile
@@ -1,3 +1,15 @@
 test:
 	@echo "  >  Running unit tests"
 	go test -cover -race -coverprofile=coverage.txt -covermode=atomic -v ./...
+
+lint-install:
+ifeq (,$(wildcard test -f bin/golangci-lint))
+	@echo "Installing golint"
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s
+endif
+
+run-lint:
+	@echo "Running golint"
+	bin/golangci-lint run --max-issues-per-linter 0 --max-same-issues 0 --timeout=2m
+
+lint: lint-install run-lint
diff --git a/data/api/guardianData.go b/data/api/guardianData.go
@@ -11,5 +11,5 @@ type Guardian struct {
 type GuardianData struct {
 	ActiveGuardian  *Guardian `json:"activeGuardian,omitempty"`
 	PendingGuardian *Guardian `json:"pendingGuardian,omitempty"`
-	Guarded         bool      `json:"guarded,omitempty"`
+	Guarded         bool      `json:"guarded"`
 }
diff --git a/data/mock/cacherMock.go b/data/mock/cacherMock.go
diff --git a/data/mock/memDbMock.go b/data/mock/memDbMock.go
diff --git a/data/mock/multipleShardsCoordinatorMock.go b/data/mock/multipleShardsCoordinatorMock.go