.

go/neo/storage.go

@@ -320,16 +320,16 @@ func (stor *Storage) m1initialize1(ctx context.Context, req neonet.Request) erro
 
 	case *proto.Recovery:
 		err = req.Reply(&proto.AnswerRecovery{
-			PTid:		stor.node.PartTab.PTid,
+			PTid:		stor.node.state.PartTab.PTid,
 			BackupTid:	proto.INVALID_TID,
 			TruncateTid:	proto.INVALID_TID})
 
 	case *proto.AskPartitionTable:
 		// TODO initially read PT from disk
 		err = req.Reply(&proto.AnswerPartitionTable{
-			PTid:	     stor.node.PartTab.PTid,
+			PTid:	     stor.node.state.PartTab.PTid,
 			NumReplicas: 0, // FIXME hardcoded; NEO/py uses this as n(replica)-1
-			RowList:     stor.node.PartTab.Dump()})
+			RowList:     stor.node.state.PartTab.Dump()})
 
 	case *proto.LockedTransactions:
 		// XXX r/o stub
@@ -387,7 +387,7 @@ func (stor *Storage) m1serve(ctx context.Context, reqStart *neonet.Request) (err
 
 	for {
 		// XXX abort on ctx (XXX or upper?)
-		req, err := mlink.Recv1() // XXX -> RecvM1
+		req, err := stor.node.RecvM1()
 		if err != nil {
 			return err
 		}
@@ -408,18 +408,6 @@ func (stor *Storage) m1serve1(ctx context.Context, req neonet.Request) error {
 	case *proto.StopOperation:
 		return fmt.Errorf("stop requested")
 
-	// should be served by Node.commonRecv1
-	// ---- 8< ----
-	// XXX SendPartitionTable?
-	// XXX NotifyPartitionChanges?
-
-	case *proto.NotifyNodeInformation:
-		stor.node.UpdateNodeTab(ctx, msg)	// XXX lock?
-
-	case *proto.NotifyClusterState:
-		stor.node.UpdateClusterState(ctx, msg)	// XXX lock? what to do with it?
-	// ---- 8< ----
-
 	// TODO commit related messages
 	}
 
@@ -448,8 +436,8 @@ func (stor *Storage) identify(idReq *proto.RequestIdentification) (proto.Msg, bo
 	}
 
 	return &proto.AcceptIdentification{
-		NodeType: stor.node.MyInfo.Type,
-		MyNID:    stor.node.MyInfo.NID,		// XXX lock wrt update
+		NodeType: stor.node.myInfo.Type,
+		MyNID:    stor.node.myInfo.NID,		// XXX lock wrt update
 		YourNID:  idReq.NID,
 	}, true
 }