refactor: move TH structs and definitions to model (#894)

This commit moves the TH structs and definitions to model. We don't want
oohelperd to depend on web_connectivity@v0.4.

Part of https://github.com/ooni/probe/issues/2240
This commit is contained in:
Simone Basso 2022-08-28 20:20:12 +02:00 committed by GitHub
commit bb6563f363
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 161 additions and 157 deletions

View file

@ -6,7 +6,6 @@ import (
"testing"
"github.com/google/go-cmp/cmp"
"github.com/ooni/probe-cli/v3/internal/engine/experiment/webconnectivity"
"github.com/ooni/probe-cli/v3/internal/model"
"github.com/ooni/probe-cli/v3/internal/model/mocks"
"github.com/ooni/probe-cli/v3/internal/netxlite"
@ -28,7 +27,7 @@ func Test_dnsMapFailure(t *testing.T) {
}, {
name: "nxdomain",
failure: stringPointerForString(netxlite.FailureDNSNXDOMAINError),
want: stringPointerForString(webconnectivity.DNSNameError),
want: stringPointerForString(model.THDNSNameError),
}, {
name: "no answer",
failure: stringPointerForString(netxlite.FailureDNSNoAnswer),
@ -79,7 +78,7 @@ func TestDNSDo(t *testing.T) {
},
}
},
Out: make(chan webconnectivity.ControlDNSResult, 1),
Out: make(chan model.THDNSResult, 1),
Wg: &sync.WaitGroup{},
}
config.Wg.Add(1)