Skip to content

Commit

Permalink
Message package be public (topfreegames#72)
Browse files Browse the repository at this point in the history 
* Moved internal to conn folder

* Changed all the files to be able to find the new location of internal files
  • Loading branch information
@rodrigolck @andrehp
rodrigolck authored and andrehp committed Nov 27, 2018
1 parent cf4f763 commit df946c6
Show file tree
Hide file tree
Showing 58 changed files with 68 additions and 68 deletions.
6 changes: 3 additions & 3 deletions agent/agent.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ import (
"time"

opentracing "github.com/opentracing/opentracing-go"
"github.com/topfreegames/pitaya/conn/codec"
"github.com/topfreegames/pitaya/conn/message"
"github.com/topfreegames/pitaya/conn/packet"
"github.com/topfreegames/pitaya/constants"
"github.com/topfreegames/pitaya/internal/codec"
"github.com/topfreegames/pitaya/internal/message"
"github.com/topfreegames/pitaya/internal/packet"
"github.com/topfreegames/pitaya/logger"
"github.com/topfreegames/pitaya/metrics"
"github.com/topfreegames/pitaya/protos"
Expand Down
6 changes: 3 additions & 3 deletions agent/agent_remote.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ import (

"github.com/gogo/protobuf/proto"
"github.com/topfreegames/pitaya/cluster"
"github.com/topfreegames/pitaya/conn/codec"
"github.com/topfreegames/pitaya/conn/message"
"github.com/topfreegames/pitaya/conn/packet"
"github.com/topfreegames/pitaya/constants"
"github.com/topfreegames/pitaya/internal/codec"
"github.com/topfreegames/pitaya/internal/message"
"github.com/topfreegames/pitaya/internal/packet"
"github.com/topfreegames/pitaya/logger"
"github.com/topfreegames/pitaya/protos"
"github.com/topfreegames/pitaya/route"
Expand Down
8 changes: 4 additions & 4 deletions agent/agent_remote_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ import (
"github.com/stretchr/testify/assert"
"github.com/topfreegames/pitaya/cluster"
clustermocks "github.com/topfreegames/pitaya/cluster/mocks"
codecmocks "github.com/topfreegames/pitaya/conn/codec/mocks"
"github.com/topfreegames/pitaya/conn/message"
messagemocks "github.com/topfreegames/pitaya/conn/message/mocks"
"github.com/topfreegames/pitaya/conn/packet"
"github.com/topfreegames/pitaya/constants"
codecmocks "github.com/topfreegames/pitaya/internal/codec/mocks"
"github.com/topfreegames/pitaya/internal/message"
messagemocks "github.com/topfreegames/pitaya/internal/message/mocks"
"github.com/topfreegames/pitaya/internal/packet"
"github.com/topfreegames/pitaya/protos"
"github.com/topfreegames/pitaya/route"
serializemocks "github.com/topfreegames/pitaya/serialize/mocks"
Expand Down
8 changes: 4 additions & 4 deletions agent/agent_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ import (
"github.com/golang/mock/gomock"
"github.com/google/uuid"
"github.com/stretchr/testify/assert"
codecmocks "github.com/topfreegames/pitaya/conn/codec/mocks"
"github.com/topfreegames/pitaya/conn/message"
messagemocks "github.com/topfreegames/pitaya/conn/message/mocks"
"github.com/topfreegames/pitaya/conn/packet"
"github.com/topfreegames/pitaya/constants"
pcontext "github.com/topfreegames/pitaya/context"
e "github.com/topfreegames/pitaya/errors"
"github.com/topfreegames/pitaya/helpers"
codecmocks "github.com/topfreegames/pitaya/internal/codec/mocks"
"github.com/topfreegames/pitaya/internal/message"
messagemocks "github.com/topfreegames/pitaya/internal/message/mocks"
"github.com/topfreegames/pitaya/internal/packet"
"github.com/topfreegames/pitaya/metrics"
metricsmocks "github.com/topfreegames/pitaya/metrics/mocks"
"github.com/topfreegames/pitaya/mocks"
Expand Down
4 changes: 2 additions & 2 deletions app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ import (
"github.com/topfreegames/pitaya/cluster"
"github.com/topfreegames/pitaya/component"
"github.com/topfreegames/pitaya/config"
"github.com/topfreegames/pitaya/conn/codec"
"github.com/topfreegames/pitaya/conn/message"
"github.com/topfreegames/pitaya/constants"
pcontext "github.com/topfreegames/pitaya/context"
"github.com/topfreegames/pitaya/defaultpipelines"
"github.com/topfreegames/pitaya/docgenerator"
"github.com/topfreegames/pitaya/errors"
"github.com/topfreegames/pitaya/internal/codec"
"github.com/topfreegames/pitaya/internal/message"
"github.com/topfreegames/pitaya/logger"
"github.com/topfreegames/pitaya/metrics"
mods "github.com/topfreegames/pitaya/modules"
Expand Down
4 changes: 2 additions & 2 deletions app_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ import (
"github.com/stretchr/testify/assert"
"github.com/topfreegames/pitaya/acceptor"
"github.com/topfreegames/pitaya/cluster"
"github.com/topfreegames/pitaya/conn/codec"
"github.com/topfreegames/pitaya/conn/message"
"github.com/topfreegames/pitaya/constants"
e "github.com/topfreegames/pitaya/errors"
"github.com/topfreegames/pitaya/helpers"
"github.com/topfreegames/pitaya/internal/codec"
"github.com/topfreegames/pitaya/internal/message"
"github.com/topfreegames/pitaya/logger"
"github.com/topfreegames/pitaya/metrics"
"github.com/topfreegames/pitaya/route"
Expand Down
6 changes: 3 additions & 3 deletions client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ import (

"github.com/sirupsen/logrus"
"github.com/topfreegames/pitaya"
"github.com/topfreegames/pitaya/internal/codec"
"github.com/topfreegames/pitaya/internal/message"
"github.com/topfreegames/pitaya/internal/packet"
"github.com/topfreegames/pitaya/conn/codec"
"github.com/topfreegames/pitaya/conn/message"
"github.com/topfreegames/pitaya/conn/packet"
"github.com/topfreegames/pitaya/logger"
"github.com/topfreegames/pitaya/util/compression"
)
Expand Down
2 changes: 1 addition & 1 deletion client/client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"github.com/golang/mock/gomock"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert"
"github.com/topfreegames/pitaya/conn/message"
"github.com/topfreegames/pitaya/helpers"
"github.com/topfreegames/pitaya/internal/message"
"github.com/topfreegames/pitaya/mocks"
)

Expand Down
2 changes: 1 addition & 1 deletion cluster/cluster.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ package cluster
import (
"context"

"github.com/topfreegames/pitaya/conn/message"
"github.com/topfreegames/pitaya/constants"
pcontext "github.com/topfreegames/pitaya/context"
"github.com/topfreegames/pitaya/interfaces"
"github.com/topfreegames/pitaya/internal/message"
"github.com/topfreegames/pitaya/logger"
"github.com/topfreegames/pitaya/protos"
"github.com/topfreegames/pitaya/route"
Expand Down
2 changes: 1 addition & 1 deletion cluster/grpc_rpc_client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ import (

opentracing "github.com/opentracing/opentracing-go"
"github.com/topfreegames/pitaya/config"
"github.com/topfreegames/pitaya/conn/message"
"github.com/topfreegames/pitaya/constants"
pitErrors "github.com/topfreegames/pitaya/errors"
"github.com/topfreegames/pitaya/interfaces"
"github.com/topfreegames/pitaya/internal/message"
"github.com/topfreegames/pitaya/logger"
"github.com/topfreegames/pitaya/metrics"
"github.com/topfreegames/pitaya/protos"
Expand Down
14 changes: 7 additions & 7 deletions cluster/grpc_rpc_client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
"github.com/spf13/viper"
"github.com/stretchr/testify/assert"
"github.com/topfreegames/pitaya/config"
"github.com/topfreegames/pitaya/conn/message"
"github.com/topfreegames/pitaya/constants"
"github.com/topfreegames/pitaya/helpers"
"github.com/topfreegames/pitaya/interfaces"
"github.com/topfreegames/pitaya/interfaces/mocks"
"github.com/topfreegames/pitaya/internal/message"
"github.com/topfreegames/pitaya/metrics"
"github.com/topfreegames/pitaya/protos"
protosmocks "github.com/topfreegames/pitaya/protos/mocks"
Expand Down Expand Up @@ -129,7 +129,7 @@ func TestSendKick(t *testing.T) {
mockPitayaClient := protosmocks.NewMockPitayaClient(ctrl)
tables := []struct {
name string
userId string
userID string
bindingStorage interfaces.BindingStorage
sv *Server
err error
Expand Down Expand Up @@ -157,22 +157,22 @@ func TestSendKick(t *testing.T) {
if table.bindingStorage != nil {
g.clientMap.Store(table.sv.ID, mockPitayaClient)
g.bindingStorage = table.bindingStorage
mockBindingStorage.EXPECT().GetUserFrontendID(table.userId, gomock.Any()).DoAndReturn(func(u, svType string) (string, error) {
assert.Equal(t, table.userId, u)
mockBindingStorage.EXPECT().GetUserFrontendID(table.userID, gomock.Any()).DoAndReturn(func(u, svType string) (string, error) {
assert.Equal(t, table.userID, u)
assert.Equal(t, table.sv.Type, svType)
return table.sv.ID, nil
})

mockPitayaClient.EXPECT().KickUser(gomock.Any(), gomock.Any()).Do(func(ctx context.Context, msg *protos.KickMsg) {
assert.Equal(t, table.userId, msg.UserId)
assert.Equal(t, table.userID, msg.UserId)
})
}

kick := &protos.KickMsg{
UserId: table.userId,
UserId: table.userID,
}

err = g.SendKick(table.userId, table.sv.Type, kick)
err = g.SendKick(table.userID, table.sv.Type, kick)
if table.err != nil {
assert.Equal(t, err, table.err)
} else {
Expand Down
2 changes: 1 addition & 1 deletion cluster/mocks/cluster.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cluster/nats_rpc_client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ import (
nats "github.com/nats-io/go-nats"
opentracing "github.com/opentracing/opentracing-go"
"github.com/topfreegames/pitaya/config"
"github.com/topfreegames/pitaya/conn/message"
"github.com/topfreegames/pitaya/constants"
"github.com/topfreegames/pitaya/errors"
"github.com/topfreegames/pitaya/internal/message"
"github.com/topfreegames/pitaya/logger"
"github.com/topfreegames/pitaya/metrics"
"github.com/topfreegames/pitaya/protos"
Expand Down
2 changes: 1 addition & 1 deletion cluster/nats_rpc_client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ import (
nats "github.com/nats-io/go-nats"
"github.com/spf13/viper"
"github.com/stretchr/testify/assert"
"github.com/topfreegames/pitaya/conn/message"
"github.com/topfreegames/pitaya/constants"
e "github.com/topfreegames/pitaya/errors"
"github.com/topfreegames/pitaya/helpers"
"github.com/topfreegames/pitaya/internal/message"
"github.com/topfreegames/pitaya/metrics"
metricsmocks "github.com/topfreegames/pitaya/metrics/mocks"
"github.com/topfreegames/pitaya/protos"
Expand Down
2 changes: 1 addition & 1 deletion component/method.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"unicode/utf8"

"github.com/gogo/protobuf/proto"
"github.com/topfreegames/pitaya/internal/message"
"github.com/topfreegames/pitaya/conn/message"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion component/service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"errors"
"reflect"

"github.com/topfreegames/pitaya/conn/message"
"github.com/topfreegames/pitaya/constants"
"github.com/topfreegames/pitaya/internal/message"
)

type (
Expand Down
2 changes: 1 addition & 1 deletion component/service_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"testing"

"github.com/stretchr/testify/assert"
"github.com/topfreegames/pitaya/conn/message"
"github.com/topfreegames/pitaya/constants"
"github.com/topfreegames/pitaya/internal/message"
)

type unexportedTestType struct {
Expand Down
0 internal/codec/constants.go → conn/codec/constants.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions internal/codec/mocks/packet_decoder.go → conn/codec/mocks/packet_decoder.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions internal/codec/mocks/packet_encoder.go → conn/codec/mocks/packet_encoder.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/codec/packet_decoder.go → conn/codec/packet_decoder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

package codec

import "github.com/topfreegames/pitaya/internal/packet"
import "github.com/topfreegames/pitaya/conn/packet"

// PacketDecoder interface
type PacketDecoder interface {
Expand Down
2 changes: 1 addition & 1 deletion internal/codec/packet_encoder.go → conn/codec/packet_encoder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

package codec

import "github.com/topfreegames/pitaya/internal/packet"
import "github.com/topfreegames/pitaya/conn/packet"

// PacketEncoder interface
type PacketEncoder interface {
Expand Down
2 changes: 1 addition & 1 deletion internal/codec/pomelo_packet_decoder.go → conn/codec/pomelo_packet_decoder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ package codec
import (
"bytes"

"github.com/topfreegames/pitaya/internal/packet"
"github.com/topfreegames/pitaya/conn/packet"
)

// PomeloPacketDecoder reads and decodes network data slice following pomelo's protocol
Expand Down
2 changes: 1 addition & 1 deletion internal/codec/pomelo_packet_decoder_test.go → conn/codec/pomelo_packet_decoder_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"testing"

"github.com/stretchr/testify/assert"
"github.com/topfreegames/pitaya/internal/packet"
"github.com/topfreegames/pitaya/conn/packet"
)

var forwardTables = map[string]struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/codec/pomelo_packet_encoder.go → conn/codec/pomelo_packet_encoder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
package codec

import (
"github.com/topfreegames/pitaya/internal/packet"
"github.com/topfreegames/pitaya/conn/packet"
)

// PomeloPacketEncoder struct
Expand Down
2 changes: 1 addition & 1 deletion internal/codec/pomelo_packet_encoder_test.go → conn/codec/pomelo_packet_encoder_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"testing"

"github.com/stretchr/testify/assert"
"github.com/topfreegames/pitaya/internal/packet"
"github.com/topfreegames/pitaya/conn/packet"
)

func helperConcatBytes(packetType packet.Type, length, data []byte) []byte {
Expand Down
0 ...sage/fixtures/test_invalid_message.golden → ...sage/fixtures/test_invalid_message.golden
View file
File renamed without changes.
0 ...al/message/fixtures/test_must_gzip.golden → conn/message/fixtures/test_must_gzip.golden
View file
File renamed without changes.
0 .../message/fixtures/test_notify_type.golden → .../message/fixtures/test_notify_type.golden
View file
File renamed without changes.
0 ...xtures/test_notify_type_compressed.golden → ...xtures/test_notify_type_compressed.golden
View file
File renamed without changes.
0 ...al/message/fixtures/test_push_type.golden → conn/message/fixtures/test_push_type.golden
View file
File renamed without changes.
0 ...fixtures/test_push_type_compressed.golden → ...fixtures/test_push_type_compressed.golden
View file
File renamed without changes.
0 ...message/fixtures/test_reponse_type.golden → ...message/fixtures/test_reponse_type.golden
View file
File renamed without changes.
0 ...xtures/test_reponse_type_with_data.golden → ...xtures/test_reponse_type_with_data.golden
View file
File renamed without changes.
0 ...tures/test_reponse_type_with_error.golden → ...tures/test_reponse_type_with_error.golden
View file
File renamed without changes.
0 ...fixtures/test_reponse_type_with_id.golden → ...fixtures/test_reponse_type_with_id.golden
View file
File renamed without changes.
0 ...message/fixtures/test_request_type.golden → ...message/fixtures/test_request_type.golden
View file
File renamed without changes.
0 ...tures/test_request_type_compressed.golden → ...tures/test_request_type_compressed.golden
View file
File renamed without changes.
0 ...l/message/fixtures/test_wrong_type.golden → conn/message/fixtures/test_wrong_type.golden
View file
File renamed without changes.
0 internal/message/message.go → conn/message/message.go
View file
File renamed without changes.
0 internal/message/message_encoder.go → conn/message/message_encoder.go
View file
File renamed without changes.
0 internal/message/message_test.go → conn/message/message_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/message/mocks/message_encoder.go → conn/message/mocks/message_encoder.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 internal/packet/constants.go → conn/packet/constants.go
View file
File renamed without changes.
0 internal/packet/packet.go → conn/packet/packet.go
View file
File renamed without changes.
0 internal/packet/packet_test.go → conn/packet/packet_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion e2e/e2e_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ import (
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert"
"github.com/topfreegames/pitaya/client"
"github.com/topfreegames/pitaya/conn/message"
"github.com/topfreegames/pitaya/helpers"
"github.com/topfreegames/pitaya/internal/message"
)

var update = flag.Bool("update", false, "update server binary")
Expand Down
2 changes: 1 addition & 1 deletion router/router.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"time"

"github.com/topfreegames/pitaya/cluster"
"github.com/topfreegames/pitaya/conn/message"
"github.com/topfreegames/pitaya/constants"
"github.com/topfreegames/pitaya/internal/message"
"github.com/topfreegames/pitaya/logger"
"github.com/topfreegames/pitaya/protos"
"github.com/topfreegames/pitaya/route"
Expand Down
2 changes: 1 addition & 1 deletion router/router_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/topfreegames/pitaya/cluster"
"github.com/topfreegames/pitaya/cluster/mocks"
"github.com/topfreegames/pitaya/internal/message"
"github.com/topfreegames/pitaya/conn/message"
"github.com/topfreegames/pitaya/protos"
"github.com/topfreegames/pitaya/route"
)
Expand Down
4 changes: 2 additions & 2 deletions rpc_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ import (
"github.com/stretchr/testify/assert"
"github.com/topfreegames/pitaya/cluster"
clustermocks "github.com/topfreegames/pitaya/cluster/mocks"
"github.com/topfreegames/pitaya/conn/codec"
"github.com/topfreegames/pitaya/conn/message"
"github.com/topfreegames/pitaya/constants"
"github.com/topfreegames/pitaya/internal/codec"
"github.com/topfreegames/pitaya/internal/message"
"github.com/topfreegames/pitaya/protos"
"github.com/topfreegames/pitaya/protos/test"
"github.com/topfreegames/pitaya/route"
Expand Down
Loading

0 comments on commit df946c6

Please sign in to comment.