Skip to content

Commit

Permalink
Fix tests and lint
Browse files Browse the repository at this point in the history
  • Loading branch information
krhubert committed Sep 2, 2019
1 parent 2a9dc37 commit c2c40fc
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions protobuf/convert/pbstruct.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"encoding/json"
"sync"

"github.com/golang/protobuf/jsonpb"
"github.com/golang/protobuf/proto"
"github.com/gogo/protobuf/jsonpb"
"github.com/gogo/protobuf/proto"
)

var marshaler = jsonpb.Marshaler{EmitDefaults: true}
Expand Down
2 changes: 1 addition & 1 deletion server/grpc/api/event.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"errors"
"fmt"

structpb "github.com/golang/protobuf/ptypes/struct"
structpb "github.com/gogo/protobuf/types"
"github.com/mesg-foundation/engine/event"
"github.com/mesg-foundation/engine/protobuf/acknowledgement"
"github.com/mesg-foundation/engine/protobuf/api"
Expand Down
2 changes: 1 addition & 1 deletion server/grpc/api/execution.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"errors"

structpb "github.com/golang/protobuf/ptypes/struct"
structpb "github.com/gogo/protobuf/types"
"github.com/mesg-foundation/engine/execution"
"github.com/mesg-foundation/engine/hash"
"github.com/mesg-foundation/engine/protobuf/acknowledgement"
Expand Down

0 comments on commit c2c40fc

Please sign in to comment.