fixup! Dial: Catch NotPrimaryMaster & return custom error

Expect NotPrimaryMaster only if we are trying to connect to a master.

go/neo/xneo/connect.go

-// Copyright (C) 2016-2021  Nexedi SA and Contributors.
+// Copyright (C) 2016-2023  Nexedi SA and Contributors.
 //                          Kirill Smelkov <kirr@nexedi.com>
 //
 // This program is free software: you can Use, Study, Modify and Redistribute
@@ -147,22 +147,28 @@ func Dial(ctx context.Context, typ proto.NodeType, net xnet.Networker, addr stri
 			return err
 		}
 
-		notPrimary := &proto.NotPrimaryMaster{}
+		// besides AcceptIdentification and Error
+		// also expect NotPrimaryMaster if we are connecting to a master
 		nerr := &proto.Error{}
+		notPrimary := &proto.NotPrimaryMaster{}
+		respv := []proto.Msg{accept, nerr}
+		if typ == proto.MASTER {
+			respv = append(respv, notPrimary)
+		}
 
-		which, err := conn.Expect(nerr, notPrimary, accept)
+		which, err := conn.Expect(respv...)
 
 		switch which {
 		case 0:
-			return nerr
-		case 1:
-			return notPrimary
-		case 2:
 			if accept.NodeType != typ {
 				// TODO send Error to peer?
 				return fmt.Errorf("accepted, but peer is not %s (identifies as %s)", typ, accept.NodeType)
 			}
 			return nil
+		case 1:
+			return nerr
+		case 2:
+			return notPrimary
 		}
 		return err