From 5b8f4546f38974e473f1db3de2d8b1c0e0c48293 Mon Sep 17 00:00:00 2001
From: Simone Basso <bassosimone@gmail.com>
Date: Fri, 5 Nov 2021 13:26:08 +0100
Subject: [PATCH] cleanup(ooniprobe): remove unused send_crash_report option
 (#578)

Closes https://github.com/ooni/probe/issues/1766
---
 cmd/ooniprobe/internal/cli/onboard/onboard.go            | 1 -
 cmd/ooniprobe/internal/config/settings.go                | 4 +---
 cmd/ooniprobe/internal/config/testdata/valid-config.json | 1 -
 cmd/ooniprobe/internal/ooni/default-config.json          | 4 +---
 cmd/ooniprobe/testdata/testing-config.json               | 4 +---
 debian/ooniprobe.conf.disabled                           | 4 +---
 6 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/cmd/ooniprobe/internal/cli/onboard/onboard.go b/cmd/ooniprobe/internal/cli/onboard/onboard.go
index 4292484..3c7cf28 100644
--- a/cmd/ooniprobe/internal/cli/onboard/onboard.go
+++ b/cmd/ooniprobe/internal/cli/onboard/onboard.go
@@ -122,7 +122,6 @@ func Onboarding(config *config.Config) error {
 
 	config.Lock()
 	config.InformedConsent = true
-	config.Advanced.SendCrashReports = settings.SendCrashReports
 	config.Sharing.UploadResults = settings.UploadResults
 	config.Unlock()
 
diff --git a/cmd/ooniprobe/internal/config/settings.go b/cmd/ooniprobe/internal/config/settings.go
index e0e9a8a..3dd053f 100644
--- a/cmd/ooniprobe/internal/config/settings.go
+++ b/cmd/ooniprobe/internal/config/settings.go
@@ -6,9 +6,7 @@ type Sharing struct {
 }
 
 // Advanced settings
-type Advanced struct {
-	SendCrashReports bool `json:"send_crash_reports"`
-}
+type Advanced struct{}
 
 // Nettests related settings
 type Nettests struct {
diff --git a/cmd/ooniprobe/internal/config/testdata/valid-config.json b/cmd/ooniprobe/internal/config/testdata/valid-config.json
index a331c8b..dcf58f9 100644
--- a/cmd/ooniprobe/internal/config/testdata/valid-config.json
+++ b/cmd/ooniprobe/internal/config/testdata/valid-config.json
@@ -8,6 +8,5 @@
     "websites_max_runtime": 0
   },
   "advanced": {
-    "send_crash_reports": true
   }
 }
diff --git a/cmd/ooniprobe/internal/ooni/default-config.json b/cmd/ooniprobe/internal/ooni/default-config.json
index a331c8b..631d7c3 100644
--- a/cmd/ooniprobe/internal/ooni/default-config.json
+++ b/cmd/ooniprobe/internal/ooni/default-config.json
@@ -7,7 +7,5 @@
   "nettests": {
     "websites_max_runtime": 0
   },
-  "advanced": {
-    "send_crash_reports": true
-  }
+  "advanced": {}
 }
diff --git a/cmd/ooniprobe/testdata/testing-config.json b/cmd/ooniprobe/testdata/testing-config.json
index 8de393b..3a76422 100644
--- a/cmd/ooniprobe/testdata/testing-config.json
+++ b/cmd/ooniprobe/testdata/testing-config.json
@@ -7,7 +7,5 @@
   "nettests": {
     "websites_max_runtime": 15
   },
-  "advanced": {
-    "send_crash_reports": true
-  }
+  "advanced": {}
 }
diff --git a/debian/ooniprobe.conf.disabled b/debian/ooniprobe.conf.disabled
index 528b14f..2c588b4 100644
--- a/debian/ooniprobe.conf.disabled
+++ b/debian/ooniprobe.conf.disabled
@@ -9,7 +9,5 @@
     "websites_max_runtime": 0,
     "websites_enabled_category_codes": null
   },
-  "advanced": {
-    "send_crash_reports": true
-  }
+  "advanced": {}
 }