cleanup

rpc-pool.go

@@ -26,10 +26,10 @@ func ToCartId(id string) CartId {
 }
 
 type RemoteGrain struct {
-	connection net.Conn
-	queue      *PacketQueue
-	Id         CartId
-	Address    string
+	net.Conn
+	*PacketQueue
+	Id      CartId
+	Address string
 }
 
 func NewRemoteGrain(id CartId, address string) *RemoteGrain {
@@ -49,8 +49,8 @@ func (g *RemoteGrain) Connect() error {
 		if err != nil {
 			return err
 		}
-		g.connection = client
-		g.queue = NewPacketQueue(client)
+		g.Conn = client
+		g.PacketQueue = NewPacketQueue(client)
 	}
 	return nil
 }
@@ -64,7 +64,7 @@ func (g *RemoteGrain) HandleMessage(message *Message, isReplay bool) ([]byte, er
 	if err != nil {
 		return nil, err
 	}
-	packet, err := g.queue.Expect(ResponseBody, time.Second)
+	packet, err := g.Expect(ResponseBody, time.Second)
 	if err != nil {
 		return nil, err
 	}
@@ -86,7 +86,7 @@ func (g *RemoteGrain) GetCurrentState() ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
-	packet, err := g.queue.Expect(ResponseBody, time.Second)
+	packet, err := g.Expect(ResponseBody, time.Second)
 	if err != nil {
 		return nil, err
 	}