all: Use protobuf to generate config structs (fixes #6734) (#6900)

lib/config/wrapper.go

@@ -54,7 +54,6 @@ func (noopWaiter) Wait() {}
 // A Wrapper around a Configuration that manages loads, saves and published
 // notifications of changes to registered Handlers
 type Wrapper interface {
-	MyName() string
 	ConfigPath() string
 
 	RawCopy() Configuration
@@ -117,19 +116,19 @@ func Wrap(path string, cfg Configuration, evLogger events.Logger) Wrapper {
 
 // Load loads an existing file on disk and returns a new configuration
 // wrapper.
-func Load(path string, myID protocol.DeviceID, evLogger events.Logger) (Wrapper, error) {
+func Load(path string, myID protocol.DeviceID, evLogger events.Logger) (Wrapper, int, error) {
 	fd, err := os.Open(path)
 	if err != nil {
-		return nil, err
+		return nil, 0, err
 	}
 	defer fd.Close()
 
-	cfg, err := ReadXML(fd, myID)
+	cfg, originalVersion, err := ReadXML(fd, myID)
 	if err != nil {
-		return nil, err
+		return nil, 0, err
 	}
 
-	return Wrap(path, cfg, evLogger), nil
+	return Wrap(path, cfg, evLogger), originalVersion, nil
 }
 
 func (w *wrapper) ConfigPath() string {
@@ -447,14 +446,6 @@ func (w *wrapper) setRequiresRestart() {
 	atomic.StoreUint32(&w.requiresRestart, 1)
 }
 
-func (w *wrapper) MyName() string {
-	w.mut.Lock()
-	myID := w.cfg.MyID
-	w.mut.Unlock()
-	cfg, _ := w.Device(myID)
-	return cfg.Name
-}
-
 func (w *wrapper) AddOrUpdatePendingDevice(device protocol.DeviceID, name, address string) {
 	w.mut.Lock()
 	defer w.mut.Unlock()