pkg/demoinfocs/msg: move from gogo/protobuf to vtprotobuf (#329)

Author: markus-wa

.github/workflows/protobuf.yml

@@ -43,14 +43,14 @@ jobs:
         if: env.PROTOBUFS_CHANGED == 'true'
         run: |
             cd pkg/demoinfocs/msg
-            sed -i '1s/^/option go_package = "msg";\n\n/' proto/cstrike15_usermessages.proto
-            sed -i '1s/^/option go_package = "msg";\n\n/' proto/cstrike15_gcmessages.proto
-            sed -i '1s/^/option go_package = "msg";\n\n/' proto/engine_gcmessages.proto
-            sed -i '1s/^/option go_package = "msg";\n\n/' proto/netmessages.proto
-            sed -i '1s/^/option go_package = "msg";\n\n/' proto/steammessages.proto
+            sed -i '1s/^/option go_package = "github.com/markus-wa/demoinfocs-golang/v2/pkg/demoinfocs/msg";\n\n/' proto/cstrike15_usermessages.proto
+            sed -i '1s/^/option go_package = "github.com/markus-wa/demoinfocs-golang/v2/pkg/demoinfocs/msg";\n\n/' proto/cstrike15_gcmessages.proto
+            sed -i '1s/^/option go_package = "github.com/markus-wa/demoinfocs-golang/v2/pkg/demoinfocs/msg";\n\n/' proto/engine_gcmessages.proto
+            sed -i '1s/^/option go_package = "github.com/markus-wa/demoinfocs-golang/v2/pkg/demoinfocs/msg";\n\n/' proto/netmessages.proto
+            sed -i '1s/^/option go_package = "github.com/markus-wa/demoinfocs-golang/v2/pkg/demoinfocs/msg";\n\n/' proto/steammessages.proto
 
             export PATH=/tmp/protoc/bin:$PATH
-            protoc -I=proto --gogofaster_out=Mgoogle/protobuf/descriptor.proto=github.com/gogo/protobuf/protoc-gen-gogo/descriptor:. proto/*.proto
+            ./generate.sh
 
       - name: Commit changes
         if: env.PROTOBUFS_CHANGED == 'true'

README.md

@@ -280,14 +280,11 @@ After adding it to your `PATH` you can use `scripts/generate-interfaces.sh` to u
 
 Should you need to re-generate the protobuf generated code in the `msg` package, you will need the following tools:
 
-- The latest protobuf generator (`protoc`) from your package manager or https://github.com/google/protobuf/releases
-
-- And `protoc-gen-gogofaster` from [gogoprotobuf](https://github.com/gogo/protobuf) to generate code for go.
-
-		go get -u github.com/gogo/protobuf/protoc-gen-gogofaster
-
-[//]: # "The go get above needs two tabs so it's displayed a) as part of the last list entry and b) as a code-block"
-[//]: # "Oh and don't try to move these comments above it either"
+```
+go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
+go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
+go install github.com/planetscale/vtprotobuf/cmd/protoc-gen-go-vtproto@latest
+```
 
 Make sure both are inside your `PATH` variable.
 

examples/net-messages/README.md

@@ -34,15 +34,15 @@ Example: Bullet Decal (`BSPDecal`) messages
 
 ```go
 import (
-	"github.com/gogo/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	dem "github.com/markus-wa/demoinfocs-golang"
 	"github.com/markus-wa/demoinfocs-golang/v2/msg"
 )
 
 cfg := dem.DefaultParserConfig
 cfg.AdditionalNetMessageCreators = map[int]dem.NetMessageCreator{
-	int(msg.SVC_Messages_svc_BSPDecal): func() proto.Message {
+	int(msg.SVC_Messages_svc_BSPDecal): func() dem.VTProtobufMessage {
 		return new(msg.CSVCMsg_BSPDecal)
 	},
 }

examples/net-messages/netmessages.go

@@ -4,8 +4,6 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/gogo/protobuf/proto"
-
 	ex "github.com/markus-wa/demoinfocs-golang/v2/examples"
 	demoinfocs "github.com/markus-wa/demoinfocs-golang/v2/pkg/demoinfocs"
 	msg "github.com/markus-wa/demoinfocs-golang/v2/pkg/demoinfocs/msg"
@@ -20,7 +18,7 @@ func main() {
 	// Configure parsing of BSPDecal net-message
 	cfg := demoinfocs.DefaultParserConfig
 	cfg.AdditionalNetMessageCreators = map[int]demoinfocs.NetMessageCreator{
-		int(msg.SVC_Messages_svc_BSPDecal): func() proto.Message {
+		int(msg.SVC_Messages_svc_BSPDecal): func() demoinfocs.VTProtobufMessage {
 			return new(msg.CSVCMsg_BSPDecal)
 		},
 	}
@@ -30,7 +28,7 @@ func main() {
 
 	// Register handler for BSPDecal messages
 	p.RegisterNetMessageHandler(func(m *msg.CSVCMsg_BSPDecal) {
-		fmt.Printf("bullet decal at x=%f y=%f z=%f\n", m.Pos.X, m.Pos.Y, m.Pos.Z)
+		fmt.Printf("bullet decal at x=%f y=%f z=%f\n", m.Pos.GetX(), m.Pos.GetY(), m.Pos.GetZ())
 	})
 
 	// Parse to end

go.mod

@@ -2,7 +2,6 @@ module github.com/markus-wa/demoinfocs-golang/v2
 
 require (
 	github.com/dustin/go-heatmap v0.0.0-20180603032536-b89dbd73785a
-	github.com/gogo/protobuf v1.3.2
 	github.com/golang/geo v0.0.0-20210211234256-740aa86cb551
 	github.com/llgcode/draw2d v0.0.0-20200930101115-bfaf5d914d1e
 	github.com/markus-wa/go-unassert v0.1.2
@@ -12,6 +11,8 @@ require (
 	github.com/markus-wa/quickhull-go/v2 v2.1.0
 	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.7.0
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+	google.golang.org/protobuf v1.28.0
 )
 
 require (

go.sum

@@ -4,16 +4,15 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/go-gl/gl v0.0.0-20180407155706-68e253793080/go.mod h1:482civXOzJJCPzJ4ZOX/pwvXBWSnzD4OKMdH4ClKGbk=
 github.com/go-gl/glfw v0.0.0-20180426074136-46a8d530c326/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
-github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
-github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
 github.com/golang/geo v0.0.0-20180826223333-635502111454/go.mod h1:vgWZ7cu0fq0KY3PpEHsocXOWJpRtkcbKemU4IUw0M60=
 github.com/golang/geo v0.0.0-20210211234256-740aa86cb551 h1:gtexQ/VGyN+VVFRXSFiguSNcXmS6rkKT+X7FdIrTtfo=
 github.com/golang/geo v0.0.0-20210211234256-740aa86cb551/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
-github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/llgcode/draw2d v0.0.0-20200930101115-bfaf5d914d1e h1:YRRazju3DMGuZTSWEj0nE2SCRcK3DW/qdHQ4UQx7sgs=
 github.com/llgcode/draw2d v0.0.0-20200930101115-bfaf5d914d1e/go.mod h1:mVa0dA29Db2S4LVqDYLlsePDzRJLDfdhVZiI15uY0FA=
 github.com/llgcode/ps v0.0.0-20150911083025-f1443b32eedb h1:61ndUreYSlWFeCY44JxDDkngVoI7/1MVhEl98Nm0KOk=
@@ -38,35 +37,14 @@ github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81 h1:00VmoueYNlNz/aHIilyyQz/MHSqGoWJzpFv/HW8xpzI=
 golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
-golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
+google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=

pkg/demoinfocs/demoinfocs_test.go

@@ -17,7 +17,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gogo/protobuf/proto"
 	dispatch "github.com/markus-wa/godispatch"
 	"github.com/stretchr/testify/assert"
 
@@ -57,7 +56,7 @@ func TestDemoInfoCs(t *testing.T) {
 	p := demoinfocs.NewParserWithConfig(f, demoinfocs.ParserConfig{
 		MsgQueueBufferSize: 1000,
 		AdditionalNetMessageCreators: map[int]demoinfocs.NetMessageCreator{
-			4: func() proto.Message { return new(msg.CNETMsg_Tick) },
+			4: func() demoinfocs.VTProtobufMessage { return new(msg.CNETMsg_Tick) },
 		},
 	})
 

pkg/demoinfocs/fake/parser_test.go

@@ -5,6 +5,7 @@ import (
 	"time"
 
 	assert "github.com/stretchr/testify/assert"
+	"google.golang.org/protobuf/proto"
 
 	common "github.com/markus-wa/demoinfocs-golang/v2/pkg/demoinfocs/common"
 	events "github.com/markus-wa/demoinfocs-golang/v2/pkg/demoinfocs/events"
@@ -88,7 +89,7 @@ func TestParseNextFrameNetMessages(t *testing.T) {
 
 	p.MockNetMessages(expected...)
 	// Message on second frame that shouldn't be dispatched during the first frame
-	p.MockNetMessages(msg.CSVCMsg_Menu{DialogType: 1, MenuKeyValues: []byte{1, 55, 99}})
+	p.MockNetMessages(msg.CSVCMsg_Menu{DialogType: proto.Int32(1), MenuKeyValues: []byte{1, 55, 99}})
 
 	var actual []interface{}
 	p.RegisterNetMessageHandler(func(message interface{}) {
@@ -108,7 +109,7 @@ func TestParseToEndNetMessages(t *testing.T) {
 	expected := []interface{}{
 		cmdKey(1, 2, 3),
 		cmdKey(100, 255, 8),
-		msg.CSVCMsg_Menu{DialogType: 1, MenuKeyValues: []byte{1, 55, 99}},
+		msg.CSVCMsg_Menu{DialogType: proto.Int32(1), MenuKeyValues: []byte{1, 55, 99}},
 	}
 
 	p.MockNetMessages(expected[:1]...)

pkg/demoinfocs/game_events.go

@@ -29,25 +29,25 @@ func (p *parser) handleGameEvent(ge *msg.CSVCMsg_GameEvent) {
 		return
 	}
 
-	desc := p.gameEventDescs[ge.Eventid]
+	desc := p.gameEventDescs[ge.GetEventid()]
 
 	debugGameEvent(desc, ge)
 
 	data := mapGameEventData(desc, ge)
 
-	if handler, eventKnown := p.gameEventHandler.gameEventNameToHandler[desc.Name]; eventKnown {
+	if handler, eventKnown := p.gameEventHandler.gameEventNameToHandler[desc.GetName()]; eventKnown {
 		// some events are known but have no handler
 		// these will just be dispatched as GenericGameEvent
 		if handler != nil {
 			handler(data)
 		}
 	} else {
-		p.eventDispatcher.Dispatch(events.ParserWarn{Message: fmt.Sprintf("unknown event %q", desc.Name)})
-		unassert.Error("unknown event %q", desc.Name)
+		p.eventDispatcher.Dispatch(events.ParserWarn{Message: fmt.Sprintf("unknown event %q", desc.GetName())})
+		unassert.Error("unknown event %q", desc.GetName())
 	}
 
 	p.eventDispatcher.Dispatch(events.GenericGameEvent{
-		Name: desc.Name,
+		Name: desc.GetName(),
 		Data: data,
 	})
 }
@@ -227,7 +227,7 @@ func (geh gameEventHandler) roundAnnounceLastRoundHalf(map[string]*msg.CSVCMsg_G
 }
 
 func (geh gameEventHandler) roundEnd(data map[string]*msg.CSVCMsg_GameEventKeyT) {
-	winner := common.Team(data["winner"].ValByte)
+	winner := common.Team(data["winner"].GetValByte())
 	winnerState := geh.gameState().Team(winner)
 
 	var loserState *common.TeamState
@@ -647,10 +647,10 @@ func (geh gameEventHandler) bombEvent(data map[string]*msg.CSVCMsg_GameEventKeyT
 	const gameEventKeyTypeLong = 3
 
 	var site int
-	if data["site"].Type == gameEventKeyTypeLong {
-		site = int(data["site"].ValLong)
+	if data["site"].GetType() == gameEventKeyTypeLong {
+		site = int(data["site"].GetValLong())
 	} else {
-		site = int(data["site"].ValShort)
+		site = int(data["site"].GetValShort())
 	}
 
 	switch site {
@@ -751,9 +751,9 @@ func (geh gameEventHandler) bombPickup(data map[string]*msg.CSVCMsg_GameEventKey
 func (geh gameEventHandler) nadeEvent(data map[string]*msg.CSVCMsg_GameEventKeyT, nadeType common.EquipmentType) events.GrenadeEvent {
 	thrower := geh.playerByUserID32(data["userid"].GetValShort())
 	position := r3.Vector{
-		X: float64(data["x"].ValFloat),
-		Y: float64(data["y"].ValFloat),
-		Z: float64(data["z"].ValFloat),
+		X: float64(data["x"].GetValFloat()),
+		Y: float64(data["y"].GetValFloat()),
+		Z: float64(data["z"].GetValFloat()),
 	}
 	nadeEntityID := int(data["entityid"].GetValShort())
 
@@ -868,7 +868,7 @@ func getPlayerWeapon(player *common.Player, wepType common.EquipmentType) *commo
 func mapGameEventData(d *msg.CSVCMsg_GameEventListDescriptorT, e *msg.CSVCMsg_GameEvent) map[string]*msg.CSVCMsg_GameEventKeyT {
 	data := make(map[string]*msg.CSVCMsg_GameEventKeyT, len(d.Keys))
 	for i, k := range d.Keys {
-		data[k.Name] = e.Keys[i]
+		data[k.GetName()] = e.Keys[i]
 	}
 
 	return data

pkg/demoinfocs/game_events_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"google.golang.org/protobuf/proto"
 
 	common "github.com/markus-wa/demoinfocs-golang/v2/pkg/demoinfocs/common"
 	events "github.com/markus-wa/demoinfocs-golang/v2/pkg/demoinfocs/events"
@@ -34,22 +35,22 @@ func TestRoundEnd_LoserState_Score(t *testing.T) {
 
 	p.gameEventDescs = map[int32]*msg.CSVCMsg_GameEventListDescriptorT{
 		1: {
-			Name: "round_end",
+			Name: proto.String("round_end"),
 			Keys: []*msg.CSVCMsg_GameEventListKeyT{
-				{Name: "winner"},
-				{Name: "message"},
-				{Name: "reason"},
+				{Name: proto.String("winner")},
+				{Name: proto.String("message")},
+				{Name: proto.String("reason")},
 			},
 		},
 	}
 
 	ge := new(msg.CSVCMsg_GameEvent)
-	ge.Eventid = 1
-	ge.EventName = "round_end"
+	ge.Eventid = proto.Int32(1)
+	ge.EventName = proto.String("round_end")
 	ge.Keys = []*msg.CSVCMsg_GameEventKeyT{
-		{ValByte: 2},
-		{ValString: "test"},
-		{ValByte: 9},
+		{ValByte: proto.Int32(2)},
+		{ValString: proto.String("test")},
+		{ValByte: proto.Int32(9)},
 	}
 	p.handleGameEvent(ge)