Skip to content

Commit

Permalink
Cleaning linting issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@kellrott
kellrott committed Sep 11, 2019
1 parent fff653f commit 13b748c
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 46 deletions.
1 change: 1 addition & 0 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGm
golang.org/x/tools v0.0.0-20190121143147-24cd39ecf745/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/tools v0.0.0-20190314010720-f0bfdbff1f9c h1:nE2ID2IbO0sUUG/3vWMz0LStAvkaW9wpnFp/65bxJw8=
golang.org/x/tools v0.0.0-20190314010720-f0bfdbff1f9c/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
Expand Down
2 changes: 1 addition & 1 deletion server/api.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ func (server *GripServer) BulkAdd(stream gripql.Edit_BulkAddServer) error {
}
close(elementStream)
wg.Wait()
return stream.SendAndClose(&gripql.BulkEditResult{InsertCount:insertCount,ErrorCount:errorCount})
return stream.SendAndClose(&gripql.BulkEditResult{InsertCount: insertCount, ErrorCount: errorCount})
}

// DeleteVertex deletes a vertex from the server
Expand Down
90 changes: 45 additions & 45 deletions util/insert_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,21 @@ import (

func TestBatchInsertValidation(t *testing.T) {
elems := []gripql.GraphElement{
gripql.GraphElement{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v1", Label: "test"}},
gripql.GraphElement{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v2", Label: "test"}},
gripql.GraphElement{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v3", Label: "test"}},
gripql.GraphElement{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v4", Label: "test"}},
gripql.GraphElement{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v5", Label: "test"}},
gripql.GraphElement{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v6", Label: "test"}},
gripql.GraphElement{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v7", Label: "test"}},
gripql.GraphElement{Graph: "graph", Edge: &gripql.Edge{Gid: "e1", Label: "test", From: "v1", To: "v2"}},
gripql.GraphElement{Graph: "graph", Edge: &gripql.Edge{Gid: "e2", Label: "test", From: "v2", To: "v1"}},
gripql.GraphElement{Graph: "graph", Edge: &gripql.Edge{Gid: "e3", Label: "test", From: "v3", To: "v1"}},
gripql.GraphElement{Graph: "graph", Edge: &gripql.Edge{Gid: "e4", Label: "test", From: "v4", To: "v3"}},
gripql.GraphElement{Graph: "graph", Edge: &gripql.Edge{Gid: "e5", Label: "test", From: "v5", To: "v3"}},
gripql.GraphElement{Graph: "graph", Edge: &gripql.Edge{Gid: "e6", Label: "test", From: "v6", To: "v1"}},
gripql.GraphElement{Graph: "graph", Edge: &gripql.Edge{Gid: "e7", Label: "test", From: "v7", To: "v2"}},
gripql.GraphElement{Graph: "graph", Edge: &gripql.Edge{Gid: "e8", Label: "test", From: "v1", To: "v7"}},
{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v1", Label: "test"}},
{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v2", Label: "test"}},
{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v3", Label: "test"}},
{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v4", Label: "test"}},
{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v5", Label: "test"}},
{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v6", Label: "test"}},
{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v7", Label: "test"}},
{Graph: "graph", Edge: &gripql.Edge{Gid: "e1", Label: "test", From: "v1", To: "v2"}},
{Graph: "graph", Edge: &gripql.Edge{Gid: "e2", Label: "test", From: "v2", To: "v1"}},
{Graph: "graph", Edge: &gripql.Edge{Gid: "e3", Label: "test", From: "v3", To: "v1"}},
{Graph: "graph", Edge: &gripql.Edge{Gid: "e4", Label: "test", From: "v4", To: "v3"}},
{Graph: "graph", Edge: &gripql.Edge{Gid: "e5", Label: "test", From: "v5", To: "v3"}},
{Graph: "graph", Edge: &gripql.Edge{Gid: "e6", Label: "test", From: "v6", To: "v1"}},
{Graph: "graph", Edge: &gripql.Edge{Gid: "e7", Label: "test", From: "v7", To: "v2"}},
{Graph: "graph", Edge: &gripql.Edge{Gid: "e8", Label: "test", From: "v1", To: "v7"}},
}

vAdd := func([]*gripql.Vertex) error {
Expand Down Expand Up @@ -50,21 +50,21 @@ func TestBatchInsertValidation(t *testing.T) {

func TestBatchFromValidation(t *testing.T) {
elems := []gripql.GraphElement{
gripql.GraphElement{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v1", Label: "test"}},
gripql.GraphElement{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v2", Label: "test"}},
gripql.GraphElement{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v3", Label: "test"}},
gripql.GraphElement{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v4", Label: "test"}},
gripql.GraphElement{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v5", Label: "test"}},
gripql.GraphElement{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v6", Label: "test"}},
gripql.GraphElement{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v7", Label: "test"}},
gripql.GraphElement{Graph: "graph", Edge: &gripql.Edge{Gid: "e1", Label: "test", To: "v2"}},
gripql.GraphElement{Graph: "graph", Edge: &gripql.Edge{Gid: "e2", Label: "test", From: "v2", To: "v1"}},
gripql.GraphElement{Graph: "graph", Edge: &gripql.Edge{Gid: "e3", Label: "test", From: "v3", To: "v1"}},
gripql.GraphElement{Graph: "graph", Edge: &gripql.Edge{Gid: "e4", Label: "test", From: "v4", To: "v3"}},
gripql.GraphElement{Graph: "graph", Edge: &gripql.Edge{Gid: "e5", Label: "test", From: "v5", To: "v3"}},
gripql.GraphElement{Graph: "graph", Edge: &gripql.Edge{Gid: "e6", Label: "test", From: "v6", To: "v1"}},
gripql.GraphElement{Graph: "graph", Edge: &gripql.Edge{Gid: "e7", Label: "test", From: "v7", To: "v2"}},
gripql.GraphElement{Graph: "graph", Edge: &gripql.Edge{Gid: "e8", Label: "test", To: "v7"}},
{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v1", Label: "test"}},
{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v2", Label: "test"}},
{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v3", Label: "test"}},
{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v4", Label: "test"}},
{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v5", Label: "test"}},
{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v6", Label: "test"}},
{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v7", Label: "test"}},
{Graph: "graph", Edge: &gripql.Edge{Gid: "e1", Label: "test", To: "v2"}},
{Graph: "graph", Edge: &gripql.Edge{Gid: "e2", Label: "test", From: "v2", To: "v1"}},
{Graph: "graph", Edge: &gripql.Edge{Gid: "e3", Label: "test", From: "v3", To: "v1"}},
{Graph: "graph", Edge: &gripql.Edge{Gid: "e4", Label: "test", From: "v4", To: "v3"}},
{Graph: "graph", Edge: &gripql.Edge{Gid: "e5", Label: "test", From: "v5", To: "v3"}},
{Graph: "graph", Edge: &gripql.Edge{Gid: "e6", Label: "test", From: "v6", To: "v1"}},
{Graph: "graph", Edge: &gripql.Edge{Gid: "e7", Label: "test", From: "v7", To: "v2"}},
{Graph: "graph", Edge: &gripql.Edge{Gid: "e8", Label: "test", To: "v7"}},
}

vAdd := func([]*gripql.Vertex) error {
Expand Down Expand Up @@ -93,21 +93,21 @@ func TestBatchFromValidation(t *testing.T) {

func TestBatchGraphValidation(t *testing.T) {
elems := []gripql.GraphElement{
gripql.GraphElement{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v1", Label: "test"}},
gripql.GraphElement{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v2", Label: "test"}},
gripql.GraphElement{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v3", Label: "test"}},
gripql.GraphElement{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v4", Label: "test"}},
gripql.GraphElement{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v5", Label: "test"}},
gripql.GraphElement{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v6", Label: "test"}},
gripql.GraphElement{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v7", Label: "test"}},
gripql.GraphElement{Graph: "graph1", Edge: &gripql.Edge{Gid: "e1", Label: "test", From: "v1", To: "v2"}},
gripql.GraphElement{Graph: "graph", Edge: &gripql.Edge{Gid: "e2", Label: "test", From: "v2", To: "v1"}},
gripql.GraphElement{Graph: "graph", Edge: &gripql.Edge{Gid: "e3", Label: "test", From: "v3", To: "v1"}},
gripql.GraphElement{Graph: "graph2", Edge: &gripql.Edge{Gid: "e4", Label: "test", From: "v4", To: "v3"}},
gripql.GraphElement{Graph: "graph", Edge: &gripql.Edge{Gid: "e5", Label: "test", From: "v5", To: "v3"}},
gripql.GraphElement{Graph: "graph", Edge: &gripql.Edge{Gid: "e6", Label: "test", From: "v6", To: "v1"}},
gripql.GraphElement{Graph: "graph3", Edge: &gripql.Edge{Gid: "e7", Label: "test", From: "v7", To: "v2"}},
gripql.GraphElement{Graph: "graph", Edge: &gripql.Edge{Gid: "e8", Label: "test", From: "v1", To: "v7"}},
{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v1", Label: "test"}},
{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v2", Label: "test"}},
{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v3", Label: "test"}},
{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v4", Label: "test"}},
{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v5", Label: "test"}},
{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v6", Label: "test"}},
{Graph: "graph", Vertex: &gripql.Vertex{Gid: "v7", Label: "test"}},
{Graph: "graph1", Edge: &gripql.Edge{Gid: "e1", Label: "test", From: "v1", To: "v2"}},
{Graph: "graph", Edge: &gripql.Edge{Gid: "e2", Label: "test", From: "v2", To: "v1"}},
{Graph: "graph", Edge: &gripql.Edge{Gid: "e3", Label: "test", From: "v3", To: "v1"}},
{Graph: "graph2", Edge: &gripql.Edge{Gid: "e4", Label: "test", From: "v4", To: "v3"}},
{Graph: "graph", Edge: &gripql.Edge{Gid: "e5", Label: "test", From: "v5", To: "v3"}},
{Graph: "graph", Edge: &gripql.Edge{Gid: "e6", Label: "test", From: "v6", To: "v1"}},
{Graph: "graph3", Edge: &gripql.Edge{Gid: "e7", Label: "test", From: "v7", To: "v2"}},
{Graph: "graph", Edge: &gripql.Edge{Gid: "e8", Label: "test", From: "v1", To: "v7"}},
}

vAdd := func([]*gripql.Vertex) error {
Expand Down

0 comments on commit 13b748c

Please sign in to comment.