chore(models): common Server & Servers for all providers (#943)
This commit is contained in:
@@ -30,26 +30,26 @@ func Test_extractServersFromBytes(t *testing.T) {
|
||||
"different versions": {
|
||||
b: []byte(`{}`),
|
||||
hardcoded: models.AllServers{
|
||||
Cyberghost: models.CyberghostServers{Version: 1},
|
||||
Expressvpn: models.ExpressvpnServers{Version: 1},
|
||||
Fastestvpn: models.FastestvpnServers{Version: 1},
|
||||
HideMyAss: models.HideMyAssServers{Version: 1},
|
||||
Ipvanish: models.IpvanishServers{Version: 1},
|
||||
Ivpn: models.IvpnServers{Version: 1},
|
||||
Mullvad: models.MullvadServers{Version: 1},
|
||||
Nordvpn: models.NordvpnServers{Version: 1},
|
||||
Perfectprivacy: models.PerfectprivacyServers{Version: 1},
|
||||
Privado: models.PrivadoServers{Version: 1},
|
||||
Pia: models.PiaServers{Version: 1},
|
||||
Privatevpn: models.PrivatevpnServers{Version: 1},
|
||||
Protonvpn: models.ProtonvpnServers{Version: 1},
|
||||
Purevpn: models.PurevpnServers{Version: 1},
|
||||
Surfshark: models.SurfsharkServers{Version: 1},
|
||||
Torguard: models.TorguardServers{Version: 1},
|
||||
VPNUnlimited: models.VPNUnlimitedServers{Version: 1},
|
||||
Vyprvpn: models.VyprvpnServers{Version: 1},
|
||||
Wevpn: models.WevpnServers{Version: 1},
|
||||
Windscribe: models.WindscribeServers{Version: 1},
|
||||
Cyberghost: models.Servers{Version: 1},
|
||||
Expressvpn: models.Servers{Version: 1},
|
||||
Fastestvpn: models.Servers{Version: 1},
|
||||
HideMyAss: models.Servers{Version: 1},
|
||||
Ipvanish: models.Servers{Version: 1},
|
||||
Ivpn: models.Servers{Version: 1},
|
||||
Mullvad: models.Servers{Version: 1},
|
||||
Nordvpn: models.Servers{Version: 1},
|
||||
Perfectprivacy: models.Servers{Version: 1},
|
||||
Privado: models.Servers{Version: 1},
|
||||
Pia: models.Servers{Version: 1},
|
||||
Privatevpn: models.Servers{Version: 1},
|
||||
Protonvpn: models.Servers{Version: 1},
|
||||
Purevpn: models.Servers{Version: 1},
|
||||
Surfshark: models.Servers{Version: 1},
|
||||
Torguard: models.Servers{Version: 1},
|
||||
VPNUnlimited: models.Servers{Version: 1},
|
||||
Vyprvpn: models.Servers{Version: 1},
|
||||
Wevpn: models.Servers{Version: 1},
|
||||
Windscribe: models.Servers{Version: 1},
|
||||
},
|
||||
logged: []string{
|
||||
"Cyberghost servers from file discarded because they have version 0 and hardcoded servers have version 1",
|
||||
@@ -98,48 +98,48 @@ func Test_extractServersFromBytes(t *testing.T) {
|
||||
"windscribe": {"version": 1, "timestamp": 1}
|
||||
}`),
|
||||
hardcoded: models.AllServers{
|
||||
Cyberghost: models.CyberghostServers{Version: 1},
|
||||
Expressvpn: models.ExpressvpnServers{Version: 1},
|
||||
Fastestvpn: models.FastestvpnServers{Version: 1},
|
||||
HideMyAss: models.HideMyAssServers{Version: 1},
|
||||
Ipvanish: models.IpvanishServers{Version: 1},
|
||||
Ivpn: models.IvpnServers{Version: 1},
|
||||
Mullvad: models.MullvadServers{Version: 1},
|
||||
Nordvpn: models.NordvpnServers{Version: 1},
|
||||
Perfectprivacy: models.PerfectprivacyServers{Version: 1},
|
||||
Privado: models.PrivadoServers{Version: 1},
|
||||
Pia: models.PiaServers{Version: 1},
|
||||
Privatevpn: models.PrivatevpnServers{Version: 1},
|
||||
Protonvpn: models.ProtonvpnServers{Version: 1},
|
||||
Purevpn: models.PurevpnServers{Version: 1},
|
||||
Surfshark: models.SurfsharkServers{Version: 1},
|
||||
Torguard: models.TorguardServers{Version: 1},
|
||||
VPNUnlimited: models.VPNUnlimitedServers{Version: 1},
|
||||
Vyprvpn: models.VyprvpnServers{Version: 1},
|
||||
Wevpn: models.WevpnServers{Version: 1},
|
||||
Windscribe: models.WindscribeServers{Version: 1},
|
||||
Cyberghost: models.Servers{Version: 1},
|
||||
Expressvpn: models.Servers{Version: 1},
|
||||
Fastestvpn: models.Servers{Version: 1},
|
||||
HideMyAss: models.Servers{Version: 1},
|
||||
Ipvanish: models.Servers{Version: 1},
|
||||
Ivpn: models.Servers{Version: 1},
|
||||
Mullvad: models.Servers{Version: 1},
|
||||
Nordvpn: models.Servers{Version: 1},
|
||||
Perfectprivacy: models.Servers{Version: 1},
|
||||
Privado: models.Servers{Version: 1},
|
||||
Pia: models.Servers{Version: 1},
|
||||
Privatevpn: models.Servers{Version: 1},
|
||||
Protonvpn: models.Servers{Version: 1},
|
||||
Purevpn: models.Servers{Version: 1},
|
||||
Surfshark: models.Servers{Version: 1},
|
||||
Torguard: models.Servers{Version: 1},
|
||||
VPNUnlimited: models.Servers{Version: 1},
|
||||
Vyprvpn: models.Servers{Version: 1},
|
||||
Wevpn: models.Servers{Version: 1},
|
||||
Windscribe: models.Servers{Version: 1},
|
||||
},
|
||||
persisted: models.AllServers{
|
||||
Cyberghost: models.CyberghostServers{Version: 1, Timestamp: 1},
|
||||
Expressvpn: models.ExpressvpnServers{Version: 1, Timestamp: 1},
|
||||
Fastestvpn: models.FastestvpnServers{Version: 1, Timestamp: 1},
|
||||
HideMyAss: models.HideMyAssServers{Version: 1, Timestamp: 1},
|
||||
Ipvanish: models.IpvanishServers{Version: 1, Timestamp: 1},
|
||||
Ivpn: models.IvpnServers{Version: 1, Timestamp: 1},
|
||||
Mullvad: models.MullvadServers{Version: 1, Timestamp: 1},
|
||||
Nordvpn: models.NordvpnServers{Version: 1, Timestamp: 1},
|
||||
Perfectprivacy: models.PerfectprivacyServers{Version: 1, Timestamp: 1},
|
||||
Privado: models.PrivadoServers{Version: 1, Timestamp: 1},
|
||||
Pia: models.PiaServers{Version: 1, Timestamp: 1},
|
||||
Privatevpn: models.PrivatevpnServers{Version: 1, Timestamp: 1},
|
||||
Protonvpn: models.ProtonvpnServers{Version: 1, Timestamp: 1},
|
||||
Purevpn: models.PurevpnServers{Version: 1, Timestamp: 1},
|
||||
Surfshark: models.SurfsharkServers{Version: 1, Timestamp: 1},
|
||||
Torguard: models.TorguardServers{Version: 1, Timestamp: 1},
|
||||
VPNUnlimited: models.VPNUnlimitedServers{Version: 1, Timestamp: 1},
|
||||
Vyprvpn: models.VyprvpnServers{Version: 1, Timestamp: 1},
|
||||
Wevpn: models.WevpnServers{Version: 1, Timestamp: 1},
|
||||
Windscribe: models.WindscribeServers{Version: 1, Timestamp: 1},
|
||||
Cyberghost: models.Servers{Version: 1, Timestamp: 1},
|
||||
Expressvpn: models.Servers{Version: 1, Timestamp: 1},
|
||||
Fastestvpn: models.Servers{Version: 1, Timestamp: 1},
|
||||
HideMyAss: models.Servers{Version: 1, Timestamp: 1},
|
||||
Ipvanish: models.Servers{Version: 1, Timestamp: 1},
|
||||
Ivpn: models.Servers{Version: 1, Timestamp: 1},
|
||||
Mullvad: models.Servers{Version: 1, Timestamp: 1},
|
||||
Nordvpn: models.Servers{Version: 1, Timestamp: 1},
|
||||
Perfectprivacy: models.Servers{Version: 1, Timestamp: 1},
|
||||
Privado: models.Servers{Version: 1, Timestamp: 1},
|
||||
Pia: models.Servers{Version: 1, Timestamp: 1},
|
||||
Privatevpn: models.Servers{Version: 1, Timestamp: 1},
|
||||
Protonvpn: models.Servers{Version: 1, Timestamp: 1},
|
||||
Purevpn: models.Servers{Version: 1, Timestamp: 1},
|
||||
Surfshark: models.Servers{Version: 1, Timestamp: 1},
|
||||
Torguard: models.Servers{Version: 1, Timestamp: 1},
|
||||
VPNUnlimited: models.Servers{Version: 1, Timestamp: 1},
|
||||
Vyprvpn: models.Servers{Version: 1, Timestamp: 1},
|
||||
Wevpn: models.Servers{Version: 1, Timestamp: 1},
|
||||
Windscribe: models.Servers{Version: 1, Timestamp: 1},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user