.

go/neo/client/client.go

@@ -249,7 +249,7 @@ func (c *Client) recvMaster(ctx context.Context, mlink *neo.NodeLink) error {
 			return fmt.Errorf("unexpected message: %T", msg)
 
 		// M sends whole PT
-		case *neo.NotifyPartitionTable:
+		case *neo.SendPartitionTable:
 			pt := neo.PartTabFromDump(msg.PTid, msg.RowList)
 			c.node.PartTab = pt
 
@@ -404,7 +404,7 @@ func (c *Client) Load(ctx context.Context, xid zodb.Xid) (data []byte, serial zo
 		req.Tid = neo.INVALID_TID
 	}
 
-	resp := neo.AnswerGetObject{}
+	resp := neo.AnswerObject{}
 	err = slink.Ask1(&req, &resp)
 	if err != nil {
 		return nil, 0, err	// XXX err context

go/neo/server/cluster_test.go

@@ -314,7 +314,7 @@ func TestMasterStorage(t *testing.T) {
 	// M starts verification
 	tc.Expect(clusterState(&M.node.ClusterState, neo.ClusterVerifying))
 
-	tc.Expect(conntx("m:2", "s:2", 4, &neo.NotifyPartitionTable{
+	tc.Expect(conntx("m:2", "s:2", 4, &neo.SendPartitionTable{
 		PTid:		1,
 		RowList:	[]neo.RowInfo{
 			{0, []neo.CellInfo{{neo.UUID(neo.STORAGE, 1), neo.UP_TO_DATE}}},
@@ -461,7 +461,7 @@ func TestMasterStorage(t *testing.T) {
 		Tid:	xid1.Tid,
 		Serial: neo.INVALID_TID,
 	}))
-	tc.Expect(conntx("s:3", "c:2", 3, &neo.AnswerGetObject{
+	tc.Expect(conntx("s:3", "c:2", 3, &neo.AnswerObject{
 		Oid:		xid1.Oid,
 		Serial:		serial1,
 		NextSerial:	0,		// XXX

go/neo/server/master.go

@@ -691,7 +691,7 @@ func storCtlVerify(ctx context.Context, stor *neo.Node, pt *neo.PartitionTable,
 	defer task.Runningf(&ctx, "%s: stor verify", slink)(&err)
 
 	// send just recovered parttab so storage saves it
-	err = slink.Send1(&neo.NotifyPartitionTable{
+	err = slink.Send1(&neo.SendPartitionTable{
 		PTid:    pt.PTid,
 		RowList: pt.Dump(),
 	})

go/neo/server/storage.go

@@ -265,7 +265,7 @@ func (stor *Storage) m1initialize(ctx context.Context, mlink *neo.NodeLink) (req
 
 			err = req.Reply(&neo.AnswerLastIDs{LastTid: lastTid, LastOid: lastOid})
 
-		case *neo.NotifyPartitionTable:
+		case *neo.SendPartitionTable:
 			// TODO M sends us whole PT -> save locally
 
 		case *neo.NotifyPartitionChanges:
@@ -332,7 +332,7 @@ func (stor *Storage) m1serve(ctx context.Context, reqStart *neo.Request) (err er
 		case *neo.StopOperation:
 			return fmt.Errorf("stop requested")
 
-		// XXX NotifyPartitionTable?
+		// XXX SendPartitionTable?
 		// XXX NotifyPartitionChanges?
 
 		case *neo.NotifyNodeInformation:
@@ -479,7 +479,7 @@ func (stor *Storage) serveClient1(ctx context.Context, req neo.Msg) (resp neo.Ms
 			return neo.ErrEncode(err)
 		}
 
-		return &neo.AnswerGetObject{
+		return &neo.AnswerObject{
 			Oid:	xid.Oid,
 			Serial: tid,