From da4a43d5a040eba0297295aa98d0f0a7847fdf2c Mon Sep 17 00:00:00 2001 From: Sergey Cherepanov Date: Sat, 7 Jan 2023 13:35:12 +0300 Subject: [PATCH] go vet --- .github/workflows/coverage.yml | 2 +- Makefile | 5 ++++- commonspace/object/tree/objecttree/objecttree.go | 1 - commonspace/settings/deletionstate/deletionstate.go | 2 +- commonspace/settings/idprovider_test.go | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index fb7f7797..85a6fff6 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -14,7 +14,7 @@ jobs: - name: Vet run: | - go vet ./... + make vet - name: Unit tests run: | sudo make test-coverage diff --git a/Makefile b/Makefile index 1ffe698d..53988ac1 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: proto test test-coverage +.PHONY: proto test test-coverage vet export GOPRIVATE=github.com/anytypeio proto: @@ -16,6 +16,9 @@ proto: $(GOGO_START) protoc --gogofaster_out=$(PKGMAP):. --go-drpc_out=protolib=github.com/gogo/protobuf:. commonspace/spacesyncproto/protos/*.proto $(GOGO_START) protoc --gogofaster_out=$(PKGMAP):. --go-drpc_out=protolib=github.com/gogo/protobuf:. commonfile/fileproto/protos/*.proto +vet: + go vet ./... + test: go test ./... --cover diff --git a/commonspace/object/tree/objecttree/objecttree.go b/commonspace/object/tree/objecttree/objecttree.go index 7e14fcfc..3dc11cf8 100644 --- a/commonspace/object/tree/objecttree/objecttree.go +++ b/commonspace/object/tree/objecttree/objecttree.go @@ -395,7 +395,6 @@ func (ot *objectTree) addRawChanges(ctx context.Context, changesPayload RawChang } return } - return } func (ot *objectTree) createAddResult(oldHeads []string, mode Mode, treeChangesAdded []*Change, rawChanges []*treechangeproto.RawTreeChangeWithId) (addResult AddResult, err error) { diff --git a/commonspace/settings/deletionstate/deletionstate.go b/commonspace/settings/deletionstate/deletionstate.go index 984971ed..c0d700a8 100644 --- a/commonspace/settings/deletionstate/deletionstate.go +++ b/commonspace/settings/deletionstate/deletionstate.go @@ -133,7 +133,7 @@ func (st *deletionState) CreateDeleteChange(id string, isSnapshot bool) (res []b } change := &spacesyncproto.SettingsData{ Content: []*spacesyncproto.SpaceSettingsContent{ - {content}, + {Value: content}, }, Snapshot: nil, } diff --git a/commonspace/settings/idprovider_test.go b/commonspace/settings/idprovider_test.go index 9bf6c37d..66194ae4 100644 --- a/commonspace/settings/idprovider_test.go +++ b/commonspace/settings/idprovider_test.go @@ -55,7 +55,7 @@ func TestProvider_ProcessChange(t *testing.T) { ch := &objecttree.Change{} ch.Model = &spacesyncproto.SettingsData{ Content: []*spacesyncproto.SpaceSettingsContent{ - {&spacesyncproto.SpaceSettingsContent_ObjectDelete{ + {Value: &spacesyncproto.SpaceSettingsContent_ObjectDelete{ ObjectDelete: &spacesyncproto.ObjectDelete{Id: "id1"}, }}, },