c/ooni-probe-cli
Watch
1
0
Fork
You've already forked ooni-probe-cli
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Always include the country code and drop include_probe_cc setting

Browse source 
Fixes: https://github.com/ooni/probe/issues/1183
This commit is contained in:
Arturo Filastò 2020-06-02 18:40:55 +02:00
commit f2e62b7ad7
4 changed files with 2 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
config/parser_test.go
View file

@ -28,10 +28,6 @@ func TestParseConfig(t *testing.T) {
if err != nil {
t.Error(err)
}
if config.Sharing.IncludeCountry == false {
t.Error("country should be included")
}
}
func TestUpdateConfig(t *testing.T) {
@ -61,7 +57,6 @@ func TestUpdateConfig(t *testing.T) {
}
origIncludeIP := config.Sharing.IncludeIP
origIncludeASN := config.Sharing.IncludeASN
origIncludeCountry := config.Sharing.IncludeCountry
origUploadResults := config.Sharing.UploadResults
origInformedConsent := config.InformedConsent
if err != nil {
@ -87,9 +82,6 @@ func TestUpdateConfig(t *testing.T) {
if newConfig.Sharing.IncludeASN != origIncludeASN {
t.Error("includeASN differs")
}
if newConfig.Sharing.IncludeCountry != origIncludeCountry {
t.Error("includeCountry differs")
}
if newConfig.Sharing.UploadResults != origUploadResults {
t.Error("UploadResults differs")
}

1
config/settings.go
View file

@ -37,7 +37,6 @@ var websiteCategories = []string{
type Sharing struct {
IncludeIP bool `json:"include_ip"`
IncludeASN bool `json:"include_asn"`
IncludeCountry bool `json:"include_country"`
UploadResults bool `json:"upload_results"`
}