veyron/services/wspr/wsprd: Register vom types for rock-paper-scissors.
Change-Id: Ib9d122715639f7aa0bca23d765e216b5719b642b
diff --git a/services/wspr/wsprd/lib/remove_this.go b/services/wspr/wsprd/lib/remove_this.go
index 23d53d4..2777649 100644
--- a/services/wspr/wsprd/lib/remove_this.go
+++ b/services/wspr/wsprd/lib/remove_this.go
@@ -1,12 +1,15 @@
package lib
import (
+ rps "veyron/examples/rockpaperscissors"
+ "veyron2/services/mounttable"
"veyron2/services/store"
"veyron2/services/watch"
"veyron2/vom"
)
func init() {
+ vom.Register(mounttable.MountEntry{})
vom.Register(store.Conflict{})
vom.Register(store.Entry{})
vom.Register(store.NestedResult(0))
@@ -16,4 +19,10 @@
vom.Register(watch.Request{})
vom.Register(watch.ChangeBatch{})
vom.Register(watch.Change{})
+ vom.Register(rps.GameOptions{})
+ vom.Register(rps.GameID{})
+ vom.Register(rps.PlayResult{})
+ vom.Register(rps.PlayerAction{})
+ vom.Register(rps.JudgeAction{})
+
}
diff --git a/services/wspr/wsprd/wspr.go b/services/wspr/wsprd/wspr.go
index e707cce..ef4977d 100644
--- a/services/wspr/wsprd/wspr.go
+++ b/services/wspr/wsprd/wspr.go
@@ -5,8 +5,6 @@
"veyron/lib/signals"
"veyron/services/wspr/wsprd/lib"
- "veyron2/services/mounttable"
- "veyron2/vom"
)
func main() {
@@ -14,9 +12,6 @@
veyronProxy := flag.String("vproxy", "", "The endpoint for the veyron proxy to publish on. This must be set")
flag.Parse()
- // TODO(bprosnitz) Remove this once VOM2 goes in.
- vom.Register(mounttable.MountEntry{})
-
proxy := lib.NewWSPR(*port, *veyronProxy)
defer proxy.Shutdown()
go func() {
