Alias Connection to AdaptorInterface and Device to DriverInterface

connection.go

@@ -11,20 +11,22 @@ type JSONConnection struct {
 	Adaptor string `json:"adaptor"`
 }
 
+type Connection AdaptorInterface
+
 type connections struct {
-	connections []AdaptorInterface
+	connections []Connection
 }
 
 func (c *connections) Len() int {
 	return len(c.connections)
 }
 
-func (c *connections) Add(a AdaptorInterface) AdaptorInterface {
+func (c *connections) Add(a Connection) Connection {
 	c.connections = append(c.connections, a)
 	return a
 }
 
-func (c *connections) Each(f func(AdaptorInterface)) {
+func (c *connections) Each(f func(Connection)) {
 	for _, connection := range c.connections {
 		f(connection)
 	}

device.go

@@ -12,20 +12,22 @@ type JSONDevice struct {
 	Commands   []string        `json:"commands"`
 }
 
+type Device DriverInterface
+
 type devices struct {
-	devices []DriverInterface
+	devices []Device
 }
 
 func (d *devices) Len() int {
 	return len(d.devices)
 }
 
-func (d *devices) Add(dev DriverInterface) DriverInterface {
+func (d *devices) Add(dev Device) Device {
 	d.devices = append(d.devices, dev)
 	return dev
 }
 
-func (d *devices) Each(f func(DriverInterface)) {
+func (d *devices) Each(f func(Device)) {
 	for _, device := range d.devices {
 		f(device)
 	}

robot.go

@@ -61,7 +61,7 @@ func NewRobot(name string, v ...interface{}) *Robot {
 			v[0] = connections{}
 		}
 		log.Println("Initializing connections...")
-		for _, connection := range v[0].([]AdaptorInterface) {
+		for _, connection := range v[0].([]Connection) {
 			c := r.Connections().Add(connection)
 			log.Println("Initializing connection", c.name(), "...")
 		}
@@ -71,7 +71,7 @@ func NewRobot(name string, v ...interface{}) *Robot {
 			v[1] = devices{}
 		}
 		log.Println("Initializing devices...")
-		for _, device := range v[1].([]DriverInterface) {
+		for _, device := range v[1].([]Device) {
 			d := r.Devices().Add(device)
 			log.Println("Initializing device", d.name(), "...")
 		}
@@ -147,7 +147,7 @@ func (r *Robot) ToJSON() *JSONRobot {
 		jsonRobot.Commands = append(jsonRobot.Commands, command)
 	}
 
-	r.Devices().Each(func(device DriverInterface) {
+	r.Devices().Each(func(device Device) {
 		jsonDevice := device.ToJSON()
 		jsonRobot.Connections = append(jsonRobot.Connections, jsonDevice.Connection)
 		jsonRobot.Devices = append(jsonRobot.Devices, jsonDevice)