[game] rename function to improve documentation of intent

ghthor · Jul 6, 2016 · d907c46 · d907c46
1 parent 2932521
commit d907c46
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/game/conn.go b/game/conn.go
@@ -410,7 +410,7 @@ func NewPreLoginConn(conn Conn, ds datastore.Datastore) PreLoginConn {
 	}
 }
 
-func RunServer(loginConn PreLoginConn, actorConnector ActorConnector) error {
+func LoginAndConnectActor(loginConn PreLoginConn, actorConnector ActorConnector) error {
 	loggedInConn, err := loginConn.HandleLogin()
 	if err != nil {
 		return err

diff --git a/game/gobconn.go b/game/gobconn.go
@@ -106,7 +106,7 @@ func newGobWebsocketHandler(
 		c := NewPreLoginConn(NewGobConn(ws), ds)
 
 		// Blocks until the connection has disconnected
-		err := RunServer(c, actorConnector)
+		err := LoginAndConnectActor(c, actorConnector)
 
 		if err != nil {
 			log.Printf("packet handler terminated: %v", err)

diff --git a/game/prototest/desc.go b/game/prototest/desc.go
@@ -106,7 +106,7 @@ func DescribeActorGobConn(c gospec.Context) {
 		loginConn := game.NewPreLoginConn(game.NewGobConn(conn.nextEndpoint()), ds)
 
 		go func() {
-			exitWithError <- game.RunServer(loginConn,
+			exitWithError <- game.LoginAndConnectActor(loginConn,
 				func(dsactor datastore.Actor, stateWriter game.InitialStateWriter) (game.InputReceiver, entity.State) {
 					actor := &mockActor{
 						actor:       dsactor,
@@ -295,7 +295,7 @@ func DescribeActorGobConn(c gospec.Context) {
 					loginConn := game.NewPreLoginConn(game.NewGobConn(conn.nextEndpoint()), ds)
 
 					go func() {
-						exitWithError <- game.RunServer(loginConn, nil)
+						exitWithError <- game.LoginAndConnectActor(loginConn, nil)
 					}()
 				}()