This is how I did it: 1. `git clone https://github.com/ooni/probe-engine internal/engine` 2. ``` (cd internal/engine && git describe --tags) v0.23.0 ``` 3. `nvim go.mod` (merging `go.mod` with `internal/engine/go.mod` 4. `rm -rf internal/.git internal/engine/go.{mod,sum}` 5. `git add internal/engine` 6. `find . -type f -name \*.go -exec sed -i 's@/ooni/probe-engine@/ooni/probe-cli/v3/internal/engine@g' {} \;` 7. `go build ./...` (passes) 8. `go test -race ./...` (temporary failure on RiseupVPN) 9. `go mod tidy` 10. this commit message Once this piece of work is done, we can build a new version of `ooniprobe` that is using `internal/engine` directly. We need to do more work to ensure all the other functionality in `probe-engine` (e.g. making mobile packages) are still WAI. Part of https://github.com/ooni/probe/issues/1335
		
			
				
	
	
		
			20 lines
		
	
	
		
			1.3 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			20 lines
		
	
	
		
			1.3 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
package model
 | 
						|
 | 
						|
// CheckInConfigWebConnectivity is the configuration for the WebConnectivity test
 | 
						|
type CheckInConfigWebConnectivity struct {
 | 
						|
	CategoryCodes []string `json:"category_codes"` // CategoryCodes is an array of category codes
 | 
						|
}
 | 
						|
 | 
						|
// CheckInConfig contains configuration for calling the checkin API.
 | 
						|
type CheckInConfig struct {
 | 
						|
	Charging        bool                         `json:"charging"`         // Charging indicate if the phone is actually charging
 | 
						|
	OnWiFi          bool                         `json:"on_wifi"`          // OnWiFi indicate if the phone is actually connected to a WiFi network
 | 
						|
	Platform        string                       `json:"platform"`         // Platform of the probe
 | 
						|
	ProbeASN        string                       `json:"probe_asn"`        // ProbeASN is the probe country code
 | 
						|
	ProbeCC         string                       `json:"probe_cc"`         // ProbeCC is the probe country code
 | 
						|
	RunType         string                       `json:"run_type"`         // RunType
 | 
						|
	SoftwareName    string                       `json:"software_name"`    // SoftwareName of the probe
 | 
						|
	SoftwareVersion string                       `json:"software_version"` // SoftwareVersion of the probe
 | 
						|
	WebConnectivity CheckInConfigWebConnectivity `json:"web_connectivity"` // WebConnectivity class contain an array of categories
 | 
						|
}
 |