diff options
Diffstat (limited to 'internal/config/config.go')
| -rw-r--r-- | internal/config/config.go | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/internal/config/config.go b/internal/config/config.go index 4b939b2..cb26f83 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -9,7 +9,6 @@ import ( "path" "codeberg.org/eduVPN/eduvpn-common/internal/atomicfile" - "codeberg.org/eduVPN/eduvpn-common/internal/config/v1" "codeberg.org/eduVPN/eduvpn-common/internal/config/v2" "codeberg.org/eduVPN/eduvpn-common/internal/discovery" ) @@ -64,20 +63,12 @@ func (c *Config) Load() error { if err = json.Unmarshal(bts, &buf); err != nil { return err } - if buf.V2 != nil { - c.V2 = buf.V2 - return nil - } - if buf.V1 != nil { - c.V2 = v2.FromV1(buf.V1) - } + c.V2 = buf.V2 return nil } // Versioned is the final top-level state file that is written to disk type Versioned struct { - // V1 is the version 1 state file that is no longer used but converted from - V1 *v1.V1 `json:"v1,omitempty"` // V2 is the version 2 state file V2 *v2.V2 `json:"v2,omitempty"` } |