From eec52769dd0c579627c7bce9f77dc2922b25924c Mon Sep 17 00:00:00 2001
From: Stephen McQuay <stephen@mcquay.me>
Date: Mon, 10 Mar 2014 21:52:14 -0700
Subject: [PATCH] Implemented Fraser's suggestions

---
 robot.go | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/robot.go b/robot.go
index 83fe9d7..3e92266 100644
--- a/robot.go
+++ b/robot.go
@@ -88,19 +88,10 @@ func (r *robot) negociate() (err error) {
 		return err
 	}
 
-	encodings := []string{}
-	err = websocket.JSON.Receive(r.ws, &encodings)
-	log.Printf("%+v", encodings)
-	desiredEncoding := "json"
-	for _, encoding := range encodings {
-		if "gob" == encoding {
-			desiredEncoding = encoding
-			break
-		}
-	}
-	err = websocket.JSON.Send(r.ws, desiredEncoding)
+	supportedEncs := []string{"bson", "json", "gob"}
+	err = websocket.JSON.Send(r.ws, supportedEncs)
 	if err != nil {
-		return err
+		return errors.New(fmt.Sprintf("failure: %+v", err))
 	}
 
 	err = websocket.JSON.Receive(r.ws, &r.game)
@@ -109,6 +100,7 @@ func (r *robot) negociate() (err error) {
 	}
 	if *verbose {
 		log.Printf("%s: game parameters: %+v", r.name, r.game)
+		return errors.New(fmt.Sprintf("failure: %+v", err))
 	}
 	// TODO: do something with r.game.Protocol
 	log.Printf("game params: %+v", r.game)